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

config/alfresco/cmis-api-context.xml

@@ -36,7 +36,7 @@
     </bean>
 
     <bean id="CMISService" class="org.alfresco.cmis.mapping.CMISServicesImpl">
-        <property name="CMISSpecVersion"><value>0.61</value></property>
+        <property name="CMISSpecVersion"><value>0.62</value></property>
         <property name="defaultRootPath"><value>workspace/SpacesStore/Company Home</value></property>
         <property name="dictionaryService" ref="dictionaryService" />
         <property name="CMISDictionaryService" ref="CMISDictionaryService" />

source/java/org/alfresco/cmis/mapping/CMISMapping.java

@@ -94,9 +94,6 @@ public class CMISMapping implements InitializingBean
     public static CMISTypeId OBJECT_TYPE_ID = new CMISTypeId(CMISScope.OBJECT, OBJECT_QNAME, CMIS_MODEL_NS + ":" + OBJECT_QNAME.getLocalName(), OBJECT_QNAME);
     public static CMISTypeId FILESYSTEM_OBJECT_TYPE_ID = new CMISTypeId(CMISScope.OBJECT, FILESYSTEM_OBJECT_QNAME, CMIS_MODEL_NS + ":" + FILESYSTEM_OBJECT_QNAME.getLocalName(), FILESYSTEM_OBJECT_QNAME);
 
-    // Properties
-    public static QName PROP_OBJECT_ID_QNAME = QName.createQName(CMIS_MODEL_URI, CMISDictionaryModel.PROP_OBJECT_ID);
-
     // Service Dependencies
     private ServiceRegistry serviceRegistry;
 

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)

source/java/org/alfresco/repo/search/impl/parsers/CMIS.g

@@ -581,7 +581,8 @@ FLOATING_POINT_LITERAL
 /**
  * We should support _x????_ encoding for invalid sql characters 
  */        
-ID	:	('a'..'z'|'A'..'Z'|'_')('a'..'z'|'A'..'Z'|'0'..'9'|'_'|'$'|'#')* ;
+ID	:	('a'..'z'|'A'..'Z'|'_')('a'..'z'|'A'..'Z'|'0'..'9'|'_'|':'|'$'|'#')* ;
+
 WS	:	( ' ' | '\t' | '\r' | '\n' )+ { $channel = HIDDEN; } ;
   
 

source/java/org/alfresco/repo/search/impl/parsers/CMIS.tokens

@@ -1,82 +1,82 @@
-FUNCTION=10
-WHERE=44
-EXPONENT=80
-PRED_FTS=22
-STAR=30
-INNER=39
-ORDER=61
-DOUBLE_QUOTE=68
-NUMERIC_LITERAL=27
-PRED_COMPARISON=18
-CONTAINS=58
-TABLE=12
-SOURCE=11
-DOTDOT=74
-EQUALS=43
-NOT=47
-ID=67
-AND=46
-LPAREN=35
-LESSTHANOREQUALS=51
-AS=32
-RPAREN=36
-TILDA=75
-PRED_LIKE=21
-STRING_LITERAL=28
-IN=53
-DECIMAL_NUMERAL=78
-FLOATING_POINT_LITERAL=69
 COMMA=31
-IS=55
-LEFT=40
-SIGNED_INTEGER=85
-PARAMETER=14
-COLUMN=6
-PLUS=76
-QUOTED_STRING=66
-ZERO_DIGIT=82
-DIGIT=79
-DOT=34
-COLUMN_REF=8
-SELECT=29
-LIKE=54
-GREATERTHAN=50
-DOTSTAR=33
-E=84
-OUTER=41
-BY=62
 LESSTHAN=49
-NON_ZERO_DIGIT=83
-ASC=63
-QUALIFIER=9
-CONJUNCTION=15
-NULL=56
-ON=42
-NOTEQUALS=48
 MINUS=77
+PRED_COMPARISON=18
+AS=32
 LIST=23
-PRED_DESCENDANT=25
-JOIN=38
-IN_FOLDER=59
-COLON=65
-GREATERTHANOREQUALS=52
-DISJUNCTION=16
-COLUMNS=7
-WS=81
-ANY=57
-SCORE=73
-NEGATION=17
 TABLE_REF=13
-SORT_SPECIFICATION=26
-IN_TREE=60
-OR=45
-PRED_CHILD=24
-PRED_EXISTS=20
-QUERY=4
-LOWER=72
 DECIMAL_INTEGER_LITERAL=70
+QUERY=4
+INNER=39
+QUALIFIER=9
+PRED_CHILD=24
+OR=45
+GREATERTHANOREQUALS=52
+ON=42
+DOT=34
+GREATERTHAN=50
+ORDER=61
+AND=46
+COLUMN_REF=8
+BY=62
+SORT_SPECIFICATION=26
+FUNCTION=10
+LESSTHANOREQUALS=51
+STRING_LITERAL=28
+SELECT=29
+RPAREN=36
+CONTAINS=58
 DESC=64
+ZERO_DIGIT=82
+LPAREN=35
+DIGIT=79
+PLUS=76
+LEFT=40
+JOIN=38
+CONJUNCTION=15
+PRED_FTS=22
+OUTER=41
+ID=67
 ALL_COLUMNS=5
 FROM=37
-UPPER=71
 PRED_IN=19
+NON_ZERO_DIGIT=83
+PRED_EXISTS=20
+PRED_DESCENDANT=25
+NOTEQUALS=48
+NEGATION=17
+WS=81
+IS=55
+IN_FOLDER=59
+DOUBLE_QUOTE=68
+LOWER=72
+ASC=63
+DOTSTAR=33
+SOURCE=11
+LIKE=54
+DISJUNCTION=16
+PRED_LIKE=21
+FLOATING_POINT_LITERAL=69
+ANY=57
+IN=53
+DECIMAL_NUMERAL=78
+EQUALS=43
+IN_TREE=60
+TABLE=12
+EXPONENT=80
+UPPER=71
+QUOTED_STRING=66
+COLUMNS=7
+NULL=56
+PARAMETER=14
+COLON=65
+DOTDOT=74
+NUMERIC_LITERAL=27
+STAR=30
+COLUMN=6
+SCORE=73
+SIGNED_INTEGER=85
+NOT=47
+TILDA=75
+E=84
+WHERE=44