Merged CMIS063 to HEAD

15327: 0.62 final update: Add feed links as per spec
  15334: 0.62 final update: queries working again.
  15350: 0.62 final update: query via GET
  15362: 0.62 final update: query uri template and query result set feed as per 0.62
  15434: Fix decoding issue retrieving query string of request.
  15441: 0.62 final updates: fixes to allow CMIS Fileshare browsing

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@17231 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261

source/java/org/alfresco/cmis/search/CmisFunctionEvaluationContext.java

@@ -28,6 +28,7 @@ import java.io.Serializable;
 import java.util.Collection;
 import java.util.Map;
 
+import org.alfresco.cmis.CMISDictionaryModel;
 import org.alfresco.cmis.CMISDictionaryService;
 import org.alfresco.cmis.CMISPropertyDefinition;
 import org.alfresco.cmis.mapping.CMISMapping;
@@ -274,15 +275,7 @@ public class CmisFunctionEvaluationContext implements FunctionEvaluationContext
     
     public boolean isObjectId(String propertyName)
     {
-        CMISPropertyDefinition propertyDef = cmisDictionaryService.findProperty(propertyName, null);
-        if(propertyDef == null)
-        {
-            return false;
-        }
-        else
-        {
-            return CMISMapping.PROP_OBJECT_ID_QNAME.equals(propertyDef.getPropertyId().getQName());
-        }
+        return CMISDictionaryModel.PROP_OBJECT_ID.equalsIgnoreCase(propertyName);
     }
 
     public boolean isOrderable(String fieldName)