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:53 UTC

[19/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/Car/filter/(VIN lt 16).xml
----------------------------------------------------------------------
diff --git a/fit/src/main/resources/V30/Car/filter/(VIN lt 16).xml b/fit/src/main/resources/V30/Car/filter/(VIN lt 16).xml
index d8d4e1b..dbe2139 100644
--- a/fit/src/main/resources/V30/Car/filter/(VIN lt 16).xml	
+++ b/fit/src/main/resources/V30/Car/filter/(VIN lt 16).xml	
@@ -19,13 +19,13 @@
     under the License.
 
 -->
-<feed xml:base="http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/" xmlns="http://www.w3.org/2005/Atom" xmlns:d="http://schemas.microsoft.com/ado/2007/08/dataservices" xmlns:m="http://schemas.microsoft.com/ado/2007/08/dataservices/metadata" xmlns:georss="http://www.georss.org/georss" xmlns:gml="http://www.opengis.net/gml">
-  <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Car</id>
+<feed xml:base="http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/" xmlns="http://www.w3.org/2005/Atom" xmlns:d="http://schemas.microsoft.com/ado/2007/08/dataservices" xmlns:m="http://schemas.microsoft.com/ado/2007/08/dataservices/metadata" xmlns:georss="http://www.georss.org/georss" xmlns:gml="http://www.opengis.net/gml">
+  <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Car</id>
   <title type="text">Car</title>
   <updated>2014-02-13T12:09:31Z</updated>
   <link rel="self" title="Car" href="Car" />
   <entry>
-    <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Car(11)</id>
+    <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Car(11)</id>
     <category term="Microsoft.Test.OData.Services.AstoriaDefaultService.Car" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme" />
     <link rel="edit" title="Car" href="Car(11)" />
     <title />
@@ -43,7 +43,7 @@
     </m:properties>
   </entry>
   <entry>
-    <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Car(12)</id>
+    <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Car(12)</id>
     <category term="Microsoft.Test.OData.Services.AstoriaDefaultService.Car" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme" />
     <link rel="edit" title="Car" href="Car(12)" />
     <title />
@@ -61,7 +61,7 @@
     </m:properties>
   </entry>
   <entry>
-    <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Car(13)</id>
+    <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Car(13)</id>
     <category term="Microsoft.Test.OData.Services.AstoriaDefaultService.Car" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme" />
     <link rel="edit" title="Car" href="Car(13)" />
     <title />
@@ -79,7 +79,7 @@
     </m:properties>
   </entry>
   <entry>
-    <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Car(14)</id>
+    <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Car(14)</id>
     <category term="Microsoft.Test.OData.Services.AstoriaDefaultService.Car" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme" />
     <link rel="edit" title="Car" href="Car(14)" />
     <title />
@@ -97,7 +97,7 @@
     </m:properties>
   </entry>
   <entry>
-    <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Car(15)</id>
+    <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Car(15)</id>
     <category term="Microsoft.Test.OData.Services.AstoriaDefaultService.Car" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme" />
     <link rel="edit" title="Car" href="Car(15)" />
     <title />

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V30/Car/filter/(length(Description) gt (VIN add 10)).full.json
----------------------------------------------------------------------
diff --git a/fit/src/main/resources/V30/Car/filter/(length(Description) gt (VIN add 10)).full.json b/fit/src/main/resources/V30/Car/filter/(length(Description) gt (VIN add 10)).full.json
index 5cf721a..a6ab6ed 100644
--- a/fit/src/main/resources/V30/Car/filter/(length(Description) gt (VIN add 10)).full.json	
+++ b/fit/src/main/resources/V30/Car/filter/(length(Description) gt (VIN add 10)).full.json	
@@ -1 +1 @@
-{"odata.metadata":"http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/$metadata#Car","value":[{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Car","odata.id":"http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Car(11)","odata.editLink":"Car(11)","odata.mediaEditLink":"Car(11)/$value","odata.mediaReadLink":"Car(11)/$value","odata.mediaContentType":"application/octet-stream","Photo@odata.mediaEditLink":"Car(11)/Photo","Video@odata.mediaEditLink":"Car(11)/Video","VIN":11,"Description":"cenbviijieljtrtdslbuiqubcvhxhzenidqdnaopplvlqc"},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Car","odata.id":"http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Car(14)","odata.editLink":"Car(14)","odata.mediaEditLink":"Car(14)/$value","odata.mediaReadLink":"Car(14)/$value","odata.mediaContentType":"application/octet-stream","Photo@odata.mediaEditLink":"Car(14)/Photo","Video@odata.mediaEditLink":"C
 ar(14)/Video","VIN":14,"Description":"New Description(1392222565917)"},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Car","odata.id":"http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Car(17)","odata.editLink":"Car(17)","odata.mediaEditLink":"Car(17)/$value","odata.mediaReadLink":"Car(17)/$value","odata.mediaContentType":"*/*","Photo@odata.mediaEditLink":"Car(17)/Photo","Video@odata.mediaEditLink":"Car(17)/Video","VIN":17,"Description":"\u307e\u30a1\u30c1\u30dc\u042f\u66a6\u30de\u30c1\u307e\u531a\u3041\u305d\u30bf\u3093\u30bc\u3073\u305f\u30c1\u307b\u9ed1\u30dd\u3073\u3041\u30bd\u0451\u3093\u6b32\u6b32\uff66\u3092\u30a1\u30a1\u30dd\u3074\u30b0\u4e9c\u30c1\u30dd\u30b0\uff66\u30df\u305d\u30cf\u305b\u30bc\u73f1\u30bc\u305c\u305b\u30dd\u30bc\u30bc\uff41\u88f9\u9ed1\u305d\u307e\u305d\u30c1"},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Car","odata.id":"http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.sv
 c/Car(18)","odata.editLink":"Car(18)","odata.mediaEditLink":"Car(18)/$value","odata.mediaReadLink":"Car(18)/$value","odata.mediaContentType":"*/*","Photo@odata.mediaEditLink":"Car(18)/Photo","Video@odata.mediaEditLink":"Car(18)/Video","VIN":18,"Description":"\u0451\u30bc\u30dc\u30bf\u3072\u3079\u30d0\u30bf\u305e\u30a1\u044f\u042f\u755a\u30c0\u30bd\u30be\u30be\u042f\u6b79\u307a\u30dc\u305c\u305f\u30bd\u755a\u73f1\u30de\u6b32\u30de\u30b0\u3042\u755a\u4e5d\u30a1\u755a\u30de\u30b0\u88f9\u30df\u30bc\u30a1\u6b32\u30bd\u5f0c\u755a\u30de\u5f0c\u30c1\u66a6\u30a1\u30dc\u305c\u88f9\u30df\u042f\uff41\u307c\u3072\u30dd\u3092\u30be\u5f0c\u6b79"},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Car","odata.id":"http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Car(19)","odata.editLink":"Car(19)","odata.mediaEditLink":"Car(19)/$value","odata.mediaReadLink":"Car(19)/$value","odata.mediaContentType":"*/*","Photo@odata.mediaEditLink":"Car(19)/Photo","Video@odat
 a.mediaEditLink":"Car(19)/Video","VIN":19,"Description":"bdssgpfovhjbzevqmgqxxkejsdhvtxug\u00df\u00df\u00dfj\u00dffdd\u00dflsshrygytoginhrgoydicmj\u00dfcebzehqbegxgmsu"}]}
\ No newline at end of file
+{"odata.metadata":"http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/$metadata#Car","value":[{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Car","odata.id":"http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Car(11)","odata.editLink":"Car(11)","odata.mediaEditLink":"Car(11)/$value","odata.mediaReadLink":"Car(11)/$value","odata.mediaContentType":"application/octet-stream","Photo@odata.mediaEditLink":"Car(11)/Photo","Video@odata.mediaEditLink":"Car(11)/Video","VIN":11,"Description":"cenbviijieljtrtdslbuiqubcvhxhzenidqdnaopplvlqc"},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Car","odata.id":"http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Car(14)","odata.editLink":"Car(14)","odata.mediaEditLink":"Car(14)/$value","odata.mediaReadLink":"Car(14)/$value","odata.mediaContentType":"application/octet-stream","Photo@odata.mediaEditLink":"Car(14)/Photo","Video@odata.mediaEditLink"
 :"Car(14)/Video","VIN":14,"Description":"New Description(1392222565917)"},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Car","odata.id":"http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Car(17)","odata.editLink":"Car(17)","odata.mediaEditLink":"Car(17)/$value","odata.mediaReadLink":"Car(17)/$value","odata.mediaContentType":"*/*","Photo@odata.mediaEditLink":"Car(17)/Photo","Video@odata.mediaEditLink":"Car(17)/Video","VIN":17,"Description":"\u307e\u30a1\u30c1\u30dc\u042f\u66a6\u30de\u30c1\u307e\u531a\u3041\u305d\u30bf\u3093\u30bc\u3073\u305f\u30c1\u307b\u9ed1\u30dd\u3073\u3041\u30bd\u0451\u3093\u6b32\u6b32\uff66\u3092\u30a1\u30a1\u30dd\u3074\u30b0\u4e9c\u30c1\u30dd\u30b0\uff66\u30df\u305d\u30cf\u305b\u30bc\u73f1\u30bc\u305c\u305b\u30dd\u30bc\u30bc\uff41\u88f9\u9ed1\u305d\u307e\u305d\u30c1"},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Car","odata.id":"http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Stat
 ic.svc/Car(18)","odata.editLink":"Car(18)","odata.mediaEditLink":"Car(18)/$value","odata.mediaReadLink":"Car(18)/$value","odata.mediaContentType":"*/*","Photo@odata.mediaEditLink":"Car(18)/Photo","Video@odata.mediaEditLink":"Car(18)/Video","VIN":18,"Description":"\u0451\u30bc\u30dc\u30bf\u3072\u3079\u30d0\u30bf\u305e\u30a1\u044f\u042f\u755a\u30c0\u30bd\u30be\u30be\u042f\u6b79\u307a\u30dc\u305c\u305f\u30bd\u755a\u73f1\u30de\u6b32\u30de\u30b0\u3042\u755a\u4e5d\u30a1\u755a\u30de\u30b0\u88f9\u30df\u30bc\u30a1\u6b32\u30bd\u5f0c\u755a\u30de\u5f0c\u30c1\u66a6\u30a1\u30dc\u305c\u88f9\u30df\u042f\uff41\u307c\u3072\u30dd\u3092\u30be\u5f0c\u6b79"},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Car","odata.id":"http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Car(19)","odata.editLink":"Car(19)","odata.mediaEditLink":"Car(19)/$value","odata.mediaReadLink":"Car(19)/$value","odata.mediaContentType":"*/*","Photo@odata.mediaEditLink":"Car(19)/Photo","Vide
 o@odata.mediaEditLink":"Car(19)/Video","VIN":19,"Description":"bdssgpfovhjbzevqmgqxxkejsdhvtxug\u00df\u00df\u00dfj\u00dffdd\u00dflsshrygytoginhrgoydicmj\u00dfcebzehqbegxgmsu"}]}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V30/Car/filter/(length(Description) gt (VIN add 10)).xml
----------------------------------------------------------------------
diff --git a/fit/src/main/resources/V30/Car/filter/(length(Description) gt (VIN add 10)).xml b/fit/src/main/resources/V30/Car/filter/(length(Description) gt (VIN add 10)).xml
index 5c7f72a..54c5f82 100644
--- a/fit/src/main/resources/V30/Car/filter/(length(Description) gt (VIN add 10)).xml	
+++ b/fit/src/main/resources/V30/Car/filter/(length(Description) gt (VIN add 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/Car</id>
+<feed xml:base="http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/" xmlns="http://www.w3.org/2005/Atom" xmlns:d="http://schemas.microsoft.com/ado/2007/08/dataservices" xmlns:m="http://schemas.microsoft.com/ado/2007/08/dataservices/metadata" xmlns:georss="http://www.georss.org/georss" xmlns:gml="http://www.opengis.net/gml">
+  <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Car</id>
   <title type="text">Car</title>
   <updated>2014-02-13T12:09:31Z</updated>
   <link rel="self" title="Car" href="Car" />
   <entry>
-    <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Car(11)</id>
+    <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Car(11)</id>
     <category term="Microsoft.Test.OData.Services.AstoriaDefaultService.Car" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme" />
     <link rel="edit" title="Car" href="Car(11)" />
     <title />
@@ -43,7 +43,7 @@
     </m:properties>
   </entry>
   <entry>
-    <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Car(14)</id>
+    <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Car(14)</id>
     <category term="Microsoft.Test.OData.Services.AstoriaDefaultService.Car" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme" />
     <link rel="edit" title="Car" href="Car(14)" />
     <title />
@@ -61,7 +61,7 @@
     </m:properties>
   </entry>
   <entry>
-    <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Car(17)</id>
+    <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Car(17)</id>
     <category term="Microsoft.Test.OData.Services.AstoriaDefaultService.Car" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme" />
     <link rel="edit" title="Car" href="Car(17)" />
     <title />
@@ -79,7 +79,7 @@
     </m:properties>
   </entry>
   <entry>
-    <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Car(18)</id>
+    <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Car(18)</id>
     <category term="Microsoft.Test.OData.Services.AstoriaDefaultService.Car" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme" />
     <link rel="edit" title="Car" href="Car(18)" />
     <title />
@@ -97,7 +97,7 @@
     </m:properties>
   </entry>
   <entry>
-    <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Car(19)</id>
+    <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Car(19)</id>
     <category term="Microsoft.Test.OData.Services.AstoriaDefaultService.Car" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme" />
     <link rel="edit" title="Car" href="Car(19)" />
     <title />

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V30/Car/filter/VIN add 5 lt 11.full.json
----------------------------------------------------------------------
diff --git a/fit/src/main/resources/V30/Car/filter/VIN add 5 lt 11.full.json b/fit/src/main/resources/V30/Car/filter/VIN add 5 lt 11.full.json
index d84044a..3054976 100644
--- a/fit/src/main/resources/V30/Car/filter/VIN add 5 lt 11.full.json	
+++ b/fit/src/main/resources/V30/Car/filter/VIN add 5 lt 11.full.json	
@@ -1 +1 @@
-{"odata.metadata":"http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/$metadata#Car","value":[]}
\ No newline at end of file
+{"odata.metadata":"http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/$metadata#Car","value":[]}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V30/Car/filter/VIN add 5 lt 11.xml
----------------------------------------------------------------------
diff --git a/fit/src/main/resources/V30/Car/filter/VIN add 5 lt 11.xml b/fit/src/main/resources/V30/Car/filter/VIN add 5 lt 11.xml
index 258dbb6..baf1c3a 100644
--- a/fit/src/main/resources/V30/Car/filter/VIN add 5 lt 11.xml	
+++ b/fit/src/main/resources/V30/Car/filter/VIN add 5 lt 11.xml	
@@ -19,10 +19,10 @@
   under the License.
 
 -->
-<feed xml:base="http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/" xmlns="http://www.w3.org/2005/Atom"
+<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:x${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Car</id>
+  <id>http://localhost:x${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Car</id>
   <title type="text">Car</title>
   <updated>2014-02-13T14:31:04Z</updated>
   <link rel="self" title="Car" href="Car" />

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V30/Car/filter/VIN div 2 le 8.full.json
----------------------------------------------------------------------
diff --git a/fit/src/main/resources/V30/Car/filter/VIN div 2 le 8.full.json b/fit/src/main/resources/V30/Car/filter/VIN div 2 le 8.full.json
index 7dd31eb..21e90ac 100644
--- a/fit/src/main/resources/V30/Car/filter/VIN div 2 le 8.full.json	
+++ b/fit/src/main/resources/V30/Car/filter/VIN div 2 le 8.full.json	
@@ -1 +1 @@
-{"odata.metadata":"http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/$metadata#Car","value":[{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Car","odata.id":"http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Car(11)","odata.editLink":"Car(11)","odata.mediaEditLink":"Car(11)/$value","odata.mediaReadLink":"Car(11)/$value","odata.mediaContentType":"*/*","Photo@odata.mediaEditLink":"Car(11)/Photo","Video@odata.mediaEditLink":"Car(11)/Video","VIN":11,"Description":"cenbviijieljtrtdslbuiqubcvhxhzenidqdnaopplvlqc"},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Car","odata.id":"http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Car(12)","odata.editLink":"Car(12)","odata.mediaEditLink":"Car(12)/$value","odata.mediaReadLink":"Car(12)/$value","odata.mediaContentType":"*/*","Photo@odata.mediaEditLink":"Car(12)/Photo","Video@odata.mediaEditLink":"Car(12)/Video","VIN":12,"Description":"lx"}
 ,{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Car","odata.id":"http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Car(13)","odata.editLink":"Car(13)","odata.mediaEditLink":"Car(13)/$value","odata.mediaReadLink":"Car(13)/$value","odata.mediaContentType":"*/*","Photo@odata.mediaEditLink":"Car(13)/Photo","Video@odata.mediaEditLink":"Car(13)/Video","VIN":13,"Description":null},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Car","odata.id":"http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Car(14)","odata.editLink":"Car(14)","odata.mediaEditLink":"Car(14)/$value","odata.mediaReadLink":"Car(14)/$value","odata.mediaContentType":"*/*","Photo@odata.mediaEditLink":"Car(14)/Photo","Video@odata.mediaEditLink":"Car(14)/Video","VIN":14,"Description":"\u755a\u30c1\u3073\uff9d\u3041\u3042\u044f\u307e\u3074\u3072\u30bf\u30d0\u30a1\uff9d\u3074\u6b79\u30c1\u6b79\u6b79\u30a1\u307e\u30de\u305e\u73f1\u66a6\u307c\u6b79\
 u30b0\u73f1\u30dc\u30c1\u30bf\u3073\u30bc\u30bd\u30bc\u305f\u30b0\u0451\u307e\u755a\uff41\u755a\u6b79\u531a\u755a\u30a1\u30bc\u531a\u042f\u6b32\u531a\u30c1\u30c1\u30dc\u3073\u30bd\u30a1\u3074\u66a6\u307a\u30dd\u30bd\u30c1\u30d0\u042f\u30bc\u9ed1\u30c0\u531a\u30de\u3073\u66a6\u30c0\u30bd\u30af\u6b79\u307e\u3042\uff41\u88f9\u30bd\u30cf\u6b79\u66a6\u5f0c\uff41\u30d0\u66a6\u307d\uff88"},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Car","odata.id":"http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Car(15)","odata.editLink":"Car(15)","odata.mediaEditLink":"Car(15)/$value","odata.mediaReadLink":"Car(15)/$value","odata.mediaContentType":"*/*","Photo@odata.mediaEditLink":"Car(15)/Photo","Video@odata.mediaEditLink":"Car(15)/Video","VIN":15,"Description":"kphszztczthjacvjnttrarxru"},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Car","odata.id":"http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Car(16)","od
 ata.editLink":"Car(16)","odata.mediaEditLink":"Car(16)/$value","odata.mediaReadLink":"Car(16)/$value","odata.mediaContentType":"*/*","Photo@odata.mediaEditLink":"Car(16)/Photo","Video@odata.mediaEditLink":"Car(16)/Video","VIN":16,"Description":"\u3041\u30bc\u3092\u3042\u30af\u3073\u30bc\u30bc\u30a1\u30a1\u305b\u30de\u307b\u30b0\u30bd\u30d0\u305b\u0451\u88f9\uff66\u307d\uff9d\u30a1"},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Car","odata.id":"http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Car(17)","odata.editLink":"Car(17)","odata.mediaEditLink":"Car(17)/$value","odata.mediaReadLink":"Car(17)/$value","odata.mediaContentType":"*/*","Photo@odata.mediaEditLink":"Car(17)/Photo","Video@odata.mediaEditLink":"Car(17)/Video","VIN":17,"Description":"\u307e\u30a1\u30c1\u30dc\u042f\u66a6\u30de\u30c1\u307e\u531a\u3041\u305d\u30bf\u3093\u30bc\u3073\u305f\u30c1\u307b\u9ed1\u30dd\u3073\u3041\u30bd\u0451\u3093\u6b32\u6b32\uff66\u3092\u30a1\u30a1\u30d
 d\u3074\u30b0\u4e9c\u30c1\u30dd\u30b0\uff66\u30df\u305d\u30cf\u305b\u30bc\u73f1\u30bc\u305c\u305b\u30dd\u30bc\u30bc\uff41\u88f9\u9ed1\u305d\u307e\u305d\u30c1"}]}
\ No newline at end of file
+{"odata.metadata":"http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/$metadata#Car","value":[{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Car","odata.id":"http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Car(11)","odata.editLink":"Car(11)","odata.mediaEditLink":"Car(11)/$value","odata.mediaReadLink":"Car(11)/$value","odata.mediaContentType":"*/*","Photo@odata.mediaEditLink":"Car(11)/Photo","Video@odata.mediaEditLink":"Car(11)/Video","VIN":11,"Description":"cenbviijieljtrtdslbuiqubcvhxhzenidqdnaopplvlqc"},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Car","odata.id":"http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Car(12)","odata.editLink":"Car(12)","odata.mediaEditLink":"Car(12)/$value","odata.mediaReadLink":"Car(12)/$value","odata.mediaContentType":"*/*","Photo@odata.mediaEditLink":"Car(12)/Photo","Video@odata.mediaEditLink":"Car(12)/Video","VIN":12,"Description":"l
 x"},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Car","odata.id":"http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Car(13)","odata.editLink":"Car(13)","odata.mediaEditLink":"Car(13)/$value","odata.mediaReadLink":"Car(13)/$value","odata.mediaContentType":"*/*","Photo@odata.mediaEditLink":"Car(13)/Photo","Video@odata.mediaEditLink":"Car(13)/Video","VIN":13,"Description":null},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Car","odata.id":"http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Car(14)","odata.editLink":"Car(14)","odata.mediaEditLink":"Car(14)/$value","odata.mediaReadLink":"Car(14)/$value","odata.mediaContentType":"*/*","Photo@odata.mediaEditLink":"Car(14)/Photo","Video@odata.mediaEditLink":"Car(14)/Video","VIN":14,"Description":"\u755a\u30c1\u3073\uff9d\u3041\u3042\u044f\u307e\u3074\u3072\u30bf\u30d0\u30a1\uff9d\u3074\u6b79\u30c1\u6b79\u6b79\u30a1\u307e\u30de\u305e\u73f1\u66a6\u307c\u
 6b79\u30b0\u73f1\u30dc\u30c1\u30bf\u3073\u30bc\u30bd\u30bc\u305f\u30b0\u0451\u307e\u755a\uff41\u755a\u6b79\u531a\u755a\u30a1\u30bc\u531a\u042f\u6b32\u531a\u30c1\u30c1\u30dc\u3073\u30bd\u30a1\u3074\u66a6\u307a\u30dd\u30bd\u30c1\u30d0\u042f\u30bc\u9ed1\u30c0\u531a\u30de\u3073\u66a6\u30c0\u30bd\u30af\u6b79\u307e\u3042\uff41\u88f9\u30bd\u30cf\u6b79\u66a6\u5f0c\uff41\u30d0\u66a6\u307d\uff88"},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Car","odata.id":"http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Car(15)","odata.editLink":"Car(15)","odata.mediaEditLink":"Car(15)/$value","odata.mediaReadLink":"Car(15)/$value","odata.mediaContentType":"*/*","Photo@odata.mediaEditLink":"Car(15)/Photo","Video@odata.mediaEditLink":"Car(15)/Video","VIN":15,"Description":"kphszztczthjacvjnttrarxru"},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Car","odata.id":"http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Car(1
 6)","odata.editLink":"Car(16)","odata.mediaEditLink":"Car(16)/$value","odata.mediaReadLink":"Car(16)/$value","odata.mediaContentType":"*/*","Photo@odata.mediaEditLink":"Car(16)/Photo","Video@odata.mediaEditLink":"Car(16)/Video","VIN":16,"Description":"\u3041\u30bc\u3092\u3042\u30af\u3073\u30bc\u30bc\u30a1\u30a1\u305b\u30de\u307b\u30b0\u30bd\u30d0\u305b\u0451\u88f9\uff66\u307d\uff9d\u30a1"},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Car","odata.id":"http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Car(17)","odata.editLink":"Car(17)","odata.mediaEditLink":"Car(17)/$value","odata.mediaReadLink":"Car(17)/$value","odata.mediaContentType":"*/*","Photo@odata.mediaEditLink":"Car(17)/Photo","Video@odata.mediaEditLink":"Car(17)/Video","VIN":17,"Description":"\u307e\u30a1\u30c1\u30dc\u042f\u66a6\u30de\u30c1\u307e\u531a\u3041\u305d\u30bf\u3093\u30bc\u3073\u305f\u30c1\u307b\u9ed1\u30dd\u3073\u3041\u30bd\u0451\u3093\u6b32\u6b32\uff66\u3092\u30a1\u3
 0a1\u30dd\u3074\u30b0\u4e9c\u30c1\u30dd\u30b0\uff66\u30df\u305d\u30cf\u305b\u30bc\u73f1\u30bc\u305c\u305b\u30dd\u30bc\u30bc\uff41\u88f9\u9ed1\u305d\u307e\u305d\u30c1"}]}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V30/Car/filter/VIN div 2 le 8.xml
----------------------------------------------------------------------
diff --git a/fit/src/main/resources/V30/Car/filter/VIN div 2 le 8.xml b/fit/src/main/resources/V30/Car/filter/VIN div 2 le 8.xml
index 224f8cd..dc5f512 100644
--- a/fit/src/main/resources/V30/Car/filter/VIN div 2 le 8.xml	
+++ b/fit/src/main/resources/V30/Car/filter/VIN div 2 le 8.xml	
@@ -19,4 +19,4 @@
     under the License.
 
 -->
-<feed xml:base="http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/" xmlns="http://www.w3.org/2005/Atom" xmlns:d="http://schemas.microsoft.com/ado/2007/08/dataservices" xmlns:m="http://schemas.microsoft.com/ado/2007/08/dataservices/metadata" xmlns:georss="http://www.georss.org/georss" xmlns:gml="http://www.opengis.net/gml"><id>http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Car</id><title type="text">Car</title><updated>2014-02-13T14:31:04Z</updated><link rel="self" title="Car" href="Car" /><entry><id>http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Car(11)</id><category term="Microsoft.Test.OData.Services.AstoriaDefaultService.Car" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme" /><link rel="edit" title="Car" href="Car(11)" /><title /><updated>2014-02-13T14:31:04Z</updated><author><name /></author><link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/edit-media/Photo" title="Phot
 o" href="Car(11)/Photo" /><link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/edit-media/Video" title="Video" href="Car(11)/Video" /><link rel="edit-media" title="Car" href="Car(11)/$value" /><content type="*/*" src="Car(11)/$value" /><m:properties><d:VIN m:type="Edm.Int32">11</d:VIN><d:Description>cenbviijieljtrtdslbuiqubcvhxhzenidqdnaopplvlqc</d:Description></m:properties></entry><entry><id>http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Car(12)</id><category term="Microsoft.Test.OData.Services.AstoriaDefaultService.Car" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme" /><link rel="edit" title="Car" href="Car(12)" /><title /><updated>2014-02-13T14:31:04Z</updated><author><name /></author><link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/edit-media/Photo" title="Photo" href="Car(12)/Photo" /><link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/edit-media/Video" title="Video" href="Car(12)/Video" /
 ><link rel="edit-media" title="Car" href="Car(12)/$value" /><content type="*/*" src="Car(12)/$value" /><m:properties><d:VIN m:type="Edm.Int32">12</d:VIN><d:Description>lx</d:Description></m:properties></entry><entry><id>http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Car(13)</id><category term="Microsoft.Test.OData.Services.AstoriaDefaultService.Car" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme" /><link rel="edit" title="Car" href="Car(13)" /><title /><updated>2014-02-13T14:31:04Z</updated><author><name /></author><link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/edit-media/Photo" title="Photo" href="Car(13)/Photo" /><link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/edit-media/Video" title="Video" href="Car(13)/Video" /><link rel="edit-media" title="Car" href="Car(13)/$value" /><content type="*/*" src="Car(13)/$value" /><m:properties><d:VIN m:type="Edm.Int32">13</d:VIN><d:Description m:null="true" /></m:p
 roperties></entry><entry><id>http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Car(14)</id><category term="Microsoft.Test.OData.Services.AstoriaDefaultService.Car" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme" /><link rel="edit" title="Car" href="Car(14)" /><title /><updated>2014-02-13T14:31:04Z</updated><author><name /></author><link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/edit-media/Photo" title="Photo" href="Car(14)/Photo" /><link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/edit-media/Video" title="Video" href="Car(14)/Video" /><link rel="edit-media" title="Car" href="Car(14)/$value" /><content type="*/*" src="Car(14)/$value" /><m:properties><d:VIN m:type="Edm.Int32">14</d:VIN><d:Description>畚チびンぁあяまぴひタバァンぴ歹チ歹歹ァまマぞ珱暦ぼ歹グ珱ボチタびゼソゼたグёま畚a畚歹匚畚ァゼ匚Я欲匚チチボびソァぴ暦ぺポソチバЯゼ黑ダ匚マび
 暦ダソク歹まあa裹ソハ歹暦弌aバ暦ぽネ</d:Description></m:properties></entry><entry><id>http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Car(15)</id><category term="Microsoft.Test.OData.Services.AstoriaDefaultService.Car" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme" /><link rel="edit" title="Car" href="Car(15)" /><title /><updated>2014-02-13T14:31:04Z</updated><author><name /></author><link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/edit-media/Photo" title="Photo" href="Car(15)/Photo" /><link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/edit-media/Video" title="Video" href="Car(15)/Video" /><link rel="edit-media" title="Car" href="Car(15)/$value" /><content type="*/*" src="Car(15)/$value" /><m:properties><d:VIN m:type="Edm.Int32">15</d:VIN><d:Description>kphszztczthjacvjnttrarxru</d:Description></m:properties></entry><entry><id>http://localhost:${cargo.servlet.port}/stub/StaticService/V
 30/Static.svc/Car(16)</id><category term="Microsoft.Test.OData.Services.AstoriaDefaultService.Car" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme" /><link rel="edit" title="Car" href="Car(16)" /><title /><updated>2014-02-13T14:31:04Z</updated><author><name /></author><link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/edit-media/Photo" title="Photo" href="Car(16)/Photo" /><link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/edit-media/Video" title="Video" href="Car(16)/Video" /><link rel="edit-media" title="Car" href="Car(16)/$value" /><content type="*/*" src="Car(16)/$value" /><m:properties><d:VIN m:type="Edm.Int32">16</d:VIN><d:Description>ぁゼをあクびゼゼァァせマほグソバせё裹ヲぽンァ</d:Description></m:properties></entry><entry><id>http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Car(17)</id><category term="Microsoft.Test.OData.Services.AstoriaDefaultService.Car" scheme="http://schemas.m
 icrosoft.com/ado/2007/08/dataservices/scheme" /><link rel="edit" title="Car" href="Car(17)" /><title /><updated>2014-02-13T14:31:04Z</updated><author><name /></author><link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/edit-media/Photo" title="Photo" href="Car(17)/Photo" /><link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/edit-media/Video" title="Video" href="Car(17)/Video" /><link rel="edit-media" title="Car" href="Car(17)/$value" /><content type="*/*" src="Car(17)/$value" /><m:properties><d:VIN m:type="Edm.Int32">17</d:VIN><d:Description>まァチボЯ暦マチま匚ぁそタんゼびたチほ黑ポびぁソёん欲欲ヲをァァポぴグ亜チポグヲミそハせゼ珱ゼぜせポゼゼa裹黑そまそチ</d:Description></m:properties></entry></feed>
+<feed xml:base="http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/" xmlns="http://www.w3.org/2005/Atom" xmlns:d="http://schemas.microsoft.com/ado/2007/08/dataservices" xmlns:m="http://schemas.microsoft.com/ado/2007/08/dataservices/metadata" xmlns:georss="http://www.georss.org/georss" xmlns:gml="http://www.opengis.net/gml"><id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Car</id><title type="text">Car</title><updated>2014-02-13T14:31:04Z</updated><link rel="self" title="Car" href="Car" /><entry><id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Car(11)</id><category term="Microsoft.Test.OData.Services.AstoriaDefaultService.Car" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme" /><link rel="edit" title="Car" href="Car(11)" /><title /><updated>2014-02-13T14:31:04Z</updated><author><name /></author><link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/edit-media/Photo" title="P
 hoto" href="Car(11)/Photo" /><link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/edit-media/Video" title="Video" href="Car(11)/Video" /><link rel="edit-media" title="Car" href="Car(11)/$value" /><content type="*/*" src="Car(11)/$value" /><m:properties><d:VIN m:type="Edm.Int32">11</d:VIN><d:Description>cenbviijieljtrtdslbuiqubcvhxhzenidqdnaopplvlqc</d:Description></m:properties></entry><entry><id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Car(12)</id><category term="Microsoft.Test.OData.Services.AstoriaDefaultService.Car" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme" /><link rel="edit" title="Car" href="Car(12)" /><title /><updated>2014-02-13T14:31:04Z</updated><author><name /></author><link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/edit-media/Photo" title="Photo" href="Car(12)/Photo" /><link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/edit-media/Video" title="Video" href="Car(12)/Vide
 o" /><link rel="edit-media" title="Car" href="Car(12)/$value" /><content type="*/*" src="Car(12)/$value" /><m:properties><d:VIN m:type="Edm.Int32">12</d:VIN><d:Description>lx</d:Description></m:properties></entry><entry><id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Car(13)</id><category term="Microsoft.Test.OData.Services.AstoriaDefaultService.Car" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme" /><link rel="edit" title="Car" href="Car(13)" /><title /><updated>2014-02-13T14:31:04Z</updated><author><name /></author><link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/edit-media/Photo" title="Photo" href="Car(13)/Photo" /><link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/edit-media/Video" title="Video" href="Car(13)/Video" /><link rel="edit-media" title="Car" href="Car(13)/$value" /><content type="*/*" src="Car(13)/$value" /><m:properties><d:VIN m:type="Edm.Int32">13</d:VIN><d:Description m:null="true" />
 </m:properties></entry><entry><id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Car(14)</id><category term="Microsoft.Test.OData.Services.AstoriaDefaultService.Car" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme" /><link rel="edit" title="Car" href="Car(14)" /><title /><updated>2014-02-13T14:31:04Z</updated><author><name /></author><link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/edit-media/Photo" title="Photo" href="Car(14)/Photo" /><link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/edit-media/Video" title="Video" href="Car(14)/Video" /><link rel="edit-media" title="Car" href="Car(14)/$value" /><content type="*/*" src="Car(14)/$value" /><m:properties><d:VIN m:type="Edm.Int32">14</d:VIN><d:Description>畚チびンぁあяまぴひタバァンぴ歹チ歹歹ァまマぞ珱暦ぼ歹グ珱ボチタびゼソゼたグёま畚a畚歹匚畚ァゼ匚Я欲匚チチボびソァぴ暦ぺポソチバЯゼ黑ダ匚
 マび暦ダソク歹まあa裹ソハ歹暦弌aバ暦ぽネ</d:Description></m:properties></entry><entry><id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Car(15)</id><category term="Microsoft.Test.OData.Services.AstoriaDefaultService.Car" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme" /><link rel="edit" title="Car" href="Car(15)" /><title /><updated>2014-02-13T14:31:04Z</updated><author><name /></author><link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/edit-media/Photo" title="Photo" href="Car(15)/Photo" /><link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/edit-media/Video" title="Video" href="Car(15)/Video" /><link rel="edit-media" title="Car" href="Car(15)/$value" /><content type="*/*" src="Car(15)/$value" /><m:properties><d:VIN m:type="Edm.Int32">15</d:VIN><d:Description>kphszztczthjacvjnttrarxru</d:Description></m:properties></entry><entry><id>http://localhost:${tomcat.servlet.port}/stub/StaticS
 ervice/V30/Static.svc/Car(16)</id><category term="Microsoft.Test.OData.Services.AstoriaDefaultService.Car" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme" /><link rel="edit" title="Car" href="Car(16)" /><title /><updated>2014-02-13T14:31:04Z</updated><author><name /></author><link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/edit-media/Photo" title="Photo" href="Car(16)/Photo" /><link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/edit-media/Video" title="Video" href="Car(16)/Video" /><link rel="edit-media" title="Car" href="Car(16)/$value" /><content type="*/*" src="Car(16)/$value" /><m:properties><d:VIN m:type="Edm.Int32">16</d:VIN><d:Description>ぁゼをあクびゼゼァァせマほグソバせё裹ヲぽンァ</d:Description></m:properties></entry><entry><id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Car(17)</id><category term="Microsoft.Test.OData.Services.AstoriaDefaultService.Car" scheme="http://
 schemas.microsoft.com/ado/2007/08/dataservices/scheme" /><link rel="edit" title="Car" href="Car(17)" /><title /><updated>2014-02-13T14:31:04Z</updated><author><name /></author><link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/edit-media/Photo" title="Photo" href="Car(17)/Photo" /><link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/edit-media/Video" title="Video" href="Car(17)/Video" /><link rel="edit-media" title="Car" href="Car(17)/$value" /><content type="*/*" src="Car(17)/$value" /><m:properties><d:VIN m:type="Edm.Int32">17</d:VIN><d:Description>まァチボЯ暦マチま匚ぁそタんゼびたチほ黑ポびぁソёん欲欲ヲをァァポぴグ亜チポグヲミそハせゼ珱ゼぜせポゼゼa裹黑そまそチ</d:Description></m:properties></entry></feed>

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V30/Car/filter/VIN le 18 and VIN gt 12.full.json
----------------------------------------------------------------------
diff --git a/fit/src/main/resources/V30/Car/filter/VIN le 18 and VIN gt 12.full.json b/fit/src/main/resources/V30/Car/filter/VIN le 18 and VIN gt 12.full.json
index dfbd04f..ed437bc 100644
--- a/fit/src/main/resources/V30/Car/filter/VIN le 18 and VIN gt 12.full.json	
+++ b/fit/src/main/resources/V30/Car/filter/VIN le 18 and VIN gt 12.full.json	
@@ -1 +1 @@
-{"odata.metadata":"http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/$metadata#Car","value":[{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Car","odata.id":"http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Car(13)","odata.editLink":"Car(13)","odata.mediaEditLink":"Car(13)/$value","odata.mediaReadLink":"Car(13)/$value","odata.mediaContentType":"*/*","Photo@odata.mediaEditLink":"Car(13)/Photo","Video@odata.mediaEditLink":"Car(13)/Video","VIN":13,"Description":null},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Car","odata.id":"http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Car(14)","odata.editLink":"Car(14)","odata.mediaEditLink":"Car(14)/$value","odata.mediaReadLink":"Car(14)/$value","odata.mediaContentType":"*/*","Photo@odata.mediaEditLink":"Car(14)/Photo","Video@odata.mediaEditLink":"Car(14)/Video","VIN":14,"Description":"\u755a\u30c1\u3073\uff9d\u3041\u3042\u044f\u307e
 \u3074\u3072\u30bf\u30d0\u30a1\uff9d\u3074\u6b79\u30c1\u6b79\u6b79\u30a1\u307e\u30de\u305e\u73f1\u66a6\u307c\u6b79\u30b0\u73f1\u30dc\u30c1\u30bf\u3073\u30bc\u30bd\u30bc\u305f\u30b0\u0451\u307e\u755a\uff41\u755a\u6b79\u531a\u755a\u30a1\u30bc\u531a\u042f\u6b32\u531a\u30c1\u30c1\u30dc\u3073\u30bd\u30a1\u3074\u66a6\u307a\u30dd\u30bd\u30c1\u30d0\u042f\u30bc\u9ed1\u30c0\u531a\u30de\u3073\u66a6\u30c0\u30bd\u30af\u6b79\u307e\u3042\uff41\u88f9\u30bd\u30cf\u6b79\u66a6\u5f0c\uff41\u30d0\u66a6\u307d\uff88"},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Car","odata.id":"http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Car(15)","odata.editLink":"Car(15)","odata.mediaEditLink":"Car(15)/$value","odata.mediaReadLink":"Car(15)/$value","odata.mediaContentType":"*/*","Photo@odata.mediaEditLink":"Car(15)/Photo","Video@odata.mediaEditLink":"Car(15)/Video","VIN":15,"Description":"kphszztczthjacvjnttrarxru"},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDe
 faultService.Car","odata.id":"http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Car(16)","odata.editLink":"Car(16)","odata.mediaEditLink":"Car(16)/$value","odata.mediaReadLink":"Car(16)/$value","odata.mediaContentType":"*/*","Photo@odata.mediaEditLink":"Car(16)/Photo","Video@odata.mediaEditLink":"Car(16)/Video","VIN":16,"Description":"\u3041\u30bc\u3092\u3042\u30af\u3073\u30bc\u30bc\u30a1\u30a1\u305b\u30de\u307b\u30b0\u30bd\u30d0\u305b\u0451\u88f9\uff66\u307d\uff9d\u30a1"},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Car","odata.id":"http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Car(17)","odata.editLink":"Car(17)","odata.mediaEditLink":"Car(17)/$value","odata.mediaReadLink":"Car(17)/$value","odata.mediaContentType":"*/*","Photo@odata.mediaEditLink":"Car(17)/Photo","Video@odata.mediaEditLink":"Car(17)/Video","VIN":17,"Description":"\u307e\u30a1\u30c1\u30dc\u042f\u66a6\u30de\u30c1\u307e\u531a\u3041\u305d\u30bf\u30
 93\u30bc\u3073\u305f\u30c1\u307b\u9ed1\u30dd\u3073\u3041\u30bd\u0451\u3093\u6b32\u6b32\uff66\u3092\u30a1\u30a1\u30dd\u3074\u30b0\u4e9c\u30c1\u30dd\u30b0\uff66\u30df\u305d\u30cf\u305b\u30bc\u73f1\u30bc\u305c\u305b\u30dd\u30bc\u30bc\uff41\u88f9\u9ed1\u305d\u307e\u305d\u30c1"},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Car","odata.id":"http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Car(18)","odata.editLink":"Car(18)","odata.mediaEditLink":"Car(18)/$value","odata.mediaReadLink":"Car(18)/$value","odata.mediaContentType":"*/*","Photo@odata.mediaEditLink":"Car(18)/Photo","Video@odata.mediaEditLink":"Car(18)/Video","VIN":18,"Description":"\u0451\u30bc\u30dc\u30bf\u3072\u3079\u30d0\u30bf\u305e\u30a1\u044f\u042f\u755a\u30c0\u30bd\u30be\u30be\u042f\u6b79\u307a\u30dc\u305c\u305f\u30bd\u755a\u73f1\u30de\u6b32\u30de\u30b0\u3042\u755a\u4e5d\u30a1\u755a\u30de\u30b0\u88f9\u30df\u30bc\u30a1\u6b32\u30bd\u5f0c\u755a\u30de\u5f0c\u30c1\u66a6\u30a1\u30dc\u
 305c\u88f9\u30df\u042f\uff41\u307c\u3072\u30dd\u3092\u30be\u5f0c\u6b79"}]}
\ No newline at end of file
+{"odata.metadata":"http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/$metadata#Car","value":[{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Car","odata.id":"http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Car(13)","odata.editLink":"Car(13)","odata.mediaEditLink":"Car(13)/$value","odata.mediaReadLink":"Car(13)/$value","odata.mediaContentType":"*/*","Photo@odata.mediaEditLink":"Car(13)/Photo","Video@odata.mediaEditLink":"Car(13)/Video","VIN":13,"Description":null},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Car","odata.id":"http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Car(14)","odata.editLink":"Car(14)","odata.mediaEditLink":"Car(14)/$value","odata.mediaReadLink":"Car(14)/$value","odata.mediaContentType":"*/*","Photo@odata.mediaEditLink":"Car(14)/Photo","Video@odata.mediaEditLink":"Car(14)/Video","VIN":14,"Description":"\u755a\u30c1\u3073\uff9d\u3041\u3042\u044f\u3
 07e\u3074\u3072\u30bf\u30d0\u30a1\uff9d\u3074\u6b79\u30c1\u6b79\u6b79\u30a1\u307e\u30de\u305e\u73f1\u66a6\u307c\u6b79\u30b0\u73f1\u30dc\u30c1\u30bf\u3073\u30bc\u30bd\u30bc\u305f\u30b0\u0451\u307e\u755a\uff41\u755a\u6b79\u531a\u755a\u30a1\u30bc\u531a\u042f\u6b32\u531a\u30c1\u30c1\u30dc\u3073\u30bd\u30a1\u3074\u66a6\u307a\u30dd\u30bd\u30c1\u30d0\u042f\u30bc\u9ed1\u30c0\u531a\u30de\u3073\u66a6\u30c0\u30bd\u30af\u6b79\u307e\u3042\uff41\u88f9\u30bd\u30cf\u6b79\u66a6\u5f0c\uff41\u30d0\u66a6\u307d\uff88"},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Car","odata.id":"http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Car(15)","odata.editLink":"Car(15)","odata.mediaEditLink":"Car(15)/$value","odata.mediaReadLink":"Car(15)/$value","odata.mediaContentType":"*/*","Photo@odata.mediaEditLink":"Car(15)/Photo","Video@odata.mediaEditLink":"Car(15)/Video","VIN":15,"Description":"kphszztczthjacvjnttrarxru"},{"odata.type":"Microsoft.Test.OData.Services.Astor
 iaDefaultService.Car","odata.id":"http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Car(16)","odata.editLink":"Car(16)","odata.mediaEditLink":"Car(16)/$value","odata.mediaReadLink":"Car(16)/$value","odata.mediaContentType":"*/*","Photo@odata.mediaEditLink":"Car(16)/Photo","Video@odata.mediaEditLink":"Car(16)/Video","VIN":16,"Description":"\u3041\u30bc\u3092\u3042\u30af\u3073\u30bc\u30bc\u30a1\u30a1\u305b\u30de\u307b\u30b0\u30bd\u30d0\u305b\u0451\u88f9\uff66\u307d\uff9d\u30a1"},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Car","odata.id":"http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Car(17)","odata.editLink":"Car(17)","odata.mediaEditLink":"Car(17)/$value","odata.mediaReadLink":"Car(17)/$value","odata.mediaContentType":"*/*","Photo@odata.mediaEditLink":"Car(17)/Photo","Video@odata.mediaEditLink":"Car(17)/Video","VIN":17,"Description":"\u307e\u30a1\u30c1\u30dc\u042f\u66a6\u30de\u30c1\u307e\u531a\u3041\u305d\u30
 bf\u3093\u30bc\u3073\u305f\u30c1\u307b\u9ed1\u30dd\u3073\u3041\u30bd\u0451\u3093\u6b32\u6b32\uff66\u3092\u30a1\u30a1\u30dd\u3074\u30b0\u4e9c\u30c1\u30dd\u30b0\uff66\u30df\u305d\u30cf\u305b\u30bc\u73f1\u30bc\u305c\u305b\u30dd\u30bc\u30bc\uff41\u88f9\u9ed1\u305d\u307e\u305d\u30c1"},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Car","odata.id":"http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Car(18)","odata.editLink":"Car(18)","odata.mediaEditLink":"Car(18)/$value","odata.mediaReadLink":"Car(18)/$value","odata.mediaContentType":"*/*","Photo@odata.mediaEditLink":"Car(18)/Photo","Video@odata.mediaEditLink":"Car(18)/Video","VIN":18,"Description":"\u0451\u30bc\u30dc\u30bf\u3072\u3079\u30d0\u30bf\u305e\u30a1\u044f\u042f\u755a\u30c0\u30bd\u30be\u30be\u042f\u6b79\u307a\u30dc\u305c\u305f\u30bd\u755a\u73f1\u30de\u6b32\u30de\u30b0\u3042\u755a\u4e5d\u30a1\u755a\u30de\u30b0\u88f9\u30df\u30bc\u30a1\u6b32\u30bd\u5f0c\u755a\u30de\u5f0c\u30c1\u66a6\u30a1\
 u30dc\u305c\u88f9\u30df\u042f\uff41\u307c\u3072\u30dd\u3092\u30be\u5f0c\u6b79"}]}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V30/Car/filter/VIN le 18 and VIN gt 12.xml
----------------------------------------------------------------------
diff --git a/fit/src/main/resources/V30/Car/filter/VIN le 18 and VIN gt 12.xml b/fit/src/main/resources/V30/Car/filter/VIN le 18 and VIN gt 12.xml
index 3bcb2ae..a7165ee 100644
--- a/fit/src/main/resources/V30/Car/filter/VIN le 18 and VIN gt 12.xml	
+++ b/fit/src/main/resources/V30/Car/filter/VIN le 18 and VIN gt 12.xml	
@@ -19,4 +19,4 @@
     under the License.
 
 -->
-<feed xml:base="http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/" xmlns="http://www.w3.org/2005/Atom" xmlns:d="http://schemas.microsoft.com/ado/2007/08/dataservices" xmlns:m="http://schemas.microsoft.com/ado/2007/08/dataservices/metadata" xmlns:georss="http://www.georss.org/georss" xmlns:gml="http://www.opengis.net/gml"><id>http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Car</id><title type="text">Car</title><updated>2014-02-13T14:31:06Z</updated><link rel="self" title="Car" href="Car" /><entry><id>http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Car(13)</id><category term="Microsoft.Test.OData.Services.AstoriaDefaultService.Car" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme" /><link rel="edit" title="Car" href="Car(13)" /><title /><updated>2014-02-13T14:31:06Z</updated><author><name /></author><link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/edit-media/Photo" title="Phot
 o" href="Car(13)/Photo" /><link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/edit-media/Video" title="Video" href="Car(13)/Video" /><link rel="edit-media" title="Car" href="Car(13)/$value" /><content type="*/*" src="Car(13)/$value" /><m:properties><d:VIN m:type="Edm.Int32">13</d:VIN><d:Description m:null="true" /></m:properties></entry><entry><id>http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Car(14)</id><category term="Microsoft.Test.OData.Services.AstoriaDefaultService.Car" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme" /><link rel="edit" title="Car" href="Car(14)" /><title /><updated>2014-02-13T14:31:06Z</updated><author><name /></author><link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/edit-media/Photo" title="Photo" href="Car(14)/Photo" /><link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/edit-media/Video" title="Video" href="Car(14)/Video" /><link rel="edit-media" title="Car" href="Car(
 14)/$value" /><content type="*/*" src="Car(14)/$value" /><m:properties><d:VIN m:type="Edm.Int32">14</d:VIN><d:Description>畚チびンぁあяまぴひタバァンぴ歹チ歹歹ァまマぞ珱暦ぼ歹グ珱ボチタびゼソゼたグёま畚a畚歹匚畚ァゼ匚Я欲匚チチボびソァぴ暦ぺポソチバЯゼ黑ダ匚マび暦ダソク歹まあa裹ソハ歹暦弌aバ暦ぽネ</d:Description></m:properties></entry><entry><id>http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Car(15)</id><category term="Microsoft.Test.OData.Services.AstoriaDefaultService.Car" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme" /><link rel="edit" title="Car" href="Car(15)" /><title /><updated>2014-02-13T14:31:06Z</updated><author><name /></author><link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/edit-media/Photo" title="Photo" href="Car(15)/Photo" /><link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/edit-media/Video" titl
 e="Video" href="Car(15)/Video" /><link rel="edit-media" title="Car" href="Car(15)/$value" /><content type="*/*" src="Car(15)/$value" /><m:properties><d:VIN m:type="Edm.Int32">15</d:VIN><d:Description>kphszztczthjacvjnttrarxru</d:Description></m:properties></entry><entry><id>http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Car(16)</id><category term="Microsoft.Test.OData.Services.AstoriaDefaultService.Car" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme" /><link rel="edit" title="Car" href="Car(16)" /><title /><updated>2014-02-13T14:31:06Z</updated><author><name /></author><link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/edit-media/Photo" title="Photo" href="Car(16)/Photo" /><link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/edit-media/Video" title="Video" href="Car(16)/Video" /><link rel="edit-media" title="Car" href="Car(16)/$value" /><content type="*/*" src="Car(16)/$value" /><m:properties><d:VIN m:type="Ed
 m.Int32">16</d:VIN><d:Description>ぁゼをあクびゼゼァァせマほグソバせё裹ヲぽンァ</d:Description></m:properties></entry><entry><id>http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Car(17)</id><category term="Microsoft.Test.OData.Services.AstoriaDefaultService.Car" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme" /><link rel="edit" title="Car" href="Car(17)" /><title /><updated>2014-02-13T14:31:06Z</updated><author><name /></author><link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/edit-media/Photo" title="Photo" href="Car(17)/Photo" /><link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/edit-media/Video" title="Video" href="Car(17)/Video" /><link rel="edit-media" title="Car" href="Car(17)/$value" /><content type="*/*" src="Car(17)/$value" /><m:properties><d:VIN m:type="Edm.Int32">17</d:VIN><d:Description>まァチボЯ暦マチま匚ぁそタんゼびたチほ黑ポびぁソёん欲欲ヲを�
 ��ァポぴグ亜チポグヲミそハせゼ珱ゼぜせポゼゼa裹黑そまそチ</d:Description></m:properties></entry><entry><id>http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Car(18)</id><category term="Microsoft.Test.OData.Services.AstoriaDefaultService.Car" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme" /><link rel="edit" title="Car" href="Car(18)" /><title /><updated>2014-02-13T14:31:06Z</updated><author><name /></author><link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/edit-media/Photo" title="Photo" href="Car(18)/Photo" /><link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/edit-media/Video" title="Video" href="Car(18)/Video" /><link rel="edit-media" title="Car" href="Car(18)/$value" /><content type="*/*" src="Car(18)/$value" /><m:properties><d:VIN m:type="Edm.Int32">18</d:VIN><d:Description>ёゼボタひべバタぞァяЯ畚ダソゾゾЯ歹ぺボぜたソ畚珱マ欲マグあ畚九ァ畚マ�
 ��裹ミゼァ欲ソ弌畚マ弌チ暦ァボぜ裹ミЯaぼひポをゾ弌歹</d:Description></m:properties></entry></feed>
\ No newline at end of file
+<feed xml:base="http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/" xmlns="http://www.w3.org/2005/Atom" xmlns:d="http://schemas.microsoft.com/ado/2007/08/dataservices" xmlns:m="http://schemas.microsoft.com/ado/2007/08/dataservices/metadata" xmlns:georss="http://www.georss.org/georss" xmlns:gml="http://www.opengis.net/gml"><id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Car</id><title type="text">Car</title><updated>2014-02-13T14:31:06Z</updated><link rel="self" title="Car" href="Car" /><entry><id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Car(13)</id><category term="Microsoft.Test.OData.Services.AstoriaDefaultService.Car" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme" /><link rel="edit" title="Car" href="Car(13)" /><title /><updated>2014-02-13T14:31:06Z</updated><author><name /></author><link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/edit-media/Photo" title="P
 hoto" href="Car(13)/Photo" /><link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/edit-media/Video" title="Video" href="Car(13)/Video" /><link rel="edit-media" title="Car" href="Car(13)/$value" /><content type="*/*" src="Car(13)/$value" /><m:properties><d:VIN m:type="Edm.Int32">13</d:VIN><d:Description m:null="true" /></m:properties></entry><entry><id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Car(14)</id><category term="Microsoft.Test.OData.Services.AstoriaDefaultService.Car" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme" /><link rel="edit" title="Car" href="Car(14)" /><title /><updated>2014-02-13T14:31:06Z</updated><author><name /></author><link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/edit-media/Photo" title="Photo" href="Car(14)/Photo" /><link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/edit-media/Video" title="Video" href="Car(14)/Video" /><link rel="edit-media" title="Car" href="
 Car(14)/$value" /><content type="*/*" src="Car(14)/$value" /><m:properties><d:VIN m:type="Edm.Int32">14</d:VIN><d:Description>畚チびンぁあяまぴひタバァンぴ歹チ歹歹ァまマぞ珱暦ぼ歹グ珱ボチタびゼソゼたグёま畚a畚歹匚畚ァゼ匚Я欲匚チチボびソァぴ暦ぺポソチバЯゼ黑ダ匚マび暦ダソク歹まあa裹ソハ歹暦弌aバ暦ぽネ</d:Description></m:properties></entry><entry><id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Car(15)</id><category term="Microsoft.Test.OData.Services.AstoriaDefaultService.Car" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme" /><link rel="edit" title="Car" href="Car(15)" /><title /><updated>2014-02-13T14:31:06Z</updated><author><name /></author><link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/edit-media/Photo" title="Photo" href="Car(15)/Photo" /><link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/edit-media/Video"
  title="Video" href="Car(15)/Video" /><link rel="edit-media" title="Car" href="Car(15)/$value" /><content type="*/*" src="Car(15)/$value" /><m:properties><d:VIN m:type="Edm.Int32">15</d:VIN><d:Description>kphszztczthjacvjnttrarxru</d:Description></m:properties></entry><entry><id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Car(16)</id><category term="Microsoft.Test.OData.Services.AstoriaDefaultService.Car" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme" /><link rel="edit" title="Car" href="Car(16)" /><title /><updated>2014-02-13T14:31:06Z</updated><author><name /></author><link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/edit-media/Photo" title="Photo" href="Car(16)/Photo" /><link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/edit-media/Video" title="Video" href="Car(16)/Video" /><link rel="edit-media" title="Car" href="Car(16)/$value" /><content type="*/*" src="Car(16)/$value" /><m:properties><d:VIN m:ty
 pe="Edm.Int32">16</d:VIN><d:Description>ぁゼをあクびゼゼァァせマほグソバせё裹ヲぽンァ</d:Description></m:properties></entry><entry><id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Car(17)</id><category term="Microsoft.Test.OData.Services.AstoriaDefaultService.Car" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme" /><link rel="edit" title="Car" href="Car(17)" /><title /><updated>2014-02-13T14:31:06Z</updated><author><name /></author><link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/edit-media/Photo" title="Photo" href="Car(17)/Photo" /><link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/edit-media/Video" title="Video" href="Car(17)/Video" /><link rel="edit-media" title="Car" href="Car(17)/$value" /><content type="*/*" src="Car(17)/$value" /><m:properties><d:VIN m:type="Edm.Int32">17</d:VIN><d:Description>まァチボЯ暦マチま匚ぁそタんゼびたチほ黑ポびぁソёん欲欲
 ヲをァァポぴグ亜チポグヲミそハせゼ珱ゼぜせポゼゼa裹黑そまそチ</d:Description></m:properties></entry><entry><id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Car(18)</id><category term="Microsoft.Test.OData.Services.AstoriaDefaultService.Car" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme" /><link rel="edit" title="Car" href="Car(18)" /><title /><updated>2014-02-13T14:31:06Z</updated><author><name /></author><link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/edit-media/Photo" title="Photo" href="Car(18)/Photo" /><link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/edit-media/Video" title="Video" href="Car(18)/Video" /><link rel="edit-media" title="Car" href="Car(18)/$value" /><content type="*/*" src="Car(18)/$value" /><m:properties><d:VIN m:type="Edm.Int32">18</d:VIN><d:Description>ёゼボタひべバタぞァяЯ畚ダソゾゾЯ歹ぺボぜたソ畚珱マ欲マグあ畚九�
 �畚マグ裹ミゼァ欲ソ弌畚マ弌チ暦ァボぜ裹ミЯaぼひポをゾ弌歹</d:Description></m:properties></entry></feed>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V30/Car/filter/VIN mul 2 le 30.full.json
----------------------------------------------------------------------
diff --git a/fit/src/main/resources/V30/Car/filter/VIN mul 2 le 30.full.json b/fit/src/main/resources/V30/Car/filter/VIN mul 2 le 30.full.json
index 657b3d6..e15fca2 100644
--- a/fit/src/main/resources/V30/Car/filter/VIN mul 2 le 30.full.json	
+++ b/fit/src/main/resources/V30/Car/filter/VIN mul 2 le 30.full.json	
@@ -1 +1 @@
-{"odata.metadata":"http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/$metadata#Car","value":[{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Car","odata.id":"http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Car(11)","odata.editLink":"Car(11)","odata.mediaEditLink":"Car(11)/$value","odata.mediaReadLink":"Car(11)/$value","odata.mediaContentType":"*/*","Photo@odata.mediaEditLink":"Car(11)/Photo","Video@odata.mediaEditLink":"Car(11)/Video","VIN":11,"Description":"cenbviijieljtrtdslbuiqubcvhxhzenidqdnaopplvlqc"},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Car","odata.id":"http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Car(12)","odata.editLink":"Car(12)","odata.mediaEditLink":"Car(12)/$value","odata.mediaReadLink":"Car(12)/$value","odata.mediaContentType":"*/*","Photo@odata.mediaEditLink":"Car(12)/Photo","Video@odata.mediaEditLink":"Car(12)/Video","VIN":12,"Description":"lx"}
 ,{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Car","odata.id":"http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Car(13)","odata.editLink":"Car(13)","odata.mediaEditLink":"Car(13)/$value","odata.mediaReadLink":"Car(13)/$value","odata.mediaContentType":"*/*","Photo@odata.mediaEditLink":"Car(13)/Photo","Video@odata.mediaEditLink":"Car(13)/Video","VIN":13,"Description":null},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Car","odata.id":"http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Car(14)","odata.editLink":"Car(14)","odata.mediaEditLink":"Car(14)/$value","odata.mediaReadLink":"Car(14)/$value","odata.mediaContentType":"*/*","Photo@odata.mediaEditLink":"Car(14)/Photo","Video@odata.mediaEditLink":"Car(14)/Video","VIN":14,"Description":"\u755a\u30c1\u3073\uff9d\u3041\u3042\u044f\u307e\u3074\u3072\u30bf\u30d0\u30a1\uff9d\u3074\u6b79\u30c1\u6b79\u6b79\u30a1\u307e\u30de\u305e\u73f1\u66a6\u307c\u6b79\
 u30b0\u73f1\u30dc\u30c1\u30bf\u3073\u30bc\u30bd\u30bc\u305f\u30b0\u0451\u307e\u755a\uff41\u755a\u6b79\u531a\u755a\u30a1\u30bc\u531a\u042f\u6b32\u531a\u30c1\u30c1\u30dc\u3073\u30bd\u30a1\u3074\u66a6\u307a\u30dd\u30bd\u30c1\u30d0\u042f\u30bc\u9ed1\u30c0\u531a\u30de\u3073\u66a6\u30c0\u30bd\u30af\u6b79\u307e\u3042\uff41\u88f9\u30bd\u30cf\u6b79\u66a6\u5f0c\uff41\u30d0\u66a6\u307d\uff88"},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Car","odata.id":"http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Car(15)","odata.editLink":"Car(15)","odata.mediaEditLink":"Car(15)/$value","odata.mediaReadLink":"Car(15)/$value","odata.mediaContentType":"*/*","Photo@odata.mediaEditLink":"Car(15)/Photo","Video@odata.mediaEditLink":"Car(15)/Video","VIN":15,"Description":"kphszztczthjacvjnttrarxru"}]}
\ No newline at end of file
+{"odata.metadata":"http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/$metadata#Car","value":[{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Car","odata.id":"http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Car(11)","odata.editLink":"Car(11)","odata.mediaEditLink":"Car(11)/$value","odata.mediaReadLink":"Car(11)/$value","odata.mediaContentType":"*/*","Photo@odata.mediaEditLink":"Car(11)/Photo","Video@odata.mediaEditLink":"Car(11)/Video","VIN":11,"Description":"cenbviijieljtrtdslbuiqubcvhxhzenidqdnaopplvlqc"},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Car","odata.id":"http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Car(12)","odata.editLink":"Car(12)","odata.mediaEditLink":"Car(12)/$value","odata.mediaReadLink":"Car(12)/$value","odata.mediaContentType":"*/*","Photo@odata.mediaEditLink":"Car(12)/Photo","Video@odata.mediaEditLink":"Car(12)/Video","VIN":12,"Description":"l
 x"},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Car","odata.id":"http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Car(13)","odata.editLink":"Car(13)","odata.mediaEditLink":"Car(13)/$value","odata.mediaReadLink":"Car(13)/$value","odata.mediaContentType":"*/*","Photo@odata.mediaEditLink":"Car(13)/Photo","Video@odata.mediaEditLink":"Car(13)/Video","VIN":13,"Description":null},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Car","odata.id":"http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Car(14)","odata.editLink":"Car(14)","odata.mediaEditLink":"Car(14)/$value","odata.mediaReadLink":"Car(14)/$value","odata.mediaContentType":"*/*","Photo@odata.mediaEditLink":"Car(14)/Photo","Video@odata.mediaEditLink":"Car(14)/Video","VIN":14,"Description":"\u755a\u30c1\u3073\uff9d\u3041\u3042\u044f\u307e\u3074\u3072\u30bf\u30d0\u30a1\uff9d\u3074\u6b79\u30c1\u6b79\u6b79\u30a1\u307e\u30de\u305e\u73f1\u66a6\u307c\u
 6b79\u30b0\u73f1\u30dc\u30c1\u30bf\u3073\u30bc\u30bd\u30bc\u305f\u30b0\u0451\u307e\u755a\uff41\u755a\u6b79\u531a\u755a\u30a1\u30bc\u531a\u042f\u6b32\u531a\u30c1\u30c1\u30dc\u3073\u30bd\u30a1\u3074\u66a6\u307a\u30dd\u30bd\u30c1\u30d0\u042f\u30bc\u9ed1\u30c0\u531a\u30de\u3073\u66a6\u30c0\u30bd\u30af\u6b79\u307e\u3042\uff41\u88f9\u30bd\u30cf\u6b79\u66a6\u5f0c\uff41\u30d0\u66a6\u307d\uff88"},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Car","odata.id":"http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Car(15)","odata.editLink":"Car(15)","odata.mediaEditLink":"Car(15)/$value","odata.mediaReadLink":"Car(15)/$value","odata.mediaContentType":"*/*","Photo@odata.mediaEditLink":"Car(15)/Photo","Video@odata.mediaEditLink":"Car(15)/Video","VIN":15,"Description":"kphszztczthjacvjnttrarxru"}]}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V30/Car/filter/VIN mul 2 le 30.xml
----------------------------------------------------------------------
diff --git a/fit/src/main/resources/V30/Car/filter/VIN mul 2 le 30.xml b/fit/src/main/resources/V30/Car/filter/VIN mul 2 le 30.xml
index bf4ac6f..2792e03 100644
--- a/fit/src/main/resources/V30/Car/filter/VIN mul 2 le 30.xml	
+++ b/fit/src/main/resources/V30/Car/filter/VIN mul 2 le 30.xml	
@@ -19,4 +19,4 @@
     under the License.
 
 -->
-<feed xml:base="http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/" xmlns="http://www.w3.org/2005/Atom" xmlns:d="http://schemas.microsoft.com/ado/2007/08/dataservices" xmlns:m="http://schemas.microsoft.com/ado/2007/08/dataservices/metadata" xmlns:georss="http://www.georss.org/georss" xmlns:gml="http://www.opengis.net/gml"><id>http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Car</id><title type="text">Car</title><updated>2014-02-13T14:31:04Z</updated><link rel="self" title="Car" href="Car" /><entry><id>http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Car(11)</id><category term="Microsoft.Test.OData.Services.AstoriaDefaultService.Car" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme" /><link rel="edit" title="Car" href="Car(11)" /><title /><updated>2014-02-13T14:31:04Z</updated><author><name /></author><link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/edit-media/Photo" title="Phot
 o" href="Car(11)/Photo" /><link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/edit-media/Video" title="Video" href="Car(11)/Video" /><link rel="edit-media" title="Car" href="Car(11)/$value" /><content type="*/*" src="Car(11)/$value" /><m:properties><d:VIN m:type="Edm.Int32">11</d:VIN><d:Description>cenbviijieljtrtdslbuiqubcvhxhzenidqdnaopplvlqc</d:Description></m:properties></entry><entry><id>http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Car(12)</id><category term="Microsoft.Test.OData.Services.AstoriaDefaultService.Car" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme" /><link rel="edit" title="Car" href="Car(12)" /><title /><updated>2014-02-13T14:31:04Z</updated><author><name /></author><link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/edit-media/Photo" title="Photo" href="Car(12)/Photo" /><link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/edit-media/Video" title="Video" href="Car(12)/Video" /
 ><link rel="edit-media" title="Car" href="Car(12)/$value" /><content type="*/*" src="Car(12)/$value" /><m:properties><d:VIN m:type="Edm.Int32">12</d:VIN><d:Description>lx</d:Description></m:properties></entry><entry><id>http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Car(13)</id><category term="Microsoft.Test.OData.Services.AstoriaDefaultService.Car" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme" /><link rel="edit" title="Car" href="Car(13)" /><title /><updated>2014-02-13T14:31:04Z</updated><author><name /></author><link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/edit-media/Photo" title="Photo" href="Car(13)/Photo" /><link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/edit-media/Video" title="Video" href="Car(13)/Video" /><link rel="edit-media" title="Car" href="Car(13)/$value" /><content type="*/*" src="Car(13)/$value" /><m:properties><d:VIN m:type="Edm.Int32">13</d:VIN><d:Description m:null="true" /></m:p
 roperties></entry><entry><id>http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Car(14)</id><category term="Microsoft.Test.OData.Services.AstoriaDefaultService.Car" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme" /><link rel="edit" title="Car" href="Car(14)" /><title /><updated>2014-02-13T14:31:04Z</updated><author><name /></author><link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/edit-media/Photo" title="Photo" href="Car(14)/Photo" /><link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/edit-media/Video" title="Video" href="Car(14)/Video" /><link rel="edit-media" title="Car" href="Car(14)/$value" /><content type="*/*" src="Car(14)/$value" /><m:properties><d:VIN m:type="Edm.Int32">14</d:VIN><d:Description>畚チびンぁあяまぴひタバァンぴ歹チ歹歹ァまマぞ珱暦ぼ歹グ珱ボチタびゼソゼたグёま畚a畚歹匚畚ァゼ匚Я欲匚チチボびソァぴ暦ぺポソチバЯゼ黑ダ匚マび
 暦ダソク歹まあa裹ソハ歹暦弌aバ暦ぽネ</d:Description></m:properties></entry><entry><id>http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Car(15)</id><category term="Microsoft.Test.OData.Services.AstoriaDefaultService.Car" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme" /><link rel="edit" title="Car" href="Car(15)" /><title /><updated>2014-02-13T14:31:04Z</updated><author><name /></author><link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/edit-media/Photo" title="Photo" href="Car(15)/Photo" /><link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/edit-media/Video" title="Video" href="Car(15)/Video" /><link rel="edit-media" title="Car" href="Car(15)/$value" /><content type="*/*" src="Car(15)/$value" /><m:properties><d:VIN m:type="Edm.Int32">15</d:VIN><d:Description>kphszztczthjacvjnttrarxru</d:Description></m:properties></entry></feed>
\ No newline at end of file
+<feed xml:base="http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/" xmlns="http://www.w3.org/2005/Atom" xmlns:d="http://schemas.microsoft.com/ado/2007/08/dataservices" xmlns:m="http://schemas.microsoft.com/ado/2007/08/dataservices/metadata" xmlns:georss="http://www.georss.org/georss" xmlns:gml="http://www.opengis.net/gml"><id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Car</id><title type="text">Car</title><updated>2014-02-13T14:31:04Z</updated><link rel="self" title="Car" href="Car" /><entry><id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Car(11)</id><category term="Microsoft.Test.OData.Services.AstoriaDefaultService.Car" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme" /><link rel="edit" title="Car" href="Car(11)" /><title /><updated>2014-02-13T14:31:04Z</updated><author><name /></author><link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/edit-media/Photo" title="P
 hoto" href="Car(11)/Photo" /><link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/edit-media/Video" title="Video" href="Car(11)/Video" /><link rel="edit-media" title="Car" href="Car(11)/$value" /><content type="*/*" src="Car(11)/$value" /><m:properties><d:VIN m:type="Edm.Int32">11</d:VIN><d:Description>cenbviijieljtrtdslbuiqubcvhxhzenidqdnaopplvlqc</d:Description></m:properties></entry><entry><id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Car(12)</id><category term="Microsoft.Test.OData.Services.AstoriaDefaultService.Car" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme" /><link rel="edit" title="Car" href="Car(12)" /><title /><updated>2014-02-13T14:31:04Z</updated><author><name /></author><link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/edit-media/Photo" title="Photo" href="Car(12)/Photo" /><link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/edit-media/Video" title="Video" href="Car(12)/Vide
 o" /><link rel="edit-media" title="Car" href="Car(12)/$value" /><content type="*/*" src="Car(12)/$value" /><m:properties><d:VIN m:type="Edm.Int32">12</d:VIN><d:Description>lx</d:Description></m:properties></entry><entry><id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Car(13)</id><category term="Microsoft.Test.OData.Services.AstoriaDefaultService.Car" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme" /><link rel="edit" title="Car" href="Car(13)" /><title /><updated>2014-02-13T14:31:04Z</updated><author><name /></author><link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/edit-media/Photo" title="Photo" href="Car(13)/Photo" /><link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/edit-media/Video" title="Video" href="Car(13)/Video" /><link rel="edit-media" title="Car" href="Car(13)/$value" /><content type="*/*" src="Car(13)/$value" /><m:properties><d:VIN m:type="Edm.Int32">13</d:VIN><d:Description m:null="true" />
 </m:properties></entry><entry><id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Car(14)</id><category term="Microsoft.Test.OData.Services.AstoriaDefaultService.Car" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme" /><link rel="edit" title="Car" href="Car(14)" /><title /><updated>2014-02-13T14:31:04Z</updated><author><name /></author><link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/edit-media/Photo" title="Photo" href="Car(14)/Photo" /><link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/edit-media/Video" title="Video" href="Car(14)/Video" /><link rel="edit-media" title="Car" href="Car(14)/$value" /><content type="*/*" src="Car(14)/$value" /><m:properties><d:VIN m:type="Edm.Int32">14</d:VIN><d:Description>畚チびンぁあяまぴひタバァンぴ歹チ歹歹ァまマぞ珱暦ぼ歹グ珱ボチタびゼソゼたグёま畚a畚歹匚畚ァゼ匚Я欲匚チチボびソァぴ暦ぺポソチバЯゼ黑ダ匚
 マび暦ダソク歹まあa裹ソハ歹暦弌aバ暦ぽネ</d:Description></m:properties></entry><entry><id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Car(15)</id><category term="Microsoft.Test.OData.Services.AstoriaDefaultService.Car" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme" /><link rel="edit" title="Car" href="Car(15)" /><title /><updated>2014-02-13T14:31:04Z</updated><author><name /></author><link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/edit-media/Photo" title="Photo" href="Car(15)/Photo" /><link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/edit-media/Video" title="Video" href="Car(15)/Video" /><link rel="edit-media" title="Car" href="Car(15)/$value" /><content type="*/*" src="Car(15)/$value" /><m:properties><d:VIN m:type="Edm.Int32">15</d:VIN><d:Description>kphszztczthjacvjnttrarxru</d:Description></m:properties></entry></feed>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V30/Car/filter/not (((VIN ge 16) or (VIN le 12))).full.json
----------------------------------------------------------------------
diff --git a/fit/src/main/resources/V30/Car/filter/not (((VIN ge 16) or (VIN le 12))).full.json b/fit/src/main/resources/V30/Car/filter/not (((VIN ge 16) or (VIN le 12))).full.json
index 3106505..683836c 100644
--- a/fit/src/main/resources/V30/Car/filter/not (((VIN ge 16) or (VIN le 12))).full.json	
+++ b/fit/src/main/resources/V30/Car/filter/not (((VIN ge 16) or (VIN le 12))).full.json	
@@ -1 +1 @@
-{"odata.metadata":"http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/$metadata#Car","value":[{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Car","odata.id":"http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Car(13)","odata.editLink":"Car(13)","odata.mediaEditLink":"Car(13)/$value","odata.mediaReadLink":"Car(13)/$value","odata.mediaContentType":"application/octet-stream","Photo@odata.mediaEditLink":"Car(13)/Photo","Video@odata.mediaEditLink":"Car(13)/Video","VIN":13,"Description":null},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Car","odata.id":"http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Car(14)","odata.editLink":"Car(14)","odata.mediaEditLink":"Car(14)/$value","odata.mediaReadLink":"Car(14)/$value","odata.mediaContentType":"application/octet-stream","Photo@odata.mediaEditLink":"Car(14)/Photo","Video@odata.mediaEditLink":"Car(14)/Video","VIN":14,"Description":"New De
 scription(1392222565917)"},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Car","odata.id":"http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Car(15)","odata.editLink":"Car(15)","odata.mediaEditLink":"Car(15)/$value","odata.mediaReadLink":"Car(15)/$value","odata.mediaContentType":"application/octet-stream","Photo@odata.mediaEditLink":"Car(15)/Photo","Video@odata.mediaEditLink":"Car(15)/Video","VIN":15,"Description":"kphszztczthjacvjnttrarxru"}]}
\ No newline at end of file
+{"odata.metadata":"http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/$metadata#Car","value":[{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Car","odata.id":"http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Car(13)","odata.editLink":"Car(13)","odata.mediaEditLink":"Car(13)/$value","odata.mediaReadLink":"Car(13)/$value","odata.mediaContentType":"application/octet-stream","Photo@odata.mediaEditLink":"Car(13)/Photo","Video@odata.mediaEditLink":"Car(13)/Video","VIN":13,"Description":null},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Car","odata.id":"http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Car(14)","odata.editLink":"Car(14)","odata.mediaEditLink":"Car(14)/$value","odata.mediaReadLink":"Car(14)/$value","odata.mediaContentType":"application/octet-stream","Photo@odata.mediaEditLink":"Car(14)/Photo","Video@odata.mediaEditLink":"Car(14)/Video","VIN":14,"Description":"New
  Description(1392222565917)"},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Car","odata.id":"http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Car(15)","odata.editLink":"Car(15)","odata.mediaEditLink":"Car(15)/$value","odata.mediaReadLink":"Car(15)/$value","odata.mediaContentType":"application/octet-stream","Photo@odata.mediaEditLink":"Car(15)/Photo","Video@odata.mediaEditLink":"Car(15)/Video","VIN":15,"Description":"kphszztczthjacvjnttrarxru"}]}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V30/Car/filter/not (((VIN ge 16) or (VIN le 12))).xml
----------------------------------------------------------------------
diff --git a/fit/src/main/resources/V30/Car/filter/not (((VIN ge 16) or (VIN le 12))).xml b/fit/src/main/resources/V30/Car/filter/not (((VIN ge 16) or (VIN le 12))).xml
index 9baac4d..83dd66e 100644
--- a/fit/src/main/resources/V30/Car/filter/not (((VIN ge 16) or (VIN le 12))).xml	
+++ b/fit/src/main/resources/V30/Car/filter/not (((VIN ge 16) or (VIN le 12))).xml	
@@ -19,13 +19,13 @@
     under the License.
 
 -->
-<feed xml:base="http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/" xmlns="http://www.w3.org/2005/Atom" xmlns:d="http://schemas.microsoft.com/ado/2007/08/dataservices" xmlns:m="http://schemas.microsoft.com/ado/2007/08/dataservices/metadata" xmlns:georss="http://www.georss.org/georss" xmlns:gml="http://www.opengis.net/gml">
-  <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Car</id>
+<feed xml:base="http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/" xmlns="http://www.w3.org/2005/Atom" xmlns:d="http://schemas.microsoft.com/ado/2007/08/dataservices" xmlns:m="http://schemas.microsoft.com/ado/2007/08/dataservices/metadata" xmlns:georss="http://www.georss.org/georss" xmlns:gml="http://www.opengis.net/gml">
+  <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Car</id>
   <title type="text">Car</title>
   <updated>2014-02-13T12:09:31Z</updated>
   <link rel="self" title="Car" href="Car" />
   <entry>
-    <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Car(13)</id>
+    <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Car(13)</id>
     <category term="Microsoft.Test.OData.Services.AstoriaDefaultService.Car" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme" />
     <link rel="edit" title="Car" href="Car(13)" />
     <title />
@@ -43,7 +43,7 @@
     </m:properties>
   </entry>
   <entry>
-    <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Car(14)</id>
+    <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Car(14)</id>
     <category term="Microsoft.Test.OData.Services.AstoriaDefaultService.Car" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme" />
     <link rel="edit" title="Car" href="Car(14)" />
     <title />
@@ -61,7 +61,7 @@
     </m:properties>
   </entry>
   <entry>
-    <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Car(15)</id>
+    <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Car(15)</id>
     <category term="Microsoft.Test.OData.Services.AstoriaDefaultService.Car" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme" />
     <link rel="edit" title="Car" href="Car(15)" />
     <title />

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V30/Car/filter/startswith(Description,'cen').full.json
----------------------------------------------------------------------
diff --git a/fit/src/main/resources/V30/Car/filter/startswith(Description,'cen').full.json b/fit/src/main/resources/V30/Car/filter/startswith(Description,'cen').full.json
index a314432..7f534c5 100644
--- a/fit/src/main/resources/V30/Car/filter/startswith(Description,'cen').full.json
+++ b/fit/src/main/resources/V30/Car/filter/startswith(Description,'cen').full.json
@@ -1 +1 @@
-{"odata.metadata":"http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/$metadata#Car","value":[{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Car","odata.id":"http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Car(11)","odata.editLink":"Car(11)","odata.mediaEditLink":"Car(11)/$value","odata.mediaReadLink":"Car(11)/$value","odata.mediaContentType":"application/octet-stream","Photo@odata.mediaEditLink":"Car(11)/Photo","Video@odata.mediaEditLink":"Car(11)/Video","VIN":11,"Description":"cenbviijieljtrtdslbuiqubcvhxhzenidqdnaopplvlqc"}]}
\ No newline at end of file
+{"odata.metadata":"http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/$metadata#Car","value":[{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Car","odata.id":"http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Car(11)","odata.editLink":"Car(11)","odata.mediaEditLink":"Car(11)/$value","odata.mediaReadLink":"Car(11)/$value","odata.mediaContentType":"application/octet-stream","Photo@odata.mediaEditLink":"Car(11)/Photo","Video@odata.mediaEditLink":"Car(11)/Video","VIN":11,"Description":"cenbviijieljtrtdslbuiqubcvhxhzenidqdnaopplvlqc"}]}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V30/Car/filter/startswith(Description,'cen').xml
----------------------------------------------------------------------
diff --git a/fit/src/main/resources/V30/Car/filter/startswith(Description,'cen').xml b/fit/src/main/resources/V30/Car/filter/startswith(Description,'cen').xml
index 05cfcb1..e3cc9f0 100644
--- a/fit/src/main/resources/V30/Car/filter/startswith(Description,'cen').xml
+++ b/fit/src/main/resources/V30/Car/filter/startswith(Description,'cen').xml
@@ -19,13 +19,13 @@
     under the License.
 
 -->
-<feed xml:base="http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/" xmlns="http://www.w3.org/2005/Atom" xmlns:d="http://schemas.microsoft.com/ado/2007/08/dataservices" xmlns:m="http://schemas.microsoft.com/ado/2007/08/dataservices/metadata" xmlns:georss="http://www.georss.org/georss" xmlns:gml="http://www.opengis.net/gml">
-  <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Car</id>
+<feed xml:base="http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/" xmlns="http://www.w3.org/2005/Atom" xmlns:d="http://schemas.microsoft.com/ado/2007/08/dataservices" xmlns:m="http://schemas.microsoft.com/ado/2007/08/dataservices/metadata" xmlns:georss="http://www.georss.org/georss" xmlns:gml="http://www.opengis.net/gml">
+  <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Car</id>
   <title type="text">Car</title>
   <updated>2014-02-13T12:09:32Z</updated>
   <link rel="self" title="Car" href="Car" />
   <entry>
-    <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Car(11)</id>
+    <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Car(11)</id>
     <category term="Microsoft.Test.OData.Services.AstoriaDefaultService.Car" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme" />
     <link rel="edit" title="Car" href="Car(11)" />
     <title />