From ae765f91d911eff923efae0325fc3e54ed26cc8f Mon Sep 17 00:00:00 2001
From: Derek Hulley <derek.hulley@alfresco.com>
Date: Thu, 9 Jun 2011 12:08:12 +0000
Subject: [PATCH] Merged DEV/SWIFT to HEAD    27168: Added generics for
 cannedQueryRegistry    27169: Fixed formatting    27170: SOLR queries        
   - ALF-7072 RSOLR 013: Remote API to get ACLs and readers             -
 Queries for ACL ChangeSets and ACLs             - WebScripts for
 AclChangeSetsGet           - ALF-7071 and ALF-7072: Fix naming conventions   
 27171: Fixed MySQL create script (ALF-8336: RSOLR 013: DB upgrade scripts for
 ACL changes)    27337: Initial draft of the publishing API    27516: Get the
 basic WCM ML tests working, covering the simpler use cases    27517: More on
 the WCM-QS multi lingual support, further on the aspect and the unit tests
 for it    27518: Begin the WCM-QS webscript to return the translation details
 on a node    27519: Push some WCM-QS ML search logic into SiteHelper, and add
 a unit test for it    27542: - Initial skeleton of the channel API.          
 - Initial draft of the publishing content model.    27546: ALF-7481: RSOLR
 018: Execute query against SOLR           - pass authority filter in json
 body to avoid possible issue over-running the max URL length    27559:
 Created a Web Site Generator tool which randomly generates WCM QS websites.  
  27561: Created ChannelServiceImpl and implemented the ChannelType registry. 
   27577: Start to pull across the WCM-QS ML custom action    27579: More
 pulling across the WCM-QS ML custom action    27580: More WCM-QS ML ui
 porting    27588: ALF-8421: RSOLR 037: Encapsulate the CMIS Query Parser   
 27589: Created a PublishingModel to hold Web Publishing constants.    27610:
 ALF-7874 Add iWorks mimetype entries    27624: Restructure index tracking   
 27630: ALF-8182: SVC 03: Object Picker needs to use new NodeLocatorService to
 resolve startLocation parameter           The picker now uses the
 NodeLocatorService to look up some start locations and most importantly
 allows 		  custom 'locators' to be used. All the current start
 location tokens are still supported 		  i.e. {companyhome},
 {userhome}, {siteshome}, {doclib}, {self} and {parent}. A new one has been
 added called {ancestor}, 		  this will allow an ancestor node to
 be located, the node can be selected by type or aspect, see example below.   
        Some node locators can take parameters, a "startLocationParams" has
 therefore been added to allow these to be specified.

		  The example below shows how to configure a picker to start in the root folder of the site the node being edited is located within.

		  <field id="fdk:contentMultiple">
             <control>
                <control-param name="startLocation">{ancestor}</control-param>
                <control-param name="startLocationParams">type=st:site</control-param>
             </control>
          </field>
   27631: ALF-8182: SVC 03: Object Picker needs to use new NodeLocatorService to resolve startLocation parameter
          Centralised node locator classes to repo.nodelocator package
		  (moved out of repo.node package as that area is reserved for low level node processing)
		  and made all naming consistent i.e. nodelocator rather than nodelocation.
   27633: Fixed cmis:objectTypeId property definition (required = true, see CMIS 1.0 errata 1)
   27635: CMIS compliance fixes
   27638: - Initial operational publishing context with model bootstrapped.
          - First implementation of ChannelService.getChannels and ChannelService.createChannel. Test cases to follow imminently...

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@28301 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
---
 .classpath                                    |     1 +
 config/alfresco/core-services-context.xml     |     2 +
 .../AlfrescoCreate-RepoTables.sql             |     2 +-
 .../alfresco/ibatis/alfresco-SqlMapConfig.xml |     3 +
 .../solr-common-SqlMap.xml                    |   100 +-
 .../messages/publishing-model.properties      |    20 +
 .../messages/publishing-service.properties    |     1 +
 config/alfresco/model/publishingModel.xml     |   164 +
 config/alfresco/node-locator-context.xml      |    34 +-
 config/alfresco/web-publishing-context.xml    |    38 +
 .../alfresco/test-web-publishing-context.xml  |    12 +
 .../CanCancelCheckOutActionEvaluator.java     |    60 +
 .../mapping/CanCheckInActionEvaluator.java    |    60 +
 .../RuntimePropertyAccessorMapping.java       |    51 +-
 .../opencmis/search/CMISFTSQueryParser.java   |   414 -
 .../opencmis/search/CMISQueryOptions.java     |    90 -
 .../opencmis/search/CMISQueryParser.java      |  1705 --
 .../search/CmisFunctionEvaluationContext.java |   429 -
 .../repo/domain/permissions/AclChangeSet.java |     3 +-
 .../repo/domain/solr/AclChangeSetEntity.java  |    15 +
 .../alfresco/repo/domain/solr/AclEntity.java  |    77 +
 .../repo/domain/solr/AclEntryEntity.java      |    87 +
 .../alfresco/repo/domain/solr/SOLRDAO.java    |    29 +-
 .../repo/domain/solr/SOLRDAOTest.java         |   131 +-
 .../domain/solr/SOLRTrackingParameters.java   |    27 +-
 .../repo/domain/solr/TransactionEntity.java   |     2 +
 .../repo/domain/solr/ibatis/SOLRDAOImpl.java  |   496 +-
 .../exporter/ACPExportPackageHandler.java     |     1 -
 .../filefolder/FileFolderServiceImpl.java     |     4 +-
 .../AbstractNodeLocator.java                  |     9 +-
 .../AncestorNodeLocator.java                  |    25 +-
 .../CompanyHomeNodeLocator.java               |     6 +-
 .../nodelocator}/NodeLocator.java             |     3 +-
 .../nodelocator}/NodeLocatorService.java      |     4 +-
 .../NodeLocatorServiceImpl.java               |    39 +-
 .../NodeLocatorServiceImplTest.java           |     6 +-
 .../SelfNodeLocator.java                      |     8 +-
 .../SitesHomeNodeLocator.java                 |     8 +-
 .../UserHomeNodeLocator.java                  |     9 +-
 .../XPathNodeLocator.java                     |    13 +-
 .../repo/publishing/AbstractChannelType.java  |    37 +
 .../alfresco/repo/publishing/ChannelImpl.java |    77 +
 .../repo/publishing/ChannelServiceImpl.java   |   214 +
 .../repo/publishing/EnvironmentHelper.java    |   126 +
 .../repo/publishing/PublishingModel.java      |    45 +
 .../executer/AbstractRenderingEngine.java     |     4 +-
 .../lucene/SolrAlfrescoFTSQueryLanguage.java  |    22 +-
 .../alfresco/repo/search/impl/parsers/CMIS.g  |  1670 --
 .../repo/search/impl/parsers/CMIS.tokens      |    86 -
 .../repo/search/impl/parsers/CMISLexer.java   |  3604 ----
 .../repo/search/impl/parsers/CMISParser.java  | 16620 ----------------
 .../repo/search/impl/parsers/CMISTest.java    |    83 -
 .../repo/search/impl/parsers/CMIS_FTS.g       |   433 -
 .../repo/search/impl/parsers/CMIS_FTS.tokens  |    14 -
 .../search/impl/parsers/CMIS_FTSLexer.java    |   628 -
 .../search/impl/parsers/CMIS_FTSParser.java   |   962 -
 .../search/impl/parsers/CMIS_FTSTest.java     |    98 -
 .../search/impl/parsers/cmis_fts_test.gunit   |    83 -
 .../repo/search/impl/parsers/cmis_test.gunit  |   556 -
 .../impl/AbstractPermissionReference.java     |     2 +-
 .../impl/SimplePermissionReference.java       |     5 -
 .../locator => site}/DocLibNodeLocator.java   |    15 +-
 source/java/org/alfresco/repo/solr/Acl.java   |    34 +
 .../repo/{domain => }/solr/AclChangeSet.java  |     8 +-
 .../repo/solr/AclChangeSetParameters.java     |   177 +
 .../java/org/alfresco/repo/solr/AclEntry.java |    33 +
 .../repo/solr/SOLRTrackingComponent.java      |     2 -
 .../repo/solr/SOLRTrackingComponentImpl.java  |     2 -
 .../repo/solr/SOLRTrackingComponentTest.java  |    69 +-
 .../repo/{domain => }/solr/Transaction.java   |     2 +-
 .../cmr/publishing/BaseNodePublishStatus.java |    51 +
 .../service/cmr/publishing/Environment.java   |    36 +
 .../publishing/MutablePublishingEvent.java    |    32 +
 .../publishing/MutablePublishingPackage.java  |    34 +
 .../cmr/publishing/NodePublishStatus.java     |    43 +
 .../NodePublishStatusNotPublished.java        |    47 +
 .../publishing/NodePublishStatusOnQueue.java  |    51 +
 .../NodePublishStatusPublished.java           |    56 +
 .../NodePublishStatusPublishedAndOnQueue.java |    60 +
 .../publishing/NodePublishStatusVisitor.java  |    32 +
 .../cmr/publishing/PublishingEvent.java       |    69 +
 .../cmr/publishing/PublishingEventFilter.java |    29 +
 .../cmr/publishing/PublishingPackage.java     |    26 +
 .../publishing/PublishingPackageEntry.java    |    33 +
 .../cmr/publishing/PublishingQueue.java       |    38 +
 .../cmr/publishing/PublishingService.java     |    36 +
 .../cmr/publishing/channels/Channel.java      |    43 +
 .../publishing/channels/ChannelService.java   |    39 +
 .../cmr/publishing/channels/ChannelType.java  |    36 +
 .../publishing/ChannelServiceImplTest.java    |    77 +
 .../repo/publishing/MockChannelType.java      |    75 +
 91 files changed, 2720 insertions(+), 28122 deletions(-)
 create mode 100644 config/alfresco/messages/publishing-model.properties
 create mode 100644 config/alfresco/messages/publishing-service.properties
 create mode 100644 config/alfresco/model/publishingModel.xml
 create mode 100644 config/alfresco/web-publishing-context.xml
 create mode 100644 config/test/alfresco/test-web-publishing-context.xml
 create mode 100644 source/java/org/alfresco/opencmis/mapping/CanCancelCheckOutActionEvaluator.java
 create mode 100644 source/java/org/alfresco/opencmis/mapping/CanCheckInActionEvaluator.java
 delete mode 100644 source/java/org/alfresco/opencmis/search/CMISFTSQueryParser.java
 delete mode 100644 source/java/org/alfresco/opencmis/search/CMISQueryOptions.java
 delete mode 100644 source/java/org/alfresco/opencmis/search/CMISQueryParser.java
 delete mode 100644 source/java/org/alfresco/opencmis/search/CmisFunctionEvaluationContext.java
 create mode 100644 source/java/org/alfresco/repo/domain/solr/AclEntity.java
 create mode 100644 source/java/org/alfresco/repo/domain/solr/AclEntryEntity.java
 rename source/java/org/alfresco/repo/{node/locator => nodelocator}/AbstractNodeLocator.java (83%)
 rename source/java/org/alfresco/repo/{node/locator => nodelocator}/AncestorNodeLocator.java (81%)
 rename source/java/org/alfresco/repo/{node/locator => nodelocator}/CompanyHomeNodeLocator.java (89%)
 rename source/java/org/alfresco/{service/cmr/repository => repo/nodelocator}/NodeLocator.java (92%)
 rename source/java/org/alfresco/{service/cmr/repository => repo/nodelocator}/NodeLocatorService.java (91%)
 rename source/java/org/alfresco/repo/{node/locator => nodelocator}/NodeLocatorServiceImpl.java (63%)
 rename source/java/org/alfresco/repo/{node/locator => nodelocator}/NodeLocatorServiceImplTest.java (92%)
 rename source/java/org/alfresco/repo/{node/locator => nodelocator}/SelfNodeLocator.java (86%)
 rename source/java/org/alfresco/repo/{node/locator => nodelocator}/SitesHomeNodeLocator.java (88%)
 rename source/java/org/alfresco/repo/{node/locator => nodelocator}/UserHomeNodeLocator.java (84%)
 rename source/java/org/alfresco/repo/{node/locator => nodelocator}/XPathNodeLocator.java (89%)
 create mode 100644 source/java/org/alfresco/repo/publishing/AbstractChannelType.java
 create mode 100644 source/java/org/alfresco/repo/publishing/ChannelImpl.java
 create mode 100644 source/java/org/alfresco/repo/publishing/ChannelServiceImpl.java
 create mode 100644 source/java/org/alfresco/repo/publishing/EnvironmentHelper.java
 create mode 100644 source/java/org/alfresco/repo/publishing/PublishingModel.java
 delete mode 100644 source/java/org/alfresco/repo/search/impl/parsers/CMIS.g
 delete mode 100644 source/java/org/alfresco/repo/search/impl/parsers/CMIS.tokens
 delete mode 100644 source/java/org/alfresco/repo/search/impl/parsers/CMISLexer.java
 delete mode 100644 source/java/org/alfresco/repo/search/impl/parsers/CMISParser.java
 delete mode 100644 source/java/org/alfresco/repo/search/impl/parsers/CMISTest.java
 delete mode 100644 source/java/org/alfresco/repo/search/impl/parsers/CMIS_FTS.g
 delete mode 100644 source/java/org/alfresco/repo/search/impl/parsers/CMIS_FTS.tokens
 delete mode 100644 source/java/org/alfresco/repo/search/impl/parsers/CMIS_FTSLexer.java
 delete mode 100644 source/java/org/alfresco/repo/search/impl/parsers/CMIS_FTSParser.java
 delete mode 100644 source/java/org/alfresco/repo/search/impl/parsers/CMIS_FTSTest.java
 delete mode 100644 source/java/org/alfresco/repo/search/impl/parsers/cmis_fts_test.gunit
 delete mode 100644 source/java/org/alfresco/repo/search/impl/parsers/cmis_test.gunit
 rename source/java/org/alfresco/repo/{node/locator => site}/DocLibNodeLocator.java (88%)
 create mode 100644 source/java/org/alfresco/repo/solr/Acl.java
 rename source/java/org/alfresco/repo/{domain => }/solr/AclChangeSet.java (84%)
 create mode 100644 source/java/org/alfresco/repo/solr/AclChangeSetParameters.java
 create mode 100644 source/java/org/alfresco/repo/solr/AclEntry.java
 rename source/java/org/alfresco/repo/{domain => }/solr/Transaction.java (93%)
 create mode 100644 source/java/org/alfresco/service/cmr/publishing/BaseNodePublishStatus.java
 create mode 100644 source/java/org/alfresco/service/cmr/publishing/Environment.java
 create mode 100644 source/java/org/alfresco/service/cmr/publishing/MutablePublishingEvent.java
 create mode 100644 source/java/org/alfresco/service/cmr/publishing/MutablePublishingPackage.java
 create mode 100644 source/java/org/alfresco/service/cmr/publishing/NodePublishStatus.java
 create mode 100644 source/java/org/alfresco/service/cmr/publishing/NodePublishStatusNotPublished.java
 create mode 100644 source/java/org/alfresco/service/cmr/publishing/NodePublishStatusOnQueue.java
 create mode 100644 source/java/org/alfresco/service/cmr/publishing/NodePublishStatusPublished.java
 create mode 100644 source/java/org/alfresco/service/cmr/publishing/NodePublishStatusPublishedAndOnQueue.java
 create mode 100644 source/java/org/alfresco/service/cmr/publishing/NodePublishStatusVisitor.java
 create mode 100644 source/java/org/alfresco/service/cmr/publishing/PublishingEvent.java
 create mode 100644 source/java/org/alfresco/service/cmr/publishing/PublishingEventFilter.java
 create mode 100644 source/java/org/alfresco/service/cmr/publishing/PublishingPackage.java
 create mode 100644 source/java/org/alfresco/service/cmr/publishing/PublishingPackageEntry.java
 create mode 100644 source/java/org/alfresco/service/cmr/publishing/PublishingQueue.java
 create mode 100644 source/java/org/alfresco/service/cmr/publishing/PublishingService.java
 create mode 100644 source/java/org/alfresco/service/cmr/publishing/channels/Channel.java
 create mode 100644 source/java/org/alfresco/service/cmr/publishing/channels/ChannelService.java
 create mode 100644 source/java/org/alfresco/service/cmr/publishing/channels/ChannelType.java
 create mode 100644 source/test/org/alfresco/repo/publishing/ChannelServiceImplTest.java
 create mode 100644 source/test/org/alfresco/repo/publishing/MockChannelType.java

diff --git a/.classpath b/.classpath
index 47be43ff7a..ae057e01bd 100644
--- a/.classpath
+++ b/.classpath
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="src" path="source/java"/>
+	<classpathentry kind="src" path="source/test"/>
 	<classpathentry exported="true" kind="lib" path="config"/>
 	<classpathentry exported="true" kind="lib" path="source/test-resources"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
diff --git a/config/alfresco/core-services-context.xml b/config/alfresco/core-services-context.xml
index f3015416de..5021d89c07 100644
--- a/config/alfresco/core-services-context.xml
+++ b/config/alfresco/core-services-context.xml
@@ -1160,6 +1160,7 @@
                 
                 <!-- Share Data Lists model -->
                 <value>alfresco/model/datalistModel.xml</value>
+
             </list>
         </property>
         <property name="labels">
@@ -1174,6 +1175,7 @@
                 <value>alfresco/messages/email-server-model</value>
                 <value>alfresco/messages/data-list-model</value>
                  <value>alfresco/messages/transfer-model</value>
+                 <value>alfresco/messages/publishing-model</value>
             </list>
         </property>
     </bean>
diff --git a/config/alfresco/dbscripts/create/org.hibernate.dialect.MySQLInnoDBDialect/AlfrescoCreate-RepoTables.sql b/config/alfresco/dbscripts/create/org.hibernate.dialect.MySQLInnoDBDialect/AlfrescoCreate-RepoTables.sql
index cc0e4d6b0a..80738bf278 100644
--- a/config/alfresco/dbscripts/create/org.hibernate.dialect.MySQLInnoDBDialect/AlfrescoCreate-RepoTables.sql
+++ b/config/alfresco/dbscripts/create/org.hibernate.dialect.MySQLInnoDBDialect/AlfrescoCreate-RepoTables.sql
@@ -100,7 +100,7 @@ CREATE TABLE alf_acl_change_set
 (
     id BIGINT NOT NULL AUTO_INCREMENT,
     commit_time_ms BIGINT,
-	KEY idx_alf_acs_ctms (commit_time_ms)
+	KEY idx_alf_acs_ctms (commit_time_ms),
     PRIMARY KEY (id)
 ) ENGINE=InnoDB;
 
diff --git a/config/alfresco/ibatis/alfresco-SqlMapConfig.xml b/config/alfresco/ibatis/alfresco-SqlMapConfig.xml
index 537bfa59f4..296cb15a07 100644
--- a/config/alfresco/ibatis/alfresco-SqlMapConfig.xml
+++ b/config/alfresco/ibatis/alfresco-SqlMapConfig.xml
@@ -106,6 +106,9 @@ Inbound settings from iBatis
         
         <!-- SOLR -->
         
+        <typeAlias alias="SOLRAclChangeSet" type="org.alfresco.repo.domain.solr.AclChangeSetEntity"/>
+        <typeAlias alias="SOLRAcl" type="org.alfresco.repo.domain.solr.AclEntity"/>
+        <typeAlias alias="SOLRAclEntry" type="org.alfresco.repo.domain.solr.AclEntryEntity"/>
         <typeAlias alias="SOLRTransaction" type="org.alfresco.repo.domain.solr.TransactionEntity"/>
         <typeAlias alias="SOLRNode" type="org.alfresco.repo.domain.node.NodeEntity"/>
         <typeAlias alias="SOLRTrackingParameters" type="org.alfresco.repo.domain.solr.SOLRTrackingParameters"/>
diff --git a/config/alfresco/ibatis/org.hibernate.dialect.Dialect/solr-common-SqlMap.xml b/config/alfresco/ibatis/org.hibernate.dialect.Dialect/solr-common-SqlMap.xml
index 046951ebc3..16204afdd4 100644
--- a/config/alfresco/ibatis/org.hibernate.dialect.Dialect/solr-common-SqlMap.xml
+++ b/config/alfresco/ibatis/org.hibernate.dialect.Dialect/solr-common-SqlMap.xml
@@ -4,6 +4,32 @@
 
 <mapper namespace="alfresco.solr">
 
+    <!-- RESULT MAPS -->
+
+    <resultMap id="result_AclChangeSet" type="SOLRAclChangeSet">
+        <result property="id" column="id" jdbcType="BIGINT" javaType="java.lang.Long"/>
+        <result property="commitTimeMs" column="commit_time_ms" jdbcType="BIGINT" javaType="java.lang.Long"/>
+        <result property="aclCount" column="acl_count" jdbcType="INTEGER" javaType="java.lang.Integer"/>
+    </resultMap>
+    <resultMap id="result_Acl_NoEntries" type="SOLRAcl">
+        <id property="id" column="acl_id" jdbcType="BIGINT" javaType="java.lang.Long"/>
+        <result property="aclChangeSetId" column="acl_changeset_id" jdbcType="BIGINT" javaType="java.lang.Long"/>
+    </resultMap>
+    <resultMap id="result_Acl_WithEntries" type="SOLRAcl" extends="result_Acl_NoEntries">
+        <association property="entries" resultMap="alfresco.solr.result_AclEntry"/>
+    </resultMap>
+    <resultMap id="result_AclEntry" type="SOLRAclEntry">
+        <id property="id" column="ace_id" jdbcType="BIGINT" javaType="java.lang.Long"/>
+        <result property="aclId" column="acl_id" jdbcType="BIGINT" javaType="java.lang.Long"/>
+        <result property="aclPermissionId" column="permission_id" jdbcType="BIGINT" javaType="java.lang.Long"/>
+        <result property="aclAuthority" column="authority" jdbcType="VARCHAR" javaType="java.lang.String"/>
+    </resultMap>
+    <resultMap id="result_Transaction" type="SOLRTransaction">
+        <result property="id" column="id" jdbcType="BIGINT" javaType="java.lang.Long"/>
+        <result property="commitTimeMs" column="commit_time_ms" jdbcType="BIGINT" javaType="java.lang.Long"/>
+        <result property="updates" column="updates" jdbcType="INTEGER" javaType="java.lang.Integer"/>
+        <result property="deletes" column="deletes" jdbcType="INTEGER" javaType="java.lang.Integer"/>
+    </resultMap>
     <resultMap id="result_Node" type="SOLRNode">
         <result property="id" column="id" jdbcType="BIGINT" javaType="java.lang.Long"/>
         <result property="deleted" column="node_deleted" jdbcType="BIT" javaType="java.lang.Boolean" />
@@ -13,13 +39,75 @@
         <result property="uuid" column="uuid" jdbcType="VARCHAR" javaType="java.lang.String"/>
     </resultMap>
     
-    <resultMap id="result_Transaction" type="SOLRTransaction">
-        <result property="id" column="id" jdbcType="BIGINT" javaType="java.lang.Long"/>
-        <result property="commitTimeMs" column="commit_time_ms" jdbcType="BIGINT" javaType="java.lang.Long"/>
-        <result property="updates" column="updates" jdbcType="INTEGER" javaType="java.lang.Integer"/>
-        <result property="deletes" column="deletes" jdbcType="INTEGER" javaType="java.lang.Integer"/>
-    </resultMap>
+    <!-- SELECTS -->
+    
+    <select id="select_ChangeSets_Summary" parameterType="SOLRTrackingParameters" resultMap="result_AclChangeSet">
+        select
+            acs.id              as id,
+            acs.commit_time_ms  as commit_time_ms,
+            (select
+                 count(acl.id)
+             from
+                 alf_access_control_list acl
+             where
+                 acl.acl_change_set = acs.id
+            ) as acl_count
+        from
+            alf_acl_change_set acs
+        <where>
+           <if test="fromCommitTimeInclusive != null">
+               <![CDATA[acs.commit_time_ms >= #{fromCommitTimeInclusive}]]>
+           </if>
+           <if test="fromIdInclusive != null">
+               <![CDATA[and acs.id >= #{fromIdInclusive}]]>
+           </if>
+        </where>
+        order by acs.commit_time_ms ASC, acs.id ASC
+    </select>
 
+    <select id="select_AclsByChangeSetIds" parameterType="SOLRTrackingParameters" resultMap="result_Acl_NoEntries">
+        select
+            acs.id              as acl_changeset_id,
+            acl.id              as acl_id
+        from
+            alf_acl_change_set acs
+            join alf_access_control_list acl on (acl.acl_change_set = acs.id)
+        <where>
+           <if test="ids != null">
+                acs.id in 
+                <foreach item="item" index="index" collection="ids" open="(" separator="," close=")">
+                    #{item}
+                </foreach>
+           </if>
+        </where>
+        order by
+            acs.id ASC,
+            acl.id ASC
+    </select>
+
+<!-- 
+    <select id="select_ChangeSets_Detail" parameterType="SOLRTrackingParameters" resultMap="result_AclChangeSetDetails">
+        select
+            acs.id              as id,
+            acs.commit_time_ms  as commit_time_ms,
+            0                   as acl_count,
+            acl.id              as acl_id,
+            ace.id              as ace_id,
+            ace.permission_id   as permission_id,
+            auth.authority      as authority
+        from
+            alf_acl_change_set acs
+            join alf_access_control_list acl on (acl.acl_change_set = acs.id)
+            join alf_acl_member acm on (acm.acl_id = acl.id)
+            join alf_access_control_entry ace on (ace.id = acm.ace_id)
+            join alf_authority auth on (auth.id = ace.authority_id)
+        order by
+            acs.id ASC,
+            acl.id ASC,
+            ace.id ASC
+    </select>
+ -->
+ 
     <select id="select_Txns" parameterType="SOLRTrackingParameters" resultMap="result_Transaction">
         select
             txn.id              as id,
diff --git a/config/alfresco/messages/publishing-model.properties b/config/alfresco/messages/publishing-model.properties
new file mode 100644
index 0000000000..301532eb6c
--- /dev/null
+++ b/config/alfresco/messages/publishing-model.properties
@@ -0,0 +1,20 @@
+# Display labels for Publishing Model (publishingModel.xml)
+
+pub_publishingmodel.description=Alfresco Publishing Content Model
+
+pub_publishingmodel.type.pub_DeliveryChannel.title=Delivery Channel
+pub_publishingmodel.type.pub_DeliveryChannel.description=The base type for all delivery channels
+pub_publishingmodel.type.pub_DeliveryServer.title=Delivery Server
+pub_publishingmodel.type.pub_DeliveryServer.description=The base type for all delivery servers
+pub_publishingmodel.type.pub_Environment.title=Publishing Environment
+pub_publishingmodel.type.pub_Environment.description=A container type that holds a set of delivery channels
+pub_publishingmodel.type.pub_PublishingQueue.title=Publishing Queue
+pub_publishingmodel.type.pub_PublishingQueue.description=A container type that holds publishing events that are yet to be processed
+
+pub_publishingmodel.aspect.pub_ContentRoot.title=Content Root Aspect
+pub_publishingmodel.aspect.pub_ContentRoot.description=Applied to a node that represents the root of a delivery channel's content hierarchy
+
+pub_publishingmodel.association.pub_deliveryServers.title=Delivery Servers
+pub_publishingmodel.association.pub_deliveryServers.description=The delivery servers associated with a delivery channel
+pub_publishingmodel.association.pub_publishingQueue.title=Publishing Queue
+pub_publishingmodel.association.pub_publishingQueue.description=The publishing queue for a publishing environment
\ No newline at end of file
diff --git a/config/alfresco/messages/publishing-service.properties b/config/alfresco/messages/publishing-service.properties
new file mode 100644
index 0000000000..c3582bdfeb
--- /dev/null
+++ b/config/alfresco/messages/publishing-service.properties
@@ -0,0 +1 @@
+# Publish service externalised display strings
diff --git a/config/alfresco/model/publishingModel.xml b/config/alfresco/model/publishingModel.xml
new file mode 100644
index 0000000000..e8bf75fa8b
--- /dev/null
+++ b/config/alfresco/model/publishingModel.xml
@@ -0,0 +1,164 @@
+<model name="pub:publishingmodel" xmlns="http://www.alfresco.org/model/dictionary/1.0">
+
+   <description>Alfresco Publishing Content Model</description>
+   <author>Alfresco</author>
+   <published>2011-05-04</published>
+   <version>1.0</version>
+
+   <imports>
+      <import uri="http://www.alfresco.org/model/dictionary/1.0" prefix="d" />
+      <import uri="http://www.alfresco.org/model/system/1.0" prefix="sys" />
+      <import uri="http://www.alfresco.org/model/content/1.0" prefix="cm" />
+   </imports>
+
+   <namespaces>
+      <namespace uri="http://www.alfresco.org/model/publishing/1.0" prefix="pub" />
+   </namespaces>
+
+   <types>
+      <type name="pub:DeliveryChannel">
+         <title>Delivery Channel</title>
+         <description>The base type for all delivery channels</description>
+         <parent>cm:folder</parent>
+         <associations>
+            <child-association name="pub:deliveryServers">
+               <source>
+                  <mandatory>false</mandatory>
+                  <many>false</many>
+               </source>
+               <target>
+                  <class>pub:DeliveryServer</class>
+                  <mandatory>false</mandatory>
+                  <many>true</many>
+               </target>
+            </child-association>
+         </associations>
+      </type>
+
+      <type name="pub:SiteChannelContainer">
+         <title>Delivery Channel Container</title>
+         <description>A container type that holds a set of delivery channels within a Share site</description>
+         <parent>cm:folder</parent>
+         <mandatory-aspects>
+            <aspect>st:siteContainer</aspect>
+         </mandatory-aspects>
+      </type>
+
+      <type name="pub:DeliveryServer">
+         <title>Delivery Server</title>
+         <description>The base type for all delivery servers</description>
+         <parent>sys:base</parent>
+      </type>
+
+      <type name="pub:Environment">
+         <title>Publishing Environment</title>
+         <description>A container type that holds a set of delivery channels</description>
+         <parent>cm:folder</parent>
+         <associations>
+            <child-association name="pub:publishingQueue">
+               <source>
+                  <mandatory>false</mandatory>
+                  <many>false</many>
+               </source>
+               <target>
+                  <class>pub:PublishingQueue</class>
+                  <mandatory>false</mandatory>
+                  <many>false</many>
+               </target>
+            </child-association>
+         </associations>
+      </type>
+
+      <type name="pub:PublishingQueue">
+         <title>Publishing Queue</title>
+         <description>A container type that holds publishing events that are yet to be processed
+         </description>
+         <parent>sys:base</parent>
+         <associations>
+            <child-association name="pub:publishingEvent">
+               <source>
+                  <mandatory>false</mandatory>
+                  <many>false</many>
+               </source>
+               <target>
+                  <class>pub:PublishingEvent</class>
+                  <mandatory>false</mandatory>
+                  <many>true</many>
+               </target>
+            </child-association>
+         </associations>
+      </type>
+
+      <type name="pub:PublishingEvent">
+         <title>Publishing Event</title>
+         <description>Holds details of a publishing event</description>
+         <parent>sys:base</parent>
+         <properties>
+            <property name="pub:publishingEventStatus">
+               <title>Status</title>
+               <type>d:text</type>
+               <mandatory>true</mandatory>
+               <constraints>
+                  <constraint type="LIST">
+                     <parameter name="allowedValues">
+                        <list>
+                           <value>SCHEDULED</value>
+                           <value>IN_PROGRESS</value>
+                           <value>COMPLETED</value>
+                           <value>FAILED</value>
+                        </list>
+                     </parameter>
+                  </constraint>
+               </constraints>
+            </property>
+            <property name="pub:publishingEventPayload">
+               <title>Payload</title>
+               <type>d:content</type>
+               <mandatory>false</mandatory>
+            </property>
+            <property name="pub:publishingEventNodesToPublish">
+               <title>Nodes to publish</title>
+               <type>d:text</type>
+               <multiple>true</multiple>
+               <index enabled="true">
+                  <atomic>true</atomic>
+                  <stored>false</stored>
+                  <tokenised>false</tokenised>
+               </index>
+            </property>
+            <property name="pub:publishingEventNodesToUnpublish">
+               <title>Nodes to unpublish</title>
+               <type>d:text</type>
+               <multiple>true</multiple>
+               <index enabled="true">
+                  <atomic>true</atomic>
+                  <stored>false</stored>
+                  <tokenised>false</tokenised>
+               </index>
+            </property>
+            <property name="pub:publishingEventNodesDependedOn">
+               <title>Nodes depended on</title>
+               <type>d:text</type>
+               <multiple>true</multiple>
+               <index enabled="true">
+                  <atomic>true</atomic>
+                  <stored>false</stored>
+                  <tokenised>false</tokenised>
+               </index>
+            </property>
+         </properties>
+      </type>
+
+   </types>
+
+   <aspects>
+
+      <aspect name="pub:ContentRoot">
+         <title>Content Root Aspect</title>
+         <description>Applied to a node that represents the root of a delivery channel's content
+            hierarchy</description>
+      </aspect>
+
+   </aspects>
+
+</model>
diff --git a/config/alfresco/node-locator-context.xml b/config/alfresco/node-locator-context.xml
index 6db4647e93..419c950e48 100644
--- a/config/alfresco/node-locator-context.xml
+++ b/config/alfresco/node-locator-context.xml
@@ -4,44 +4,44 @@
 <beans>
 
    <!-- Node Locator Service Implementation -->
-   <bean id="nodeLocatorService" class="org.alfresco.repo.node.locator.NodeLocatorServiceImpl" />
+   <bean id="nodeLocatorService" class="org.alfresco.repo.nodelocator.NodeLocatorServiceImpl" />
    
    <!-- Base Node Locator Implementation -->
-   <bean id="baseNodeLocator" class="org.alfresco.repo.node.locator.AbstractNodeLocator" abstract="true">
+   <bean id="baseNodeLocator" class="org.alfresco.repo.nodelocator.AbstractNodeLocator" abstract="true">
       <property name="nodeLocatorService" ref="nodeLocatorService"/>
    </bean>
    
    <!-- Company Home Node Locator Implementation -->
-   <bean id="companyHomeNodeLocator" class="org.alfresco.repo.node.locator.CompanyHomeNodeLocator" parent="baseNodeLocator">
+   <bean id="companyHomeNodeLocator" class="org.alfresco.repo.nodelocator.CompanyHomeNodeLocator" parent="baseNodeLocator">
+      <property name="RepositoryHelper" ref="repositoryHelper" />
+   </bean>
+   
+   <!--  User Home Node Locator Implementation -->
+   <bean id="userHomeNodeLocator" class="org.alfresco.repo.nodelocator.UserHomeNodeLocator" parent="baseNodeLocator">
       <property name="RepositoryHelper" ref="repositoryHelper" />
    </bean>
    
    <!-- Sites Home Node Locator Implementation -->
-   <bean id="sitesHomeNodeLocator" class="org.alfresco.repo.node.locator.SitesHomeNodeLocator" parent="baseNodeLocator">
+   <bean id="sitesHomeNodeLocator" class="org.alfresco.repo.nodelocator.SitesHomeNodeLocator" parent="baseNodeLocator">
       <property name="SiteService" ref="SiteService" />
    </bean>
    
-   <!--  Document Library Node Locator Implementation -->
-   <bean id="docLibNodeLocator" class="org.alfresco.repo.node.locator.DocLibNodeLocator" parent="baseNodeLocator">
-      <property name="SiteService" ref="SiteService" />
-      <property name="RepositoryHelper" ref="repositoryHelper" />
-   </bean>
-   
-   <!--  Document Library Node Locator Implementation -->
-   <bean id="userHomeNodeLocator" class="org.alfresco.repo.node.locator.UserHomeNodeLocator" parent="baseNodeLocator">
-      <property name="RepositoryHelper" ref="repositoryHelper" />
-   </bean>
-   
    <!--  Ancestor Node Locator Implementation -->
-   <bean id="ancestorNodeLocator" class="org.alfresco.repo.node.locator.AncestorNodeLocator" parent="baseNodeLocator">
+   <bean id="ancestorNodeLocator" class="org.alfresco.repo.nodelocator.AncestorNodeLocator" parent="baseNodeLocator">
       <property name="NodeService" ref="NodeService" />
       <property name="NamespaceService" ref="NamespaceService" />
    </bean>
    
    <!--  XPath Node Locator Implementation -->
-   <bean id="xpathNodeLocator" class="org.alfresco.repo.node.locator.XPathNodeLocator" parent="baseNodeLocator">
+   <bean id="xpathNodeLocator" class="org.alfresco.repo.nodelocator.XPathNodeLocator" parent="baseNodeLocator">
       <property name="SearchService" ref="SearchService" />
       <property name="DefaultStore" value="workspace://SpacesStore" />
    </bean>
    
+   <!--  Document Library Node Locator Implementation -->
+   <bean id="docLibNodeLocator" class="org.alfresco.repo.site.DocLibNodeLocator" parent="baseNodeLocator">
+      <property name="SiteService" ref="SiteService" />
+      <property name="RepositoryHelper" ref="repositoryHelper" />
+   </bean>
+   
 </beans>
diff --git a/config/alfresco/web-publishing-context.xml b/config/alfresco/web-publishing-context.xml
new file mode 100644
index 0000000000..e4f570c8cf
--- /dev/null
+++ b/config/alfresco/web-publishing-context.xml
@@ -0,0 +1,38 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE beans PUBLIC '-//SPRING//DTD BEAN//EN' 'http://www.springframework.org/dtd/spring-beans.dtd'>
+
+<beans>
+   <bean id="publishService_dictionaryBootstrap" parent="dictionaryModelBootstrap" depends-on="dictionaryBootstrap">
+        <property name="models">
+            <list>
+                <value>alfresco/model/publishingModel.xml</value>
+            </list>
+        </property>
+    </bean>
+
+   <bean id="publishingResourceBundles" class="org.alfresco.i18n.ResourceBundleBootstrapComponent">
+      <property name="resourceBundles">
+         <list>
+            <value>alfresco.messages.publish-service</value>
+         </list>
+      </property>
+   </bean>
+
+   <!--  Channel Service -->
+   <bean id="channelService" class="org.alfresco.repo.publishing.ChannelServiceImpl">
+      <property name="dictionaryService" ref="dictionaryService" />
+      <property name="nodeService" ref="nodeService" />
+      <property name="siteService" ref="siteService" />
+      <property name="environmentHelper" ref="environmentHelper" />
+   </bean>
+
+   <!--  Channel Type Implementations -->
+   <bean id="baseChannelType" class="org.alfresco.repo.publishing.AbstractChannelType" abstract="true" >
+      <property name="channelService" ref="channelService" />
+   </bean>
+   
+   <bean id="environmentHelper" class="org.alfresco.repo.publishing.EnvironmentHelper">
+      <property name="nodeService" ref="nodeService" />
+      <property name="siteService" ref="siteService" />
+   </bean>
+</beans>
diff --git a/config/test/alfresco/test-web-publishing-context.xml b/config/test/alfresco/test-web-publishing-context.xml
new file mode 100644
index 0000000000..2fdd5114f1
--- /dev/null
+++ b/config/test/alfresco/test-web-publishing-context.xml
@@ -0,0 +1,12 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE beans PUBLIC '-//SPRING//DTD BEAN//EN' 'http://www.springframework.org/dtd/spring-beans.dtd'>
+
+<beans>
+
+   <import resource="classpath:alfresco/web-publishing-context.xml" />
+
+   <!-- Mock Channel Type -->
+   <bean id="mockChannelType" class="org.alfresco.repo.publishing.MockChannelType"
+   parent="baseChannelType" />
+
+</beans>
diff --git a/source/java/org/alfresco/opencmis/mapping/CanCancelCheckOutActionEvaluator.java b/source/java/org/alfresco/opencmis/mapping/CanCancelCheckOutActionEvaluator.java
new file mode 100644
index 0000000000..936387e54a
--- /dev/null
+++ b/source/java/org/alfresco/opencmis/mapping/CanCancelCheckOutActionEvaluator.java
@@ -0,0 +1,60 @@
+/*
+ * Copyright (C) 2005-2010 Alfresco Software Limited.
+ *
+ * This file is part of Alfresco
+ *
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ */
+package org.alfresco.opencmis.mapping;
+
+import org.alfresco.model.ContentModel;
+import org.alfresco.service.ServiceRegistry;
+import org.alfresco.service.cmr.repository.NodeRef;
+import org.alfresco.service.cmr.repository.NodeService;
+import org.alfresco.service.cmr.security.PermissionService;
+import org.apache.chemistry.opencmis.commons.enums.Action;
+
+/**
+ * Alfresco Permission based Action Evaluator
+ * 
+ * @author davidc
+ */
+public class CanCancelCheckOutActionEvaluator extends AbstractActionEvaluator<NodeRef>
+{
+    private PermissionActionEvaluator permissionEvaluator;
+    private NodeService nodeService;
+
+    /**
+     * Construct
+     * 
+     * @param serviceRegistry
+     * @param permission
+     */
+    protected CanCancelCheckOutActionEvaluator(ServiceRegistry serviceRegistry)
+    {
+        super(serviceRegistry, Action.CAN_CANCEL_CHECK_OUT);
+        permissionEvaluator = new PermissionActionEvaluator(serviceRegistry, Action.CAN_CANCEL_CHECK_OUT,
+                PermissionService.CANCEL_CHECK_OUT);
+        nodeService = serviceRegistry.getNodeService();
+    }
+
+    public boolean isAllowed(NodeRef nodeRef)
+    {
+        if (nodeService.hasAspect(nodeRef, ContentModel.ASPECT_WORKING_COPY))
+        {
+            return permissionEvaluator.isAllowed(nodeRef);
+        }
+        return false;
+    }
+}
diff --git a/source/java/org/alfresco/opencmis/mapping/CanCheckInActionEvaluator.java b/source/java/org/alfresco/opencmis/mapping/CanCheckInActionEvaluator.java
new file mode 100644
index 0000000000..3494938999
--- /dev/null
+++ b/source/java/org/alfresco/opencmis/mapping/CanCheckInActionEvaluator.java
@@ -0,0 +1,60 @@
+/*
+ * Copyright (C) 2005-2010 Alfresco Software Limited.
+ *
+ * This file is part of Alfresco
+ *
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ */
+package org.alfresco.opencmis.mapping;
+
+import org.alfresco.model.ContentModel;
+import org.alfresco.service.ServiceRegistry;
+import org.alfresco.service.cmr.repository.NodeRef;
+import org.alfresco.service.cmr.repository.NodeService;
+import org.alfresco.service.cmr.security.PermissionService;
+import org.apache.chemistry.opencmis.commons.enums.Action;
+
+/**
+ * Alfresco Permission based Action Evaluator
+ * 
+ * @author davidc
+ */
+public class CanCheckInActionEvaluator extends AbstractActionEvaluator<NodeRef>
+{
+    private PermissionActionEvaluator permissionEvaluator;
+    private NodeService nodeService;
+
+    /**
+     * Construct
+     * 
+     * @param serviceRegistry
+     * @param permission
+     */
+    protected CanCheckInActionEvaluator(ServiceRegistry serviceRegistry)
+    {
+        super(serviceRegistry, Action.CAN_CHECK_IN);
+        permissionEvaluator = new PermissionActionEvaluator(serviceRegistry, Action.CAN_CHECK_IN,
+                PermissionService.CHECK_IN);
+        nodeService = serviceRegistry.getNodeService();
+    }
+
+    public boolean isAllowed(NodeRef nodeRef)
+    {
+        if (nodeService.hasAspect(nodeRef, ContentModel.ASPECT_WORKING_COPY))
+        {
+            return permissionEvaluator.isAllowed(nodeRef);
+        }
+        return false;
+    }
+}
diff --git a/source/java/org/alfresco/opencmis/mapping/RuntimePropertyAccessorMapping.java b/source/java/org/alfresco/opencmis/mapping/RuntimePropertyAccessorMapping.java
index ebf1021f10..14cb90761a 100644
--- a/source/java/org/alfresco/opencmis/mapping/RuntimePropertyAccessorMapping.java
+++ b/source/java/org/alfresco/opencmis/mapping/RuntimePropertyAccessorMapping.java
@@ -43,10 +43,9 @@ import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.springframework.beans.factory.InitializingBean;
 
-
 /**
- * Registry of property accessors which map the retrieval and setting of properties
- * within Alfresco.
+ * Registry of property accessors which map the retrieval and setting of
+ * properties within Alfresco.
  * 
  * @author davidc
  */
@@ -60,12 +59,13 @@ public class RuntimePropertyAccessorMapping implements PropertyAccessorMapping,
     private CMISConnector cmisConnector;
     private CMISMapping cmisMapping;
     private CMISDictionaryService cmisDictionaryService;
-    
+
     private Map<String, AbstractProperty> propertyAccessors = new HashMap<String, AbstractProperty>();
     private Map<BaseTypeId, Map<Action, CMISActionEvaluator<? extends Object>>> actionEvaluators = new HashMap<BaseTypeId, Map<Action, CMISActionEvaluator<? extends Object>>>();
 
     /**
-     * @param service registry
+     * @param service
+     *            registry
      */
     public void setServiceRegistry(ServiceRegistry serviceRegistry)
     {
@@ -73,7 +73,8 @@ public class RuntimePropertyAccessorMapping implements PropertyAccessorMapping,
     }
 
     /**
-     * @param cmis connector
+     * @param cmis
+     *            connector
      */
     public void setCmisConnector(CMISConnector cmisConnector)
     {
@@ -81,7 +82,8 @@ public class RuntimePropertyAccessorMapping implements PropertyAccessorMapping,
     }
 
     /**
-     * @param cmis mapping
+     * @param cmis
+     *            mapping
      */
     public void setCmisMapping(CMISMapping cmisMapping)
     {
@@ -89,7 +91,8 @@ public class RuntimePropertyAccessorMapping implements PropertyAccessorMapping,
     }
 
     /**
-     * @param cmis mapping
+     * @param cmis
+     *            mapping
      */
     public void setCmisDictionaryService(CMISDictionaryService cmisDictionaryService)
     {
@@ -113,9 +116,12 @@ public class RuntimePropertyAccessorMapping implements PropertyAccessorMapping,
         registerPropertyAccessor(new ObjectTypeIdProperty(serviceRegistry, cmisDictionaryService));
         registerPropertyAccessor(new BaseTypeIdProperty(serviceRegistry, cmisDictionaryService));
         registerPropertyAccessor(new DirectProperty(serviceRegistry, PropertyIds.CREATED_BY, ContentModel.PROP_CREATOR));
-        registerPropertyAccessor(new DirectProperty(serviceRegistry, PropertyIds.CREATION_DATE, ContentModel.PROP_CREATED));
-        registerPropertyAccessor(new DirectProperty(serviceRegistry, PropertyIds.LAST_MODIFIED_BY, ContentModel.PROP_MODIFIER));
-        registerPropertyAccessor(new DirectProperty(serviceRegistry, PropertyIds.LAST_MODIFICATION_DATE, ContentModel.PROP_MODIFIED));
+        registerPropertyAccessor(new DirectProperty(serviceRegistry, PropertyIds.CREATION_DATE,
+                ContentModel.PROP_CREATED));
+        registerPropertyAccessor(new DirectProperty(serviceRegistry, PropertyIds.LAST_MODIFIED_BY,
+                ContentModel.PROP_MODIFIER));
+        registerPropertyAccessor(new DirectProperty(serviceRegistry, PropertyIds.LAST_MODIFICATION_DATE,
+                ContentModel.PROP_MODIFIED));
         registerPropertyAccessor(new FixedValueProperty(serviceRegistry, PropertyIds.CHANGE_TOKEN, null));
         registerPropertyAccessor(new DirectProperty(serviceRegistry, PropertyIds.NAME, ContentModel.PROP_NAME)
         {
@@ -139,7 +145,8 @@ public class RuntimePropertyAccessorMapping implements PropertyAccessorMapping,
         registerPropertyAccessor(new ContentStreamLengthProperty(serviceRegistry));
         registerPropertyAccessor(new ContentStreamMimetypeProperty(serviceRegistry));
         registerPropertyAccessor(new ContentStreamIdProperty(serviceRegistry));
-        registerPropertyAccessor(new DirectProperty(serviceRegistry, PropertyIds.CONTENT_STREAM_FILE_NAME, ContentModel.PROP_NAME));
+        registerPropertyAccessor(new DirectProperty(serviceRegistry, PropertyIds.CONTENT_STREAM_FILE_NAME,
+                ContentModel.PROP_NAME));
         registerPropertyAccessor(new ParentProperty(serviceRegistry));
         registerPropertyAccessor(new PathProperty(serviceRegistry, cmisConnector));
         registerPropertyAccessor(new AllowedChildObjectTypeIdsProperty(serviceRegistry, cmisMapping));
@@ -175,11 +182,8 @@ public class RuntimePropertyAccessorMapping implements PropertyAccessorMapping,
                         PermissionService.WRITE_PROPERTIES, PermissionService.WRITE_CONTENT), false));
         registerEvaluator(BaseTypeId.CMIS_DOCUMENT, new CurrentVersionEvaluator(serviceRegistry,
                 new CanCheckOutActionEvaluator(serviceRegistry), false));
-        registerEvaluator(BaseTypeId.CMIS_DOCUMENT, new CurrentVersionEvaluator(serviceRegistry,
-                new PermissionActionEvaluator(serviceRegistry, Action.CAN_CANCEL_CHECK_OUT,
-                        PermissionService.CANCEL_CHECK_OUT), false));
-        registerEvaluator(BaseTypeId.CMIS_DOCUMENT, new PermissionActionEvaluator(serviceRegistry, Action.CAN_CHECK_IN,
-                PermissionService.CHECK_IN));
+        registerEvaluator(BaseTypeId.CMIS_DOCUMENT, new CanCancelCheckOutActionEvaluator(serviceRegistry));
+        registerEvaluator(BaseTypeId.CMIS_DOCUMENT, new CanCheckInActionEvaluator(serviceRegistry));
         registerEvaluator(BaseTypeId.CMIS_DOCUMENT, new CurrentVersionEvaluator(serviceRegistry,
                 new PermissionActionEvaluator(serviceRegistry, Action.CAN_SET_CONTENT_STREAM,
                         PermissionService.WRITE_CONTENT), false));
@@ -290,7 +294,8 @@ public class RuntimePropertyAccessorMapping implements PropertyAccessorMapping,
     /**
      * Gets a property accessor
      * 
-     * @param propertyId property id
+     * @param propertyId
+     *            property id
      * @return property accessor
      */
     public CMISPropertyAccessor getPropertyAccessor(String propertyId)
@@ -301,15 +306,17 @@ public class RuntimePropertyAccessorMapping implements PropertyAccessorMapping,
     /**
      * Create a direct node property accessor
      * 
-     * @param propertyId  property id
-     * @param propertyName  node property name
-     * @return  property accessor
+     * @param propertyId
+     *            property id
+     * @param propertyName
+     *            node property name
+     * @return property accessor
      */
     public CMISPropertyAccessor createDirectPropertyAccessor(String propertyId, QName propertyName)
     {
         return new DirectProperty(serviceRegistry, propertyId, propertyName);
     }
-    
+
     /**
      * Register pre-defined Property Accessor
      * 
diff --git a/source/java/org/alfresco/opencmis/search/CMISFTSQueryParser.java b/source/java/org/alfresco/opencmis/search/CMISFTSQueryParser.java
deleted file mode 100644
index 4c91e9398c..0000000000
--- a/source/java/org/alfresco/opencmis/search/CMISFTSQueryParser.java
+++ /dev/null
@@ -1,414 +0,0 @@
-/*
- * Copyright (C) 2005-2010 Alfresco Software Limited.
- *
- * This file is part of Alfresco
- *
- * Alfresco is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Alfresco is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
- */
-package org.alfresco.opencmis.search;
-
-import java.util.ArrayList;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.alfresco.repo.search.impl.lucene.AnalysisMode;
-import org.alfresco.repo.search.impl.parsers.CMIS_FTSLexer;
-import org.alfresco.repo.search.impl.parsers.CMIS_FTSParser;
-import org.alfresco.repo.search.impl.parsers.FTSQueryException;
-import org.alfresco.repo.search.impl.querymodel.Argument;
-import org.alfresco.repo.search.impl.querymodel.Column;
-import org.alfresco.repo.search.impl.querymodel.Constraint;
-import org.alfresco.repo.search.impl.querymodel.Function;
-import org.alfresco.repo.search.impl.querymodel.FunctionEvaluationContext;
-import org.alfresco.repo.search.impl.querymodel.LiteralArgument;
-import org.alfresco.repo.search.impl.querymodel.QueryModelFactory;
-import org.alfresco.repo.search.impl.querymodel.Selector;
-import org.alfresco.repo.search.impl.querymodel.Constraint.Occur;
-import org.alfresco.repo.search.impl.querymodel.QueryOptions.Connective;
-import org.alfresco.repo.search.impl.querymodel.impl.functions.FTSPhrase;
-import org.alfresco.repo.search.impl.querymodel.impl.functions.FTSTerm;
-import org.alfresco.service.cmr.dictionary.DataTypeDefinition;
-import org.antlr.runtime.ANTLRStringStream;
-import org.antlr.runtime.CharStream;
-import org.antlr.runtime.CommonTokenStream;
-import org.antlr.runtime.RecognitionException;
-import org.antlr.runtime.Token;
-import org.antlr.runtime.tree.CommonTree;
-import org.antlr.runtime.tree.Tree;
-
-public class CMISFTSQueryParser
-{
-    static public Constraint buildFTS(String ftsExpression, QueryModelFactory factory, FunctionEvaluationContext functionEvaluationContext, Selector selector,
-            Map<String, Column> columnMap, String defaultField)
-    {
-        // TODO: Decode sql escape for '' should do in CMIS layer
-
-        // parse templates to trees ...
-
-        CMIS_FTSParser parser = null;
-        try
-        {
-            CharStream cs = new ANTLRStringStream(ftsExpression);
-            CMIS_FTSLexer lexer = new CMIS_FTSLexer(cs);
-            CommonTokenStream tokens = new CommonTokenStream(lexer);
-            parser = new CMIS_FTSParser(tokens);
-            CommonTree ftsNode = (CommonTree) parser.cmisFtsQuery().getTree();
-            return buildFTSConnective(ftsNode, factory, functionEvaluationContext, selector, columnMap, defaultField);
-        }
-        catch (RecognitionException e)
-        {
-            if (parser != null)
-            {
-                String[] tokenNames = parser.getTokenNames();
-                String hdr = parser.getErrorHeader(e);
-                String msg = parser.getErrorMessage(e, tokenNames);
-                throw new FTSQueryException(hdr + "\n" + msg, e);
-            }
-            return null;
-        }
-
-    }
-
-    static private Constraint buildFTSConnective(CommonTree node, QueryModelFactory factory, FunctionEvaluationContext functionEvaluationContext,
-            Selector selector, Map<String, Column> columnMap, String defaultField)
-    {
-        Connective connective;
-        switch (node.getType())
-        {
-        case CMIS_FTSParser.DISJUNCTION:
-            connective = Connective.OR;
-            break;
-        case CMIS_FTSParser.CONJUNCTION:
-            connective = Connective.AND;
-            break;
-        default:
-            throw new FTSQueryException("Invalid connective ..." + node.getText());
-        }
-
-        List<Constraint> constraints = new ArrayList<Constraint>(node.getChildCount());
-        CommonTree testNode;
-        for (int i = 0; i < node.getChildCount(); i++)
-        {
-            CommonTree subNode = (CommonTree) node.getChild(i);
-            Constraint constraint;
-            switch (subNode.getType())
-            {
-            case CMIS_FTSParser.DISJUNCTION:
-            case CMIS_FTSParser.CONJUNCTION:
-                constraint = buildFTSConnective(subNode, factory, functionEvaluationContext, selector, columnMap, defaultField);
-                break;
-            case CMIS_FTSParser.DEFAULT:
-                testNode = (CommonTree) subNode.getChild(0);
-                constraint = buildFTSTest(testNode, factory, functionEvaluationContext, selector, columnMap, defaultField);
-                constraint.setOccur(Occur.DEFAULT);
-                break;
-            case CMIS_FTSParser.EXCLUDE:
-                testNode = (CommonTree) subNode.getChild(0);
-                constraint = buildFTSTest(testNode, factory, functionEvaluationContext, selector, columnMap, defaultField);
-                constraint.setOccur(Occur.EXCLUDE);
-                break;
-
-            default:
-                throw new FTSQueryException("Unsupported FTS option " + subNode.getText());
-            }
-            constraints.add(constraint);
-        }
-        if (constraints.size() == 1)
-        {
-            return constraints.get(0);
-        }
-        else
-        {
-            if (connective == Connective.OR)
-            {
-                return factory.createDisjunction(constraints);
-            }
-            else
-            {
-                return factory.createConjunction(constraints);
-            }
-        }
-    }
-
-    static private Constraint buildFTSTest(CommonTree argNode, QueryModelFactory factory, FunctionEvaluationContext functionEvaluationContext,
-            Selector selector, Map<String, Column> columnMap, String defaultField)
-    {
-        CommonTree testNode = argNode;
-        switch (testNode.getType())
-        {
-        case CMIS_FTSParser.DISJUNCTION:
-        case CMIS_FTSParser.CONJUNCTION:
-            return buildFTSConnective(testNode, factory, functionEvaluationContext, selector, columnMap, defaultField);
-        case CMIS_FTSParser.TERM:
-            return buildTerm(testNode, factory, functionEvaluationContext, selector, columnMap);
-        case CMIS_FTSParser.PHRASE:
-            return buildPhrase(testNode, factory, functionEvaluationContext, selector, columnMap);
-        default:
-            throw new FTSQueryException("Unsupported FTS option " + testNode.getText());
-        }
-    }
-
-    static private Constraint buildPhrase(CommonTree testNode, QueryModelFactory factory,
-            FunctionEvaluationContext functionEvaluationContext, Selector selector, Map<String, Column> columnMap)
-    {
-        String functionName = FTSPhrase.NAME;
-        Function function = factory.getFunction(functionName);
-        Map<String, Argument> functionArguments = new LinkedHashMap<String, Argument>();
-        LiteralArgument larg = factory.createLiteralArgument(FTSPhrase.ARG_PHRASE, DataTypeDefinition.TEXT, getText(testNode.getChild(0)));
-        functionArguments.put(larg.getName(), larg);
-        return factory.createFunctionalConstraint(function, functionArguments);
-    }
-
-    static private Constraint buildTerm(CommonTree testNode, QueryModelFactory factory, FunctionEvaluationContext functionEvaluationContext,
-            Selector selector, Map<String, Column> columnMap)
-    {
-        String functionName = FTSTerm.NAME;
-        Function function = factory.getFunction(functionName);
-        Map<String, Argument> functionArguments = new LinkedHashMap<String, Argument>();
-        LiteralArgument larg = factory.createLiteralArgument(FTSTerm.ARG_TERM, DataTypeDefinition.TEXT, getText(testNode.getChild(0)));
-        functionArguments.put(larg.getName(), larg);
-        larg = factory.createLiteralArgument(FTSTerm.ARG_TOKENISATION_MODE, DataTypeDefinition.ANY, AnalysisMode.DEFAULT);
-        functionArguments.put(larg.getName(), larg);
-        return factory.createFunctionalConstraint(function, functionArguments);
-    }
-
- 
-    static class DisjunctionToken implements Token
-    {
-
-        public int getChannel()
-        {
-            return 0;
-        }
-
-        public int getCharPositionInLine()
-        {
-            return 0;
-        }
-
-        public CharStream getInputStream()
-        {
-            return null;
-        }
-
-        public int getLine()
-        {
-            return 0;
-        }
-
-        public String getText()
-        {
-            return null;
-        }
-
-        public int getTokenIndex()
-        {
-            return 0;
-        }
-
-        public int getType()
-        {
-            return CMIS_FTSParser.DISJUNCTION;
-        }
-
-        public void setChannel(int arg0)
-        {
-            
-
-        }
-
-        public void setCharPositionInLine(int arg0)
-        {
-          
-
-        }
-
-        public void setInputStream(CharStream arg0)
-        {
-        
-        }
-
-        public void setLine(int arg0)
-        {
-         
-
-        }
-
-        public void setText(String arg0)
-        {
-           
-
-        }
-
-        public void setTokenIndex(int arg0)
-        {
-          
-        }
-
-        public void setType(int arg0)
-        {
-           
-        }
-
-    }
-
-    static class DefaultToken implements Token
-    {
-
-        public int getChannel()
-        {
-           
-            return 0;
-        }
-
-        public int getCharPositionInLine()
-        {
-            return 0;
-        }
-
-        public CharStream getInputStream()
-        {
-            return null;
-        }
-
-        public int getLine()
-        {
-            return 0;
-        }
-
-        public String getText()
-        {
-            return null;
-        }
-
-        public int getTokenIndex()
-        {
-            return 0;
-        }
-
-        public int getType()
-        {
-            return CMIS_FTSParser.DEFAULT;
-        }
-
-        public void setChannel(int arg0)
-        {
-           
-        }
-
-        public void setCharPositionInLine(int arg0)
-        {
-           
-        }
-
-        public void setInputStream(CharStream arg0)
-        {
-           
-        }
-
-        public void setLine(int arg0)
-        {
-            
-        }
-
-        public void setText(String arg0)
-        {
-           
-        }
-
-        public void setTokenIndex(int arg0)
-        {
-            
-        }
-
-        public void setType(int arg0)
-        {
-           
-        }
-
-    }
-
-    static private String getText(Tree node)
-    {
-        String text = node.getText();
-        int index;
-        switch (node.getType())
-        {
-        case CMIS_FTSParser.FTSWORD:
-            index = text.indexOf('\\');
-            if (index == -1)
-            {
-                return text;
-            }
-            else
-            {
-                return unescape(text);
-            }
-        case CMIS_FTSParser.FTSPHRASE:
-            String phrase = text.substring(1, text.length() - 1);
-            index = phrase.indexOf('\\');
-            if (index == -1)
-            {
-                return phrase;
-            }
-            else
-            {
-                return unescape(phrase);
-            }
-        default:
-            return text;
-        }
-    }
-
-    static private String unescape(String string)
-    {
-        StringBuilder builder = new StringBuilder(string.length());
-        boolean lastWasEscape = false;
-
-        for (int i = 0; i < string.length(); i++)
-        {
-            char c = string.charAt(i);
-            if (lastWasEscape)
-            {
-                if (c == 'u')
-                {
-                    throw new UnsupportedOperationException(string);
-                }
-                else
-                {
-                    builder.append(c);
-                }
-                lastWasEscape = false;
-            }
-            else
-            {
-                if (c == '\\')
-                {
-                    lastWasEscape = true;
-                }
-                else
-                {
-                    builder.append(c);
-                }
-            }
-        }
-        if (lastWasEscape)
-        {
-            throw new FTSQueryException("Escape character at end of string " + string);
-        }
-
-        return builder.toString();
-    }
-}
diff --git a/source/java/org/alfresco/opencmis/search/CMISQueryOptions.java b/source/java/org/alfresco/opencmis/search/CMISQueryOptions.java
deleted file mode 100644
index 52a13df6ed..0000000000
--- a/source/java/org/alfresco/opencmis/search/CMISQueryOptions.java
+++ /dev/null
@@ -1,90 +0,0 @@
-/*
- * Copyright (C) 2005-2010 Alfresco Software Limited.
- *
- * This file is part of Alfresco
- *
- * Alfresco is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Alfresco is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
- */
-package org.alfresco.opencmis.search;
-
-import java.util.Locale;
-
-import org.springframework.extensions.surf.util.I18NUtil;
-import org.alfresco.repo.search.impl.querymodel.QueryOptions;
-import org.alfresco.service.cmr.repository.StoreRef;
-
-/**
- * The options for a CMIS query
- * 
- * @author andyh
- */
-public class CMISQueryOptions extends QueryOptions
-{
-    public enum CMISQueryMode
-    {
-        CMS_STRICT, CMS_WITH_ALFRESCO_EXTENSIONS;
-    }
-
-    private CMISQueryMode queryMode = CMISQueryMode.CMS_STRICT;
-
-    /**
-     * Create a CMISQueryOptions instance with the default options other than
-     * the query and store ref. The query will be run using the locale returned
-     * by I18NUtil.getLocale()
-     * 
-     * @param query
-     *            - the query to run
-     * @param storeRef
-     *            - the store against which to run the query
-     */
-    public CMISQueryOptions(String query, StoreRef storeRef)
-    {
-        this(query, storeRef, I18NUtil.getLocale());
-    }
-
-    /**
-     * Create a CMISQueryOptions instance with the default options other than
-     * the query, store ref and locale.
-     * 
-     * @param query
-     *            - the query to run
-     * @param storeRef
-     *            - the store against which to run the query
-     */
-    public CMISQueryOptions(String query, StoreRef storeRef, Locale locale)
-    {
-        super(query, storeRef, locale);
-    }
-
-    /**
-     * Get the query mode.
-     * 
-     * @return the queryMode
-     */
-    public CMISQueryMode getQueryMode()
-    {
-        return queryMode;
-    }
-
-    /**
-     * Set the query mode.
-     * 
-     * @param queryMode
-     *            the queryMode to set
-     */
-    public void setQueryMode(CMISQueryMode queryMode)
-    {
-        this.queryMode = queryMode;
-    }
-}
diff --git a/source/java/org/alfresco/opencmis/search/CMISQueryParser.java b/source/java/org/alfresco/opencmis/search/CMISQueryParser.java
deleted file mode 100644
index a94134b1f0..0000000000
--- a/source/java/org/alfresco/opencmis/search/CMISQueryParser.java
+++ /dev/null
@@ -1,1705 +0,0 @@
-/*
- * Copyright (C) 2005-2010 Alfresco Software Limited.
- *
- * This file is part of Alfresco
- *
- * Alfresco is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Alfresco is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
- */
-package org.alfresco.opencmis.search;
-
-import java.text.ParseException;
-import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.StringTokenizer;
-
-import org.alfresco.opencmis.dictionary.CMISDictionaryService;
-import org.alfresco.opencmis.dictionary.PropertyDefintionWrapper;
-import org.alfresco.opencmis.dictionary.TypeDefinitionWrapper;
-import org.alfresco.opencmis.search.CMISQueryOptions.CMISQueryMode;
-import org.alfresco.repo.search.impl.parsers.CMISLexer;
-import org.alfresco.repo.search.impl.parsers.CMISParser;
-import org.alfresco.repo.search.impl.parsers.FTSParser;
-import org.alfresco.repo.search.impl.parsers.FTSQueryException;
-import org.alfresco.repo.search.impl.parsers.FTSQueryParser;
-import org.alfresco.repo.search.impl.querymodel.Argument;
-import org.alfresco.repo.search.impl.querymodel.ArgumentDefinition;
-import org.alfresco.repo.search.impl.querymodel.Column;
-import org.alfresco.repo.search.impl.querymodel.Constraint;
-import org.alfresco.repo.search.impl.querymodel.Constraint.Occur;
-import org.alfresco.repo.search.impl.querymodel.Function;
-import org.alfresco.repo.search.impl.querymodel.FunctionArgument;
-import org.alfresco.repo.search.impl.querymodel.FunctionEvaluationContext;
-import org.alfresco.repo.search.impl.querymodel.JoinType;
-import org.alfresco.repo.search.impl.querymodel.ListArgument;
-import org.alfresco.repo.search.impl.querymodel.LiteralArgument;
-import org.alfresco.repo.search.impl.querymodel.Order;
-import org.alfresco.repo.search.impl.querymodel.Ordering;
-import org.alfresco.repo.search.impl.querymodel.ParameterArgument;
-import org.alfresco.repo.search.impl.querymodel.PredicateMode;
-import org.alfresco.repo.search.impl.querymodel.PropertyArgument;
-import org.alfresco.repo.search.impl.querymodel.Query;
-import org.alfresco.repo.search.impl.querymodel.QueryModelException;
-import org.alfresco.repo.search.impl.querymodel.QueryModelFactory;
-import org.alfresco.repo.search.impl.querymodel.QueryOptions.Connective;
-import org.alfresco.repo.search.impl.querymodel.Selector;
-import org.alfresco.repo.search.impl.querymodel.SelectorArgument;
-import org.alfresco.repo.search.impl.querymodel.Source;
-import org.alfresco.repo.search.impl.querymodel.impl.BaseComparison;
-import org.alfresco.repo.search.impl.querymodel.impl.functions.Child;
-import org.alfresco.repo.search.impl.querymodel.impl.functions.Descendant;
-import org.alfresco.repo.search.impl.querymodel.impl.functions.Equals;
-import org.alfresco.repo.search.impl.querymodel.impl.functions.Exists;
-import org.alfresco.repo.search.impl.querymodel.impl.functions.GreaterThan;
-import org.alfresco.repo.search.impl.querymodel.impl.functions.GreaterThanOrEquals;
-import org.alfresco.repo.search.impl.querymodel.impl.functions.In;
-import org.alfresco.repo.search.impl.querymodel.impl.functions.LessThan;
-import org.alfresco.repo.search.impl.querymodel.impl.functions.LessThanOrEquals;
-import org.alfresco.repo.search.impl.querymodel.impl.functions.Like;
-import org.alfresco.repo.search.impl.querymodel.impl.functions.NotEquals;
-import org.alfresco.repo.search.impl.querymodel.impl.functions.PropertyAccessor;
-import org.alfresco.repo.search.impl.querymodel.impl.functions.Score;
-import org.alfresco.service.cmr.dictionary.DataTypeDefinition;
-import org.alfresco.service.cmr.repository.datatype.DefaultTypeConverter;
-import org.alfresco.service.namespace.QName;
-import org.alfresco.util.CachingDateFormat;
-import org.antlr.runtime.ANTLRStringStream;
-import org.antlr.runtime.CharStream;
-import org.antlr.runtime.CommonTokenStream;
-import org.antlr.runtime.RecognitionException;
-import org.antlr.runtime.tree.CommonTree;
-import org.apache.chemistry.opencmis.commons.enums.BaseTypeId;
-import org.apache.chemistry.opencmis.commons.enums.CapabilityJoin;
-import org.apache.chemistry.opencmis.commons.enums.PropertyType;
-import org.apache.chemistry.opencmis.commons.exceptions.CmisInvalidArgumentException;
-
-/**
- * @author andyh
- */
-public class CMISQueryParser
-{
-    private enum EscapeMode
-    {
-        LITERAL, LIKE, CONTAINS;
-    }
-
-    private CMISQueryOptions options;
-
-    private CMISDictionaryService cmisDictionaryService;
-
-    private CapabilityJoin joinSupport;
-
-    private BaseTypeId[] validScopes;
-
-    private boolean hasScore = false;
-
-    private boolean hasContains = false;
-
-    public CMISQueryParser(CMISQueryOptions options, CMISDictionaryService cmisDictionaryService,
-            CapabilityJoin joinSupport)
-    {
-        this.options = options;
-        this.cmisDictionaryService = cmisDictionaryService;
-        this.joinSupport = joinSupport;
-        this.validScopes = (options.getQueryMode() == CMISQueryMode.CMS_STRICT) ? CmisFunctionEvaluationContext.STRICT_SCOPES
-                : CmisFunctionEvaluationContext.ALFRESCO_SCOPES;
-    }
-
-    public Query parse(QueryModelFactory factory, FunctionEvaluationContext functionEvaluationContext)
-    {
-
-        CMISParser parser = null;
-        try
-        {
-            CharStream cs = new ANTLRStringStream(options.getQuery());
-            CMISLexer lexer = new CMISLexer(cs);
-            CommonTokenStream tokens = new CommonTokenStream(lexer);
-            parser = new CMISParser(tokens);
-            parser.setStrict(options.getQueryMode() == CMISQueryMode.CMS_STRICT);
-            CommonTree queryNode = (CommonTree) parser.query().getTree();
-
-            CommonTree sourceNode = (CommonTree) queryNode.getFirstChildWithType(CMISParser.SOURCE);
-            Source source = buildSource(sourceNode, joinSupport, factory);
-            Map<String, Selector> selectors = source.getSelectors();
-            ArrayList<Column> columns = buildColumns(queryNode, factory, selectors, options.getQuery());
-
-            HashMap<String, Column> columnMap = new HashMap<String, Column>();
-            for (Column column : columns)
-            {
-                if (columnMap.containsKey(column.getAlias()))
-                {
-                    throw new CmisInvalidArgumentException("Duplicate column alias for " + column.getAlias());
-                } else
-                {
-                    columnMap.put(column.getAlias(), column);
-                }
-            }
-
-            ArrayList<Ordering> orderings = buildOrderings(queryNode, factory, selectors, columns);
-
-            Constraint constraint = null;
-            CommonTree orNode = (CommonTree) queryNode.getFirstChildWithType(CMISParser.DISJUNCTION);
-            if (orNode != null)
-            {
-                constraint = buildDisjunction(orNode, factory, functionEvaluationContext, selectors, columnMap);
-            }
-
-            Query query = factory.createQuery(columns, source, constraint, orderings);
-
-            // TODO: validate query and use of ID, function arguments matching
-            // up etc
-
-            if (options.getQueryMode() == CMISQueryMode.CMS_STRICT)
-            {
-                if (hasScore && !hasContains)
-                {
-                    throw new CmisInvalidArgumentException("Function SCORE() used without matching CONTAINS() function");
-                }
-            }
-
-            return query;
-        } catch (RecognitionException e)
-        {
-            if (parser != null)
-            {
-                String[] tokenNames = parser.getTokenNames();
-                String hdr = parser.getErrorHeader(e);
-                String msg = parser.getErrorMessage(e, tokenNames);
-                throw new CmisInvalidArgumentException(hdr + "\n" + msg, e);
-            }
-        }
-        throw new CmisInvalidArgumentException("Failed to parse");
-    }
-
-    /**
-     * @param queryNode
-     * @param factory
-     * @param selectors
-     * @param columns
-     * @return
-     */
-    private Constraint buildDisjunction(CommonTree orNode, QueryModelFactory factory,
-            FunctionEvaluationContext functionEvaluationContext, Map<String, Selector> selectors,
-            HashMap<String, Column> columnMap)
-    {
-        List<Constraint> constraints = new ArrayList<Constraint>(orNode.getChildCount());
-        for (int i = 0; i < orNode.getChildCount(); i++)
-        {
-            CommonTree andNode = (CommonTree) orNode.getChild(i);
-            Constraint constraint = buildConjunction(andNode, factory, functionEvaluationContext, selectors, columnMap);
-            constraints.add(constraint);
-        }
-        if (constraints.size() == 1)
-        {
-            return constraints.get(0);
-        } else
-        {
-            return factory.createDisjunction(constraints);
-        }
-    }
-
-    /**
-     * @param andNode
-     * @param factory
-     * @param selectors
-     * @param columns
-     * @return
-     */
-    private Constraint buildConjunction(CommonTree andNode, QueryModelFactory factory,
-            FunctionEvaluationContext functionEvaluationContext, Map<String, Selector> selectors,
-            HashMap<String, Column> columnMap)
-    {
-        List<Constraint> constraints = new ArrayList<Constraint>(andNode.getChildCount());
-        for (int i = 0; i < andNode.getChildCount(); i++)
-        {
-            CommonTree notNode = (CommonTree) andNode.getChild(i);
-            Constraint constraint = buildNegation(notNode, factory, functionEvaluationContext, selectors, columnMap);
-            constraints.add(constraint);
-        }
-        if (constraints.size() == 1)
-        {
-            return constraints.get(0);
-        } else
-        {
-            return factory.createConjunction(constraints);
-        }
-    }
-
-    /**
-     * @param notNode
-     * @param factory
-     * @param selectors
-     * @param columns
-     * @return
-     */
-    private Constraint buildNegation(CommonTree notNode, QueryModelFactory factory,
-            FunctionEvaluationContext functionEvaluationContext, Map<String, Selector> selectors,
-            HashMap<String, Column> columnMap)
-    {
-        if (notNode.getType() == CMISParser.NEGATION)
-        {
-            Constraint constraint = buildTest((CommonTree) notNode.getChild(0), factory, functionEvaluationContext,
-                    selectors, columnMap);
-            constraint.setOccur(Occur.EXCLUDE);
-            return constraint;
-        } else
-        {
-            return buildTest(notNode, factory, functionEvaluationContext, selectors, columnMap);
-        }
-    }
-
-    /**
-     * @param notNode
-     * @param factory
-     * @param selectors
-     * @param columns
-     * @return
-     */
-    private Constraint buildTest(CommonTree testNode, QueryModelFactory factory,
-            FunctionEvaluationContext functionEvaluationContext, Map<String, Selector> selectors,
-            HashMap<String, Column> columnMap)
-    {
-        if (testNode.getType() == CMISParser.DISJUNCTION)
-        {
-            return buildDisjunction(testNode, factory, functionEvaluationContext, selectors, columnMap);
-        } else
-        {
-            return buildPredicate(testNode, factory, functionEvaluationContext, selectors, columnMap);
-        }
-    }
-
-    /**
-     * @param orNode
-     * @param factory
-     * @param selectors
-     * @param columns
-     * @return
-     */
-    private Constraint buildPredicate(CommonTree predicateNode, QueryModelFactory factory,
-            FunctionEvaluationContext functionEvaluationContext, Map<String, Selector> selectors,
-            Map<String, Column> columnMap)
-    {
-        String functionName;
-        Function function;
-        CommonTree argNode;
-        Map<String, Argument> functionArguments;
-        Argument arg;
-        switch (predicateNode.getType())
-        {
-        case CMISParser.PRED_CHILD:
-            functionName = Child.NAME;
-            function = factory.getFunction(functionName);
-            functionArguments = new LinkedHashMap<String, Argument>();
-            argNode = (CommonTree) predicateNode.getChild(0);
-            arg = getFunctionArgument(argNode, function.getArgumentDefinition(Child.ARG_PARENT), factory, selectors,
-                    columnMap, false);
-            functionArguments.put(arg.getName(), arg);
-            if (predicateNode.getChildCount() > 1)
-            {
-                argNode = (CommonTree) predicateNode.getChild(1);
-                arg = getFunctionArgument(argNode, function.getArgumentDefinition(Child.ARG_SELECTOR), factory,
-                        selectors, columnMap, false);
-                if (!arg.isQueryable())
-                {
-                    throw new CmisInvalidArgumentException("The property is not queryable: " + argNode.getText());
-                }
-                functionArguments.put(arg.getName(), arg);
-            }
-            return factory.createFunctionalConstraint(function, functionArguments);
-        case CMISParser.PRED_COMPARISON:
-
-            switch (predicateNode.getChild(2).getType())
-            {
-            case CMISParser.EQUALS:
-                functionName = Equals.NAME;
-                function = factory.getFunction(functionName);
-                break;
-            case CMISParser.NOTEQUALS:
-                functionName = NotEquals.NAME;
-                function = factory.getFunction(functionName);
-                break;
-            case CMISParser.GREATERTHAN:
-                functionName = GreaterThan.NAME;
-                function = factory.getFunction(functionName);
-                break;
-            case CMISParser.GREATERTHANOREQUALS:
-                functionName = GreaterThanOrEquals.NAME;
-                function = factory.getFunction(functionName);
-                break;
-            case CMISParser.LESSTHAN:
-                functionName = LessThan.NAME;
-                function = factory.getFunction(functionName);
-                break;
-            case CMISParser.LESSTHANOREQUALS:
-                functionName = LessThanOrEquals.NAME;
-                function = factory.getFunction(functionName);
-                break;
-            default:
-                throw new CmisInvalidArgumentException("Unknown comparison function "
-                        + predicateNode.getChild(2).getText());
-            }
-            functionArguments = new LinkedHashMap<String, Argument>();
-            argNode = (CommonTree) predicateNode.getChild(0);
-            arg = getFunctionArgument(argNode, function.getArgumentDefinition(BaseComparison.ARG_MODE), factory,
-                    selectors, columnMap, false);
-            functionArguments.put(arg.getName(), arg);
-            argNode = (CommonTree) predicateNode.getChild(1);
-            arg = getFunctionArgument(argNode, function.getArgumentDefinition(BaseComparison.ARG_LHS), factory,
-                    selectors, columnMap, false);
-            functionArguments.put(arg.getName(), arg);
-            argNode = (CommonTree) predicateNode.getChild(3);
-            arg = getFunctionArgument(argNode, function.getArgumentDefinition(BaseComparison.ARG_RHS), factory,
-                    selectors, columnMap, false);
-            functionArguments.put(arg.getName(), arg);
-            checkPredicateConditionsForComparisons(function, functionArguments, functionEvaluationContext, columnMap);
-            return factory.createFunctionalConstraint(function, functionArguments);
-        case CMISParser.PRED_DESCENDANT:
-            functionName = Descendant.NAME;
-            function = factory.getFunction(functionName);
-            argNode = (CommonTree) predicateNode.getChild(0);
-            functionArguments = new LinkedHashMap<String, Argument>();
-            arg = getFunctionArgument(argNode, function.getArgumentDefinition(Descendant.ARG_ANCESTOR), factory,
-                    selectors, columnMap, false);
-            functionArguments.put(arg.getName(), arg);
-            if (predicateNode.getChildCount() > 1)
-            {
-                argNode = (CommonTree) predicateNode.getChild(1);
-                arg = getFunctionArgument(argNode, function.getArgumentDefinition(Descendant.ARG_SELECTOR), factory,
-                        selectors, columnMap, false);
-                functionArguments.put(arg.getName(), arg);
-            }
-            return factory.createFunctionalConstraint(function, functionArguments);
-        case CMISParser.PRED_EXISTS:
-            functionName = Exists.NAME;
-            function = factory.getFunction(functionName);
-            argNode = (CommonTree) predicateNode.getChild(0);
-            functionArguments = new LinkedHashMap<String, Argument>();
-            arg = getFunctionArgument(argNode, function.getArgumentDefinition(Exists.ARG_PROPERTY), factory, selectors,
-                    columnMap, false);
-            functionArguments.put(arg.getName(), arg);
-            arg = factory.createLiteralArgument(Exists.ARG_NOT, DataTypeDefinition.BOOLEAN,
-                    (predicateNode.getChildCount() > 1));
-            functionArguments.put(arg.getName(), arg);
-            // Applies to both single valued and multi-valued properties - no
-            // checks required
-            return factory.createFunctionalConstraint(function, functionArguments);
-        case CMISParser.PRED_FTS:
-            if (options.getQueryMode() == CMISQueryMode.CMS_STRICT)
-            {
-                if (hasContains)
-                {
-                    throw new CmisInvalidArgumentException(
-                            "Only one CONTAINS() function can be included in a single query statement.");
-                }
-            }
-            String ftsExpression = predicateNode.getChild(0).getText();
-            ftsExpression = ftsExpression.substring(1, ftsExpression.length() - 1);
-            ftsExpression = unescape(ftsExpression, EscapeMode.CONTAINS);
-            Selector selector;
-            if (predicateNode.getChildCount() > 1)
-            {
-                String qualifier = predicateNode.getChild(1).getText();
-                selector = selectors.get(qualifier);
-                if (selector == null)
-                {
-                    throw new CmisInvalidArgumentException("No selector for " + qualifier);
-                }
-            } else
-            {
-                if (selectors.size() == 1)
-                {
-                    selector = selectors.get(selectors.keySet().iterator().next());
-                } else
-                {
-                    throw new CmisInvalidArgumentException(
-                            "A selector must be specified when there are two or more selectors");
-                }
-            }
-            Connective defaultConnective;
-            Connective defaultFieldConnective;
-            if (options.getQueryMode() == CMISQueryMode.CMS_STRICT)
-            {
-                defaultConnective = Connective.AND;
-                defaultFieldConnective = Connective.AND;
-            } else
-            {
-                defaultConnective = options.getDefaultFTSConnective();
-                defaultFieldConnective = options.getDefaultFTSFieldConnective();
-            }
-            FTSParser.Mode mode;
-            if (options.getQueryMode() == CMISQueryMode.CMS_STRICT)
-            {
-                mode = FTSParser.Mode.CMIS;
-            } else
-            {
-                if (defaultConnective == Connective.AND)
-                {
-                    mode = FTSParser.Mode.DEFAULT_CONJUNCTION;
-                } else
-                {
-                    mode = FTSParser.Mode.DEFAULT_DISJUNCTION;
-                }
-            }
-            Constraint ftsConstraint;
-            if (options.getQueryMode() == CMISQueryMode.CMS_STRICT)
-            {
-                ftsConstraint = CMISFTSQueryParser.buildFTS(ftsExpression, factory, functionEvaluationContext,
-                        selector, columnMap, options.getDefaultFieldName());
-            } else
-            {
-                ftsConstraint = FTSQueryParser.buildFTS(ftsExpression, factory, functionEvaluationContext, selector,
-                        columnMap, mode, defaultFieldConnective, null, options.getDefaultFieldName());
-            }
-            ftsConstraint.setBoost(1000.0f);
-            hasContains = true;
-            return ftsConstraint;
-        case CMISParser.PRED_IN:
-            functionName = In.NAME;
-            function = factory.getFunction(functionName);
-            functionArguments = new LinkedHashMap<String, Argument>();
-            argNode = (CommonTree) predicateNode.getChild(0);
-            arg = getFunctionArgument(argNode, function.getArgumentDefinition(In.ARG_MODE), factory, selectors,
-                    columnMap, false);
-            functionArguments.put(arg.getName(), arg);
-            argNode = (CommonTree) predicateNode.getChild(1);
-            arg = getFunctionArgument(argNode, function.getArgumentDefinition(In.ARG_PROPERTY), factory, selectors,
-                    columnMap, false);
-            functionArguments.put(arg.getName(), arg);
-            argNode = (CommonTree) predicateNode.getChild(2);
-            arg = getFunctionArgument(argNode, function.getArgumentDefinition(In.ARG_LIST), factory, selectors,
-                    columnMap, false);
-            functionArguments.put(arg.getName(), arg);
-            arg = factory.createLiteralArgument(In.ARG_NOT, DataTypeDefinition.BOOLEAN,
-                    (predicateNode.getChildCount() > 3));
-            functionArguments.put(arg.getName(), arg);
-            checkPredicateConditionsForIn(functionArguments, functionEvaluationContext, columnMap);
-            return factory.createFunctionalConstraint(function, functionArguments);
-        case CMISParser.PRED_LIKE:
-            functionName = Like.NAME;
-            function = factory.getFunction(functionName);
-            functionArguments = new LinkedHashMap<String, Argument>();
-            argNode = (CommonTree) predicateNode.getChild(0);
-            arg = getFunctionArgument(argNode, function.getArgumentDefinition(Like.ARG_PROPERTY), factory, selectors,
-                    columnMap, false);
-            functionArguments.put(arg.getName(), arg);
-            argNode = (CommonTree) predicateNode.getChild(1);
-            arg = getFunctionArgument(argNode, function.getArgumentDefinition(Like.ARG_EXP), factory, selectors,
-                    columnMap, true);
-            functionArguments.put(arg.getName(), arg);
-            arg = factory.createLiteralArgument(Like.ARG_NOT, DataTypeDefinition.BOOLEAN,
-                    (predicateNode.getChildCount() > 2));
-            functionArguments.put(arg.getName(), arg);
-            checkPredicateConditionsForLike(functionArguments, functionEvaluationContext, columnMap);
-            return factory.createFunctionalConstraint(function, functionArguments);
-        default:
-            return null;
-        }
-    }
-
-    private void checkPredicateConditionsForIn(Map<String, Argument> functionArguments,
-            FunctionEvaluationContext functionEvaluationContext, Map<String, Column> columnMap)
-    {
-        if (options.getQueryMode() == CMISQueryMode.CMS_STRICT)
-        {
-            PropertyArgument propertyArgument = (PropertyArgument) functionArguments.get(In.ARG_PROPERTY);
-            LiteralArgument modeArgument = (LiteralArgument) functionArguments.get(In.ARG_MODE);
-            String modeString = DefaultTypeConverter.INSTANCE.convert(String.class,
-                    modeArgument.getValue(functionEvaluationContext));
-            PredicateMode mode = PredicateMode.valueOf(modeString);
-            String propertyName = propertyArgument.getPropertyName();
-
-            Column column = columnMap.get(propertyName);
-            if (column != null)
-            {
-                // check for function type
-                if (column.getFunction().getName().equals(PropertyAccessor.NAME))
-                {
-                    PropertyArgument arg = (PropertyArgument) column.getFunctionArguments().get(
-                            PropertyAccessor.ARG_PROPERTY);
-                    propertyName = arg.getPropertyName();
-                } else
-                {
-                    throw new CmisInvalidArgumentException("Complex column reference not supoprted in LIKE "
-                            + propertyName);
-                }
-            }
-
-            boolean isMultiValued = functionEvaluationContext.isMultiValued(propertyName);
-
-            switch (mode)
-            {
-            case ANY:
-                if (isMultiValued)
-                {
-                    break;
-                } else
-                {
-                    throw new QueryModelException("Predicate mode " + PredicateMode.ANY
-                            + " is not supported for IN and single valued properties");
-                }
-            case SINGLE_VALUED_PROPERTY:
-                if (isMultiValued)
-                {
-                    throw new QueryModelException("Predicate mode " + PredicateMode.SINGLE_VALUED_PROPERTY
-                            + " is not supported for IN and multi-valued properties");
-                } else
-                {
-                    break;
-                }
-            default:
-                throw new QueryModelException("Unsupported predicate mode " + mode);
-            }
-
-            PropertyDefintionWrapper propDef = cmisDictionaryService.findPropertyByQueryName(propertyName);
-            if (propDef.getPropertyDefinition().getPropertyType() == PropertyType.BOOLEAN)
-            {
-                throw new QueryModelException("In is not supported for properties of type Boolean");
-            }
-        }
-
-    }
-
-    private void checkPredicateConditionsForComparisons(Function function, Map<String, Argument> functionArguments,
-            FunctionEvaluationContext functionEvaluationContext, Map<String, Column> columnMap)
-    {
-        if (options.getQueryMode() == CMISQueryMode.CMS_STRICT)
-        {
-            ((BaseComparison) function).setPropertyAndStaticArguments(functionArguments);
-            String propertyName = ((BaseComparison) function).getPropertyName();
-            LiteralArgument modeArgument = (LiteralArgument) functionArguments.get(BaseComparison.ARG_MODE);
-            String modeString = DefaultTypeConverter.INSTANCE.convert(String.class,
-                    modeArgument.getValue(functionEvaluationContext));
-            PredicateMode mode = PredicateMode.valueOf(modeString);
-
-            Column column = columnMap.get(propertyName);
-            if (column != null)
-            {
-                // check for function type
-                if (column.getFunction().getName().equals(PropertyAccessor.NAME))
-                {
-                    PropertyArgument arg = (PropertyArgument) column.getFunctionArguments().get(
-                            PropertyAccessor.ARG_PROPERTY);
-                    propertyName = arg.getPropertyName();
-                } else
-                {
-                    throw new CmisInvalidArgumentException("Complex column reference not supoprted in LIKE "
-                            + propertyName);
-                }
-            }
-
-            boolean isMultiValued = functionEvaluationContext.isMultiValued(propertyName);
-
-            switch (mode)
-            {
-            case ANY:
-                if (isMultiValued)
-                {
-                    if (function.getName().equals(Equals.NAME))
-                    {
-                        break;
-                    } else
-                    {
-                        throw new QueryModelException("Predicate mode " + PredicateMode.ANY + " is only supported for "
-                                + Equals.NAME + " (and multi-valued properties).");
-                    }
-                } else
-                {
-                    throw new QueryModelException("Predicate mode " + PredicateMode.ANY + " is not supported for "
-                            + function.getName() + " and single valued properties");
-                }
-            case SINGLE_VALUED_PROPERTY:
-                if (isMultiValued)
-                {
-                    throw new QueryModelException("Predicate mode " + PredicateMode.SINGLE_VALUED_PROPERTY
-                            + " is not supported for " + function.getName() + " and multi-valued properties");
-                } else
-                {
-                    break;
-                }
-            default:
-                throw new QueryModelException("Unsupported predicate mode " + mode);
-            }
-
-            // limit support for ID and Boolean
-
-            PropertyDefintionWrapper propDef = cmisDictionaryService.findPropertyByQueryName(propertyName);
-            if (propDef.getPropertyDefinition().getPropertyType() == PropertyType.ID)
-            {
-                if (function.getName().equals(Equals.NAME) || function.getName().equals(NotEquals.NAME))
-                {
-                    return;
-                } else
-                {
-                    throw new QueryModelException("Comparison " + function.getName()
-                            + " is not supported for properties of type ID");
-                }
-            } else if (propDef.getPropertyDefinition().getPropertyType() == PropertyType.BOOLEAN)
-            {
-                if (function.getName().equals(Equals.NAME))
-                {
-                    return;
-                } else
-                {
-                    throw new QueryModelException("Comparison " + function.getName()
-                            + " is not supported for properties of type Boolean");
-                }
-            }
-        }
-
-    }
-
-    private void checkPredicateConditionsForLike(Map<String, Argument> functionArguments,
-            FunctionEvaluationContext functionEvaluationContext, Map<String, Column> columnMap)
-    {
-        if (options.getQueryMode() == CMISQueryMode.CMS_STRICT)
-        {
-            PropertyArgument propertyArgument = (PropertyArgument) functionArguments.get(Like.ARG_PROPERTY);
-
-            boolean isMultiValued = functionEvaluationContext.isMultiValued(propertyArgument.getPropertyName());
-
-            if (isMultiValued)
-            {
-                throw new QueryModelException("Like is not supported for multi-valued properties");
-            }
-
-            String cmisPropertyName = propertyArgument.getPropertyName();
-
-            Column column = columnMap.get(cmisPropertyName);
-            if (column != null)
-            {
-                // check for function type
-                if (column.getFunction().getName().equals(PropertyAccessor.NAME))
-                {
-                    PropertyArgument arg = (PropertyArgument) column.getFunctionArguments().get(
-                            PropertyAccessor.ARG_PROPERTY);
-                    cmisPropertyName = arg.getPropertyName();
-                } else
-                {
-                    throw new CmisInvalidArgumentException("Complex column reference not supoprted in LIKE "
-                            + cmisPropertyName);
-                }
-            }
-
-            PropertyDefintionWrapper propDef = cmisDictionaryService.findPropertyByQueryName(cmisPropertyName);
-            if (propDef.getPropertyDefinition().getPropertyType() != PropertyType.STRING)
-            {
-                throw new CmisInvalidArgumentException("LIKE is only supported against String types" + cmisPropertyName);
-            }
-        }
-    }
-
-    /**
-     * @param queryNode
-     * @param factory
-     * @param selectors
-     * @return
-     */
-    private ArrayList<Ordering> buildOrderings(CommonTree queryNode, QueryModelFactory factory,
-            Map<String, Selector> selectors, List<Column> columns)
-    {
-        ArrayList<Ordering> orderings = new ArrayList<Ordering>();
-        CommonTree orderNode = (CommonTree) queryNode.getFirstChildWithType(CMISParser.ORDER);
-        if (orderNode != null)
-        {
-            for (int i = 0; i < orderNode.getChildCount(); i++)
-            {
-                CommonTree current = (CommonTree) orderNode.getChild(i);
-
-                CommonTree columnRefNode = (CommonTree) current.getFirstChildWithType(CMISParser.COLUMN_REF);
-                if (columnRefNode != null)
-                {
-                    String columnName = columnRefNode.getChild(0).getText();
-                    String qualifier = "";
-                    if (columnRefNode.getChildCount() > 1)
-                    {
-                        qualifier = columnRefNode.getChild(1).getText();
-                    }
-
-                    Order order = Order.ASCENDING;
-
-                    if (current.getChild(1).getType() == CMISParser.DESC)
-                    {
-                        order = Order.DESCENDING;
-                    }
-
-                    Column orderColumn = null;
-
-                    if (qualifier.length() == 0)
-                    {
-                        Column match = null;
-                        for (Column column : columns)
-                        {
-                            if (column.getAlias().equals(columnName))
-                            {
-                                match = column;
-                                break;
-                            }
-                            if (column.getFunction().getName().equals(PropertyAccessor.NAME))
-                            {
-                                PropertyArgument arg = (PropertyArgument) column.getFunctionArguments().get(
-                                        PropertyAccessor.ARG_PROPERTY);
-                                String propertyName = arg.getPropertyName();
-                                if (propertyName.equals(columnName))
-                                {
-                                    match = column;
-                                    break;
-                                }
-                            }
-                        }
-                        // in strict mode the ordered column must be selected
-                        if ((options.getQueryMode() == CMISQueryMode.CMS_STRICT) && (match == null))
-                        {
-                            throw new CmisInvalidArgumentException("Ordered column is not selected: " + qualifier + "."
-                                    + columnName);
-                        }
-                        if (match == null)
-                        {
-
-                            Selector selector = selectors.get(qualifier);
-                            if (selector == null)
-                            {
-                                if ((qualifier.equals("")) && (selectors.size() == 1))
-                                {
-                                    selector = selectors.get(selectors.keySet().iterator().next());
-                                } else
-                                {
-                                    throw new CmisInvalidArgumentException("No selector for " + qualifier);
-                                }
-                            }
-
-                            TypeDefinitionWrapper typeDef = cmisDictionaryService.findTypeForClass(selector.getType(),
-                                    validScopes);
-                            if (typeDef == null)
-                            {
-                                throw new CmisInvalidArgumentException("Type unsupported in CMIS queries: "
-                                        + selector.getAlias());
-                            }
-                            PropertyDefintionWrapper propDef = cmisDictionaryService
-                                    .findPropertyByQueryName(columnName);
-                            if (propDef == null)
-                            {
-                                throw new CmisInvalidArgumentException("Invalid column for "
-                                        + typeDef.getTypeDefinition(false).getQueryName() + "." + columnName);
-                            }
-
-                            // Check column/property applies to selector/type
-
-                            if (typeDef.getPropertyById(propDef.getPropertyId()) == null)
-                            {
-                                throw new CmisInvalidArgumentException("Invalid column for "
-                                        + typeDef.getTypeDefinition(false).getQueryName() + "." + columnName);
-                            }
-
-                            // check there is a matching selector
-
-                            if (options.getQueryMode() == CMISQueryMode.CMS_STRICT)
-                            {
-                                boolean found = false;
-                                for (Column column : columns)
-                                {
-                                    if (column.getFunction().getName().equals(PropertyAccessor.NAME))
-                                    {
-                                        PropertyArgument pa = (PropertyArgument) column.getFunctionArguments().get(
-                                                PropertyAccessor.ARG_PROPERTY);
-                                        if (pa.getPropertyName().equals(propDef.getPropertyId()))
-                                        {
-                                            found = true;
-                                            break;
-                                        }
-                                    }
-                                }
-                                if (!found)
-                                {
-                                    throw new CmisInvalidArgumentException("Ordered column is not selected: "
-                                            + qualifier + "." + columnName);
-                                }
-                            }
-
-                            Function function = factory.getFunction(PropertyAccessor.NAME);
-                            Argument arg = factory.createPropertyArgument(PropertyAccessor.ARG_PROPERTY, propDef
-                                    .getPropertyDefinition().isQueryable(), propDef.getPropertyDefinition()
-                                    .isOrderable(), selector.getAlias(), propDef.getPropertyId());
-                            Map<String, Argument> functionArguments = new LinkedHashMap<String, Argument>();
-                            functionArguments.put(arg.getName(), arg);
-
-                            String alias = (selector.getAlias().length() > 0) ? selector.getAlias() + "."
-                                    + propDef.getPropertyId() : propDef.getPropertyId();
-
-                            match = factory.createColumn(function, functionArguments, alias);
-                        }
-
-                        orderColumn = match;
-                    } else
-                    {
-                        Selector selector = selectors.get(qualifier);
-                        if (selector == null)
-                        {
-                            if ((qualifier.equals("")) && (selectors.size() == 1))
-                            {
-                                selector = selectors.get(selectors.keySet().iterator().next());
-                            } else
-                            {
-                                throw new CmisInvalidArgumentException("No selector for " + qualifier);
-                            }
-                        }
-
-                        TypeDefinitionWrapper typeDef = cmisDictionaryService.findTypeForClass(selector.getType(), validScopes);
-                        if (typeDef == null)
-                        {
-                            throw new CmisInvalidArgumentException("Type unsupported in CMIS queries: "
-                                    + selector.getAlias());
-                        }
-                        PropertyDefintionWrapper propDef = cmisDictionaryService.findPropertyByQueryName(columnName);
-                        if (propDef == null)
-                        {
-                            throw new CmisInvalidArgumentException("Invalid column for "
-                                    + typeDef.getTypeDefinition(false).getQueryName() + "." + columnName
-                                    + " selector alias " + selector.getAlias());
-                        }
-
-                        // check there is a matching selector
-
-                        if (options.getQueryMode() == CMISQueryMode.CMS_STRICT)
-                        {
-                            boolean found = false;
-                            for (Column column : columns)
-                            {
-                                if (column.getFunction().getName().equals(PropertyAccessor.NAME))
-                                {
-                                    PropertyArgument pa = (PropertyArgument) column.getFunctionArguments().get(
-                                            PropertyAccessor.ARG_PROPERTY);
-                                    if (pa.getPropertyName().equals(propDef.getPropertyId()))
-                                    {
-                                        found = true;
-                                        break;
-                                    }
-                                }
-                            }
-                            if (!found)
-                            {
-                                throw new CmisInvalidArgumentException("Ordered column is not selected: " + qualifier
-                                        + "." + columnName);
-                            }
-                        }
-
-                        Function function = factory.getFunction(PropertyAccessor.NAME);
-                        Argument arg = factory.createPropertyArgument(PropertyAccessor.ARG_PROPERTY, propDef
-                                .getPropertyDefinition().isQueryable(), propDef.getPropertyDefinition().isOrderable(),
-                                selector.getAlias(), propDef.getPropertyId());
-                        Map<String, Argument> functionArguments = new LinkedHashMap<String, Argument>();
-                        functionArguments.put(arg.getName(), arg);
-
-                        String alias = (selector.getAlias().length() > 0) ? selector.getAlias() + "."
-                                + propDef.getPropertyId() : propDef.getPropertyId();
-
-                        orderColumn = factory.createColumn(function, functionArguments, alias);
-                    }
-
-                    if (!orderColumn.isOrderable() || !orderColumn.isQueryable())
-                    {
-                        throw new CmisInvalidArgumentException("Ordering is not support for " + orderColumn.getAlias());
-                    }
-
-                    Ordering ordering = factory.createOrdering(orderColumn, order);
-                    orderings.add(ordering);
-
-                }
-            }
-        }
-        return orderings;
-    }
-
-    @SuppressWarnings("unchecked")
-    private ArrayList<Column> buildColumns(CommonTree queryNode, QueryModelFactory factory,
-            Map<String, Selector> selectors, String query)
-    {
-        ArrayList<Column> columns = new ArrayList<Column>();
-        CommonTree starNode = (CommonTree) queryNode.getFirstChildWithType(CMISParser.ALL_COLUMNS);
-        if (starNode != null)
-        {
-            for (Selector selector : selectors.values())
-            {
-                TypeDefinitionWrapper typeDef = cmisDictionaryService.findTypeForClass(selector.getType(), validScopes);
-                if (typeDef == null)
-                {
-                    throw new CmisInvalidArgumentException("Type unsupported in CMIS queries: " + selector.getAlias());
-                }
-                Collection<PropertyDefintionWrapper> propDefs = typeDef.getProperties();
-                for (PropertyDefintionWrapper definition : propDefs)
-                {
-                    Function function = factory.getFunction(PropertyAccessor.NAME);
-                    Argument arg = factory.createPropertyArgument(PropertyAccessor.ARG_PROPERTY, definition
-                            .getPropertyDefinition().isQueryable(), definition.getPropertyDefinition().isOrderable(),
-                            selector.getAlias(), definition.getPropertyId());
-                    Map<String, Argument> functionArguments = new LinkedHashMap<String, Argument>();
-                    functionArguments.put(arg.getName(), arg);
-                    String alias = (selector.getAlias().length() > 0) ? selector.getAlias() + "."
-                            + definition.getPropertyId() : definition.getPropertyId();
-                    Column column = factory.createColumn(function, functionArguments, alias);
-                    columns.add(column);
-                }
-            }
-        }
-
-        CommonTree columnsNode = (CommonTree) queryNode.getFirstChildWithType(CMISParser.COLUMNS);
-        if (columnsNode != null)
-        {
-            for (CommonTree columnNode : (List<CommonTree>) columnsNode.getChildren())
-            {
-                if (columnNode.getType() == CMISParser.ALL_COLUMNS)
-                {
-                    String qualifier = columnNode.getChild(0).getText();
-                    Selector selector = selectors.get(qualifier);
-                    if (selector == null)
-                    {
-                        if ((qualifier.equals("")) && (selectors.size() == 1))
-                        {
-                            selector = selectors.get(selectors.keySet().iterator().next());
-                        } else
-                        {
-                            throw new CmisInvalidArgumentException("No selector for " + qualifier + " in " + qualifier
-                                    + ".*");
-                        }
-                    }
-
-                    TypeDefinitionWrapper typeDef = cmisDictionaryService.findTypeForClass(selector.getType(),
-                            validScopes);
-                    if (typeDef == null)
-                    {
-                        throw new CmisInvalidArgumentException("Type unsupported in CMIS queries: "
-                                + selector.getAlias());
-                    }
-                    Collection<PropertyDefintionWrapper> propDefs = typeDef.getProperties();
-                    for (PropertyDefintionWrapper definition : propDefs)
-                    {
-                        Function function = factory.getFunction(PropertyAccessor.NAME);
-                        Argument arg = factory.createPropertyArgument(PropertyAccessor.ARG_PROPERTY, definition
-                                .getPropertyDefinition().isQueryable(), definition.getPropertyDefinition()
-                                .isOrderable(), selector.getAlias(), definition.getPropertyId());
-                        Map<String, Argument> functionArguments = new LinkedHashMap<String, Argument>();
-                        functionArguments.put(arg.getName(), arg);
-                        String alias = (selector.getAlias().length() > 0) ? selector.getAlias() + "."
-                                + definition.getPropertyId() : definition.getPropertyId();
-                        Column column = factory.createColumn(function, functionArguments, alias);
-                        columns.add(column);
-                    }
-                }
-
-                if (columnNode.getType() == CMISParser.COLUMN)
-                {
-                    CommonTree columnRefNode = (CommonTree) columnNode.getFirstChildWithType(CMISParser.COLUMN_REF);
-                    if (columnRefNode != null)
-                    {
-                        String columnName = columnRefNode.getChild(0).getText();
-                        String qualifier = "";
-                        if (columnRefNode.getChildCount() > 1)
-                        {
-                            qualifier = columnRefNode.getChild(1).getText();
-                        }
-                        Selector selector = selectors.get(qualifier);
-                        if (selector == null)
-                        {
-                            if ((qualifier.equals("")) && (selectors.size() == 1))
-                            {
-                                selector = selectors.get(selectors.keySet().iterator().next());
-                            } else
-                            {
-                                throw new CmisInvalidArgumentException("No selector for " + qualifier);
-                            }
-                        }
-
-                        TypeDefinitionWrapper typeDef = cmisDictionaryService.findTypeForClass(selector.getType(),
-                                validScopes);
-                        if (typeDef == null)
-                        {
-                            throw new CmisInvalidArgumentException("Type unsupported in CMIS queries: "
-                                    + selector.getAlias());
-                        }
-                        PropertyDefintionWrapper propDef = cmisDictionaryService.findPropertyByQueryName(columnName);
-                        if (propDef == null)
-                        {
-                            throw new CmisInvalidArgumentException("Invalid column for "
-                                    + typeDef.getTypeDefinition(false).getQueryName() + " " + columnName);
-                        }
-
-                        // Check column/property applies to selector/type
-
-                        if (typeDef.getPropertyById(propDef.getPropertyId()) == null)
-                        {
-                            throw new CmisInvalidArgumentException("Invalid column for "
-                                    + typeDef.getTypeDefinition(false).getQueryName() + "." + columnName);
-                        }
-
-                        Function function = factory.getFunction(PropertyAccessor.NAME);
-                        Argument arg = factory.createPropertyArgument(PropertyAccessor.ARG_PROPERTY, propDef
-                                .getPropertyDefinition().isQueryable(), propDef.getPropertyDefinition().isOrderable(),
-                                selector.getAlias(), propDef.getPropertyId());
-                        Map<String, Argument> functionArguments = new LinkedHashMap<String, Argument>();
-                        functionArguments.put(arg.getName(), arg);
-
-                        String alias = (selector.getAlias().length() > 0) ? selector.getAlias() + "."
-                                + propDef.getPropertyId() : propDef.getPropertyId();
-                        if (columnNode.getChildCount() > 1)
-                        {
-                            alias = columnNode.getChild(1).getText();
-                        }
-
-                        Column column = factory.createColumn(function, functionArguments, alias);
-                        columns.add(column);
-
-                    }
-
-                    CommonTree functionNode = (CommonTree) columnNode.getFirstChildWithType(CMISParser.FUNCTION);
-                    if (functionNode != null)
-                    {
-                        CommonTree functionNameNode = (CommonTree) functionNode.getChild(0);
-                        Function function = factory.getFunction(functionNameNode.getText());
-                        if (function == null)
-                        {
-                            throw new CmisInvalidArgumentException("Unknown function: " + functionNameNode.getText());
-                        }
-                        Collection<ArgumentDefinition> definitions = function.getArgumentDefinitions().values();
-                        Map<String, Argument> functionArguments = new LinkedHashMap<String, Argument>();
-
-                        int childIndex = 2;
-                        for (ArgumentDefinition definition : definitions)
-                        {
-                            if (functionNode.getChildCount() > childIndex + 1)
-                            {
-                                CommonTree argNode = (CommonTree) functionNode.getChild(childIndex++);
-                                Argument arg = getFunctionArgument(argNode, definition, factory, selectors, null,
-                                        function.getName().equals(Like.NAME));
-                                functionArguments.put(arg.getName(), arg);
-                            } else
-                            {
-                                if (definition.isMandatory())
-                                {
-                                    // throw new
-                                    // CmisInvalidArgumentException("Insufficient
-                                    // aruments
-                                    // for function " +
-                                    // ((CommonTree)
-                                    // functionNode.getChild(0)).getText() );
-                                    break;
-                                } else
-                                {
-                                    // ok
-                                }
-                            }
-                        }
-
-                        CommonTree rparenNode = (CommonTree) functionNode.getChild(functionNode.getChildCount() - 1);
-
-                        int start = getStringPosition(query, functionNode.getLine(),
-                                functionNode.getCharPositionInLine());
-                        int end = getStringPosition(query, rparenNode.getLine(), rparenNode.getCharPositionInLine());
-
-                        if (function.getName().equals(Score.NAME))
-                        {
-                            hasScore = true;
-                        }
-
-                        String alias;
-                        if (function.getName().equals(Score.NAME))
-                        {
-                            alias = "SEARCH_SCORE";
-                            // check no args
-                            if (functionNode.getChildCount() > 3)
-                            {
-                                throw new CmisInvalidArgumentException(
-                                        "The function SCORE() is not allowed any arguments");
-                            }
-                        } else
-                        {
-                            alias = query.substring(start, end + 1);
-                        }
-                        if (columnNode.getChildCount() > 1)
-                        {
-                            alias = columnNode.getChild(1).getText();
-                        }
-
-                        Column column = factory.createColumn(function, functionArguments, alias);
-                        columns.add(column);
-                    }
-                }
-            }
-        }
-
-        return columns;
-    }
-
-    /**
-     * @param query
-     * @param line
-     * @param charPositionInLine
-     * @return
-     */
-    private int getStringPosition(String query, int line, int charPositionInLine)
-    {
-        StringTokenizer tokenizer = new StringTokenizer(query, "\n\r\f");
-        String[] lines = new String[tokenizer.countTokens()];
-        int i = 0;
-        while (tokenizer.hasMoreElements())
-        {
-            lines[i++] = tokenizer.nextToken();
-        }
-
-        int position = 0;
-        for (i = 0; i < line - 1; i++)
-        {
-            position += lines[i].length();
-            position++;
-        }
-        return position + charPositionInLine;
-    }
-
-    private Argument getFunctionArgument(CommonTree argNode, ArgumentDefinition definition, QueryModelFactory factory,
-            Map<String, Selector> selectors, Map<String, Column> columnMap, boolean inLike)
-    {
-        if (argNode.getType() == CMISParser.COLUMN_REF)
-        {
-            PropertyArgument arg = buildColumnReference(definition.getName(), argNode, factory, selectors, columnMap);
-            if (!arg.isQueryable())
-            {
-                throw new CmisInvalidArgumentException("Column refers to unqueryable property " + arg.getPropertyName());
-            }
-            if (!selectors.containsKey(arg.getSelector()))
-            {
-                throw new CmisInvalidArgumentException("No table with alias " + arg.getSelector());
-            }
-            return arg;
-        } else if (argNode.getType() == CMISParser.ID)
-        {
-            String id = argNode.getText();
-            if (selectors.containsKey(id))
-            {
-                SelectorArgument arg = factory.createSelectorArgument(definition.getName(), id);
-                if (!arg.isQueryable())
-                {
-                    throw new CmisInvalidArgumentException("Selector is not queryable " + arg.getSelector());
-                }
-                return arg;
-            } else
-            {
-                PropertyDefintionWrapper propDef = cmisDictionaryService.findPropertyByQueryName(id);
-                if (propDef == null || !propDef.getPropertyDefinition().isQueryable())
-                {
-                    throw new CmisInvalidArgumentException("Column refers to unqueryable property "
-                            + definition.getName());
-                }
-                PropertyArgument arg = factory.createPropertyArgument(definition.getName(), propDef
-                        .getPropertyDefinition().isQueryable(), propDef.getPropertyDefinition().isOrderable(), "",
-                        propDef.getPropertyId());
-                return arg;
-            }
-        } else if (argNode.getType() == CMISParser.PARAMETER)
-        {
-            ParameterArgument arg = factory.createParameterArgument(definition.getName(), argNode.getText());
-            if (!arg.isQueryable())
-            {
-                throw new CmisInvalidArgumentException("Parameter is not queryable " + arg.getParameterName());
-            }
-            return arg;
-        } else if (argNode.getType() == CMISParser.NUMERIC_LITERAL)
-        {
-            CommonTree literalNode = (CommonTree) argNode.getChild(0);
-            if (literalNode.getType() == CMISParser.FLOATING_POINT_LITERAL)
-            {
-                QName type = DataTypeDefinition.DOUBLE;
-                Number value = Double.parseDouble(literalNode.getText());
-                if (value.floatValue() == value.doubleValue())
-                {
-                    type = DataTypeDefinition.FLOAT;
-                    value = Float.valueOf(value.floatValue());
-                }
-                LiteralArgument arg = factory.createLiteralArgument(definition.getName(), type, value);
-                return arg;
-            } else if (literalNode.getType() == CMISParser.DECIMAL_INTEGER_LITERAL)
-            {
-                QName type = DataTypeDefinition.LONG;
-                Number value = Long.parseLong(literalNode.getText());
-                if (value.intValue() == value.longValue())
-                {
-                    type = DataTypeDefinition.INT;
-                    value = Integer.valueOf(value.intValue());
-                }
-                LiteralArgument arg = factory.createLiteralArgument(definition.getName(), type, value);
-                return arg;
-            } else
-            {
-                throw new CmisInvalidArgumentException("Invalid numeric literal " + literalNode.getText());
-            }
-        } else if (argNode.getType() == CMISParser.STRING_LITERAL)
-        {
-            String text = argNode.getChild(0).getText();
-            text = text.substring(1, text.length() - 1);
-            text = unescape(text, inLike ? EscapeMode.LIKE : EscapeMode.LITERAL);
-            LiteralArgument arg = factory.createLiteralArgument(definition.getName(), DataTypeDefinition.TEXT, text);
-            return arg;
-        } else if (argNode.getType() == CMISParser.DATETIME_LITERAL)
-        {
-            String text = argNode.getChild(0).getText();
-            text = text.substring(1, text.length() - 1);
-            StringBuilder builder = new StringBuilder();
-            if (text.endsWith("Z"))
-            {
-                builder.append(text.substring(0, text.length() - 1));
-                builder.append("+0000");
-            } else
-            {
-                if (text.charAt(text.length() - 3) != ':')
-                {
-                    throw new CmisInvalidArgumentException("Invalid datetime literal " + text);
-                }
-                // remove TZ colon ....
-                builder.append(text.substring(0, text.length() - 3));
-                builder.append(text.substring(text.length() - 2, text.length()));
-            }
-            text = builder.toString();
-
-            SimpleDateFormat df = CachingDateFormat.getCmisSqlDatetimeFormat();
-            Date date;
-            try
-            {
-                date = df.parse(text);
-            } catch (ParseException e)
-            {
-                throw new CmisInvalidArgumentException("Invalid datetime literal " + text);
-            }
-            // Convert back :-)
-            String alfrescoDate = DefaultTypeConverter.INSTANCE.convert(String.class, date);
-            LiteralArgument arg = factory.createLiteralArgument(definition.getName(), DataTypeDefinition.TEXT,
-                    alfrescoDate);
-            return arg;
-        } else if (argNode.getType() == CMISParser.BOOLEAN_LITERAL)
-        {
-            String text = argNode.getChild(0).getText();
-            if (text.equalsIgnoreCase("TRUE") || text.equalsIgnoreCase("FALSE"))
-            {
-                LiteralArgument arg = factory
-                        .createLiteralArgument(definition.getName(), DataTypeDefinition.TEXT, text);
-                return arg;
-            } else
-            {
-                throw new CmisInvalidArgumentException("Invalid boolean literal " + text);
-            }
-
-        } else if (argNode.getType() == CMISParser.LIST)
-        {
-            ArrayList<Argument> arguments = new ArrayList<Argument>();
-            for (int i = 0; i < argNode.getChildCount(); i++)
-            {
-                CommonTree arg = (CommonTree) argNode.getChild(i);
-                arguments.add(getFunctionArgument(arg, definition, factory, selectors, columnMap, inLike));
-            }
-            ListArgument arg = factory.createListArgument(definition.getName(), arguments);
-            if (!arg.isQueryable())
-            {
-                throw new CmisInvalidArgumentException("Not all members of the list are queryable");
-            }
-            return arg;
-        } else if (argNode.getType() == CMISParser.ANY)
-        {
-            LiteralArgument arg = factory.createLiteralArgument(definition.getName(), DataTypeDefinition.TEXT,
-                    argNode.getText());
-            return arg;
-        } else if (argNode.getType() == CMISParser.SINGLE_VALUED_PROPERTY)
-        {
-            LiteralArgument arg = factory.createLiteralArgument(definition.getName(), DataTypeDefinition.TEXT,
-                    argNode.getText());
-            return arg;
-        } else if (argNode.getType() == CMISParser.NOT)
-        {
-            LiteralArgument arg = factory.createLiteralArgument(definition.getName(), DataTypeDefinition.TEXT,
-                    argNode.getText());
-            return arg;
-        } else if (argNode.getType() == CMISParser.FUNCTION)
-        {
-            CommonTree functionNameNode = (CommonTree) argNode.getChild(0);
-            Function function = factory.getFunction(functionNameNode.getText());
-            if (function == null)
-            {
-                throw new CmisInvalidArgumentException("Unknown function: " + functionNameNode.getText());
-            }
-            Collection<ArgumentDefinition> definitions = function.getArgumentDefinitions().values();
-            Map<String, Argument> functionArguments = new LinkedHashMap<String, Argument>();
-
-            int childIndex = 2;
-            for (ArgumentDefinition currentDefinition : definitions)
-            {
-                if (argNode.getChildCount() > childIndex + 1)
-                {
-                    CommonTree currentArgNode = (CommonTree) argNode.getChild(childIndex++);
-                    Argument arg = getFunctionArgument(currentArgNode, currentDefinition, factory, selectors,
-                            columnMap, inLike);
-                    functionArguments.put(arg.getName(), arg);
-                } else
-                {
-                    if (definition.isMandatory())
-                    {
-                        // throw new CmisInvalidArgumentException("Insufficient
-                        // aruments
-                        // for function " + ((CommonTree)
-                        // functionNode.getChild(0)).getText() );
-                        break;
-                    } else
-                    {
-                        // ok
-                    }
-                }
-            }
-            FunctionArgument arg = factory.createFunctionArgument(definition.getName(), function, functionArguments);
-            if (!arg.isQueryable())
-            {
-                throw new CmisInvalidArgumentException("Not all function arguments refer to orderable arguments: "
-                        + arg.getFunction().getName());
-            }
-            return arg;
-        } else
-        {
-            throw new CmisInvalidArgumentException("Invalid function argument " + argNode.getText());
-        }
-    }
-
-    @SuppressWarnings("unchecked")
-    private Source buildSource(CommonTree source, CapabilityJoin joinSupport, QueryModelFactory factory)
-    {
-        if (source.getChildCount() == 1)
-        {
-            // single table reference
-            CommonTree singleTableNode = (CommonTree) source.getChild(0);
-            if (singleTableNode.getType() == CMISParser.TABLE)
-            {
-                if (joinSupport == CapabilityJoin.NONE)
-                {
-                    throw new UnsupportedOperationException("Joins are not supported");
-                }
-                CommonTree tableSourceNode = (CommonTree) singleTableNode.getFirstChildWithType(CMISParser.SOURCE);
-                return buildSource(tableSourceNode, joinSupport, factory);
-
-            }
-            if (singleTableNode.getType() != CMISParser.TABLE_REF)
-            {
-                throw new CmisInvalidArgumentException("Expecting TABLE_REF token but found "
-                        + singleTableNode.getText());
-            }
-            String tableName = singleTableNode.getChild(0).getText();
-            String alias = "";
-            if (singleTableNode.getChildCount() > 1)
-            {
-                alias = singleTableNode.getChild(1).getText();
-            }
-
-            TypeDefinitionWrapper typeDef = cmisDictionaryService.findTypeByQueryName(tableName);
-            if (typeDef == null)
-            {
-                throw new CmisInvalidArgumentException("Type is unsupported in query: " + tableName);
-            }
-            if (typeDef.getBaseTypeId() != BaseTypeId.CMIS_POLICY)
-            {
-                if (!typeDef.getTypeDefinition(false).isQueryable())
-                {
-                    throw new CmisInvalidArgumentException("Type is not queryable " + tableName + " -> "
-                            + typeDef.getTypeId());
-                }
-            }
-            return factory.createSelector(typeDef.getAlfrescoClass(), alias);
-        } else
-        {
-            if (joinSupport == CapabilityJoin.NONE)
-            {
-                throw new UnsupportedOperationException("Joins are not supported");
-            }
-            CommonTree singleTableNode = (CommonTree) source.getChild(0);
-            if (singleTableNode.getType() != CMISParser.TABLE_REF)
-            {
-                throw new CmisInvalidArgumentException("Expecting TABLE_REF token but found "
-                        + singleTableNode.getText());
-            }
-            String tableName = singleTableNode.getChild(0).getText();
-            String alias = "";
-            if (singleTableNode.getChildCount() == 2)
-            {
-                alias = singleTableNode.getChild(1).getText();
-            }
-            TypeDefinitionWrapper typeDef = cmisDictionaryService.findTypeByQueryName(tableName);
-            if (typeDef == null)
-            {
-                throw new CmisInvalidArgumentException("Type is unsupported in query " + tableName);
-            }
-            if (typeDef.getBaseTypeId() != BaseTypeId.CMIS_POLICY)
-            {
-                if (!typeDef.getTypeDefinition(false).isQueryable())
-                {
-                    throw new CmisInvalidArgumentException("Type is not queryable " + tableName + " -> "
-                            + typeDef.getTypeId());
-                }
-            }
-
-            Source lhs = factory.createSelector(typeDef.getAlfrescoClass(), alias);
-
-            List<CommonTree> list = (List<CommonTree>) (source.getChildren());
-            for (CommonTree joinNode : list)
-            {
-                if (joinNode.getType() == CMISParser.JOIN)
-                {
-                    CommonTree rhsSource = (CommonTree) joinNode.getFirstChildWithType(CMISParser.SOURCE);
-                    Source rhs = buildSource(rhsSource, joinSupport, factory);
-
-                    JoinType joinType = JoinType.INNER;
-                    CommonTree joinTypeNode = (CommonTree) joinNode.getFirstChildWithType(CMISParser.LEFT);
-                    if (joinTypeNode != null)
-                    {
-                        joinType = JoinType.LEFT;
-                    }
-
-                    if ((joinType == JoinType.LEFT) && (joinSupport == CapabilityJoin.INNERONLY))
-                    {
-                        throw new UnsupportedOperationException("Outer joins are not supported");
-                    }
-
-                    Constraint joinCondition = null;
-                    CommonTree joinConditionNode = (CommonTree) joinNode.getFirstChildWithType(CMISParser.ON);
-                    if (joinConditionNode != null)
-                    {
-                        PropertyArgument arg1 = buildColumnReference(Equals.ARG_LHS,
-                                (CommonTree) joinConditionNode.getChild(0), factory, null, null);
-                        if (!lhs.getSelectors().containsKey(arg1.getSelector())
-                                && !rhs.getSelectors().containsKey(arg1.getSelector()))
-                        {
-                            throw new CmisInvalidArgumentException("No table with alias " + arg1.getSelector());
-                        }
-                        CommonTree functionNameNode = (CommonTree) joinConditionNode.getChild(1);
-                        if (functionNameNode.getType() != CMISParser.EQUALS)
-                        {
-                            throw new CmisInvalidArgumentException("Only Equi-join is supported "
-                                    + functionNameNode.getText());
-                        }
-                        Function function = factory.getFunction(Equals.NAME);
-                        if (function == null)
-                        {
-                            throw new CmisInvalidArgumentException("Unknown function: " + functionNameNode.getText());
-                        }
-                        PropertyArgument arg2 = buildColumnReference(Equals.ARG_RHS,
-                                (CommonTree) joinConditionNode.getChild(2), factory, null, null);
-                        if (!lhs.getSelectors().containsKey(arg2.getSelector())
-                                && !rhs.getSelectors().containsKey(arg2.getSelector()))
-                        {
-                            throw new CmisInvalidArgumentException("No table with alias " + arg2.getSelector());
-                        }
-                        Map<String, Argument> functionArguments = new LinkedHashMap<String, Argument>();
-                        functionArguments.put(arg1.getName(), arg1);
-                        functionArguments.put(arg2.getName(), arg2);
-                        joinCondition = factory.createFunctionalConstraint(function, functionArguments);
-                    }
-
-                    Source join = factory.createJoin(lhs, rhs, joinType, joinCondition);
-                    lhs = join;
-                }
-            }
-
-            return lhs;
-
-        }
-    }
-
-    public PropertyArgument buildColumnReference(String argumentName, CommonTree columnReferenceNode,
-            QueryModelFactory factory, Map<String, Selector> selectors, Map<String, Column> columnMap)
-    {
-        String cmisPropertyName = columnReferenceNode.getChild(0).getText();
-        String qualifier = "";
-        if (columnReferenceNode.getChildCount() > 1)
-        {
-            qualifier = columnReferenceNode.getChild(1).getText();
-        }
-
-        if ((qualifier == "") && (columnMap != null))
-        {
-            Column column = columnMap.get(cmisPropertyName);
-            if (column != null)
-            {
-                // check for function type
-                if (column.getFunction().getName().equals(PropertyAccessor.NAME))
-                {
-                    PropertyArgument arg = (PropertyArgument) column.getFunctionArguments().get(
-                            PropertyAccessor.ARG_PROPERTY);
-                    cmisPropertyName = arg.getPropertyName();
-                    qualifier = arg.getSelector();
-                } else
-                {
-                    // TODO: should be able to return non property arguments
-                    // The implementation should throw out what it can not
-                    // support at build time.
-                    throw new CmisInvalidArgumentException(
-                            "Complex column reference unsupported (only direct column references are currently supported) "
-                                    + cmisPropertyName);
-                }
-            }
-        }
-
-        PropertyDefintionWrapper propDef = cmisDictionaryService.findPropertyByQueryName(cmisPropertyName);
-        if (propDef == null)
-        {
-            throw new CmisInvalidArgumentException("Unknown column/property " + cmisPropertyName);
-        }
-
-        if (selectors != null)
-        {
-            Selector selector = selectors.get(qualifier);
-            if (selector == null)
-            {
-                if ((qualifier.equals("")) && (selectors.size() == 1))
-                {
-                    selector = selectors.get(selectors.keySet().iterator().next());
-                } else
-                {
-                    throw new CmisInvalidArgumentException("No selector for " + qualifier);
-                }
-            }
-
-            TypeDefinitionWrapper typeDef = cmisDictionaryService.findTypeForClass(selector.getType(), validScopes);
-            if (typeDef == null)
-            {
-                throw new CmisInvalidArgumentException("Type unsupported in CMIS queries: " + selector.getAlias());
-            }
-
-            // Check column/property applies to selector/type
-
-            if (typeDef.getPropertyById(propDef.getPropertyId()) == null)
-            {
-                throw new CmisInvalidArgumentException("Invalid column for "
-                        + typeDef.getTypeDefinition(false).getQueryName() + "." + cmisPropertyName);
-            }
-        }
-
-        if (options.getQueryMode() == CMISQueryMode.CMS_STRICT)
-        {
-            if (!propDef.getPropertyDefinition().isQueryable())
-            {
-                throw new CmisInvalidArgumentException("Column is not queryable " + qualifier + "." + cmisPropertyName);
-            }
-        }
-        return factory.createPropertyArgument(argumentName, propDef.getPropertyDefinition().isQueryable(), propDef
-                .getPropertyDefinition().isOrderable(), qualifier, propDef.getPropertyId());
-    }
-
-    private String unescape(String string, EscapeMode mode)
-    {
-        StringBuilder builder = new StringBuilder(string.length());
-
-        boolean lastWasEscape = false;
-
-        for (int i = 0; i < string.length(); i++)
-        {
-            char c = string.charAt(i);
-            if (lastWasEscape)
-            {
-
-                // Need to keep escaping for like as we have the same escaping
-                if (mode == EscapeMode.LIKE)
-                {
-                    // Like does its own escaping - so pass through \ % and _
-                    if (c == '\'')
-                    {
-                        builder.append(c);
-                    } else if (c == '%')
-                    {
-                        builder.append('\\');
-                        builder.append(c);
-                    } else if (c == '_')
-                    {
-                        builder.append('\\');
-                        builder.append(c);
-                    } else if (c == '\\')
-                    {
-                        builder.append('\\');
-                        builder.append(c);
-                    } else
-                    {
-                        throw new UnsupportedOperationException("Unsupported escape pattern in <" + string
-                                + "> at position " + i);
-                    }
-                } else if (mode == EscapeMode.CONTAINS)
-                {
-                    if (options.getQueryMode() == CMISQueryMode.CMS_STRICT)
-                    {
-                        if (c == '\'')
-                        {
-                            builder.append(c);
-                        } else if (c == '\\')
-                        {
-                            builder.append('\\');
-                            builder.append(c);
-                        }
-
-                        else
-                        {
-                            throw new UnsupportedOperationException("Unsupported escape pattern in <" + string
-                                    + "> at position " + i);
-                        }
-                    } else
-                    {
-                        if (c == '\'')
-                        {
-                            builder.append(c);
-                        } else
-                        {
-                            builder.append(c);
-                        }
-                    }
-                } else if (mode == EscapeMode.LITERAL)
-                {
-                    if (c == '\'')
-                    {
-                        builder.append(c);
-                    } else if (c == '\\')
-                    {
-                        builder.append(c);
-                    } else
-                    {
-                        throw new UnsupportedOperationException("Unsupported escape pattern in <" + string
-                                + "> at position " + i);
-
-                    }
-                } else
-                {
-                    throw new UnsupportedOperationException("Unsupported escape pattern in <" + string
-                            + "> at position " + i);
-
-                }
-                lastWasEscape = false;
-            } else
-            {
-                if (c == '\\')
-                {
-                    lastWasEscape = true;
-                } else
-                {
-                    builder.append(c);
-                }
-            }
-        }
-        if (lastWasEscape)
-        {
-            throw new FTSQueryException("Escape character at end of string " + string);
-        }
-
-        return builder.toString();
-    }
-}
diff --git a/source/java/org/alfresco/opencmis/search/CmisFunctionEvaluationContext.java b/source/java/org/alfresco/opencmis/search/CmisFunctionEvaluationContext.java
deleted file mode 100644
index 344052f420..0000000000
--- a/source/java/org/alfresco/opencmis/search/CmisFunctionEvaluationContext.java
+++ /dev/null
@@ -1,429 +0,0 @@
-/*
- * Copyright (C) 2005-2010 Alfresco Software Limited.
- *
- * This file is part of Alfresco
- *
- * Alfresco is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Alfresco is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
- */
-package org.alfresco.opencmis.search;
-
-import java.io.Serializable;
-import java.util.Collection;
-import java.util.Map;
-
-import org.alfresco.cmis.CMISDictionaryModel;
-import org.alfresco.opencmis.dictionary.CMISDictionaryService;
-import org.alfresco.opencmis.dictionary.PropertyDefintionWrapper;
-import org.alfresco.opencmis.dictionary.TypeDefinitionWrapper;
-import org.alfresco.repo.search.impl.lucene.LuceneFunction;
-import org.alfresco.repo.search.impl.lucene.LuceneQueryParser;
-import org.alfresco.repo.search.impl.querymodel.FunctionArgument;
-import org.alfresco.repo.search.impl.querymodel.FunctionEvaluationContext;
-import org.alfresco.repo.search.impl.querymodel.PredicateMode;
-import org.alfresco.repo.search.impl.querymodel.QueryModelException;
-import org.alfresco.repo.search.impl.querymodel.Selector;
-import org.alfresco.repo.search.impl.querymodel.impl.functions.Lower;
-import org.alfresco.repo.search.impl.querymodel.impl.functions.Upper;
-import org.alfresco.service.cmr.repository.NodeRef;
-import org.alfresco.service.cmr.repository.NodeService;
-import org.apache.chemistry.opencmis.commons.enums.BaseTypeId;
-import org.apache.chemistry.opencmis.commons.enums.Cardinality;
-import org.apache.chemistry.opencmis.commons.exceptions.CmisInvalidArgumentException;
-import org.apache.lucene.queryParser.ParseException;
-import org.apache.lucene.search.Query;
-
-/**
- * @author andyh
- */
-public class CmisFunctionEvaluationContext implements FunctionEvaluationContext
-{
-    public static BaseTypeId[] STRICT_SCOPES = new BaseTypeId[] { BaseTypeId.CMIS_DOCUMENT, BaseTypeId.CMIS_FOLDER };
-
-    public static BaseTypeId[] ALFRESCO_SCOPES = new BaseTypeId[] { BaseTypeId.CMIS_DOCUMENT, BaseTypeId.CMIS_FOLDER,
-            BaseTypeId.CMIS_POLICY };
-
-    private Map<String, NodeRef> nodeRefs;
-
-    private Map<String, Float> scores;
-
-    private NodeService nodeService;
-
-    private CMISDictionaryService cmisDictionaryService;
-
-    private BaseTypeId[] validScopes;
-
-    private Float score;
-
-    /**
-     * @param nodeRefs
-     *            the nodeRefs to set
-     */
-    public void setNodeRefs(Map<String, NodeRef> nodeRefs)
-    {
-        this.nodeRefs = nodeRefs;
-    }
-
-    /**
-     * @param scores
-     *            the scores to set
-     */
-    public void setScores(Map<String, Float> scores)
-    {
-        this.scores = scores;
-    }
-
-    /**
-     * @param nodeService
-     *            the nodeService to set
-     */
-    public void setNodeService(NodeService nodeService)
-    {
-        this.nodeService = nodeService;
-    }
-
-    /**
-     * @param cmisDictionaryService
-     *            the cmisDictionaryService to set
-     */
-    public void setCmisDictionaryService(CMISDictionaryService cmisDictionaryService)
-    {
-        this.cmisDictionaryService = cmisDictionaryService;
-    }
-
-    /**
-     * @param validScopes
-     *            the valid scopes to set
-     */
-    public void setValidScopes(BaseTypeId[] validScopes)
-    {
-        this.validScopes = validScopes;
-    }
-
-    /*
-     * (non-Javadoc)
-     * 
-     * @see org.alfresco.repo.search.impl.querymodel.FunctionEvaluationContext#
-     * getNodeRefs()
-     */
-    public Map<String, NodeRef> getNodeRefs()
-    {
-        return nodeRefs;
-    }
-
-    /*
-     * (non-Javadoc)
-     * 
-     * @see org.alfresco.repo.search.impl.querymodel.FunctionEvaluationContext#
-     * getNodeService()
-     */
-    public NodeService getNodeService()
-    {
-        return nodeService;
-    }
-
-    /*
-     * (non-Javadoc)
-     * 
-     * @see org.alfresco.repo.search.impl.querymodel.FunctionEvaluationContext#
-     * getProperty(org.alfresco.service.cmr.repository.NodeRef,
-     * org.alfresco.service.namespace.QName)
-     */
-    public Serializable getProperty(NodeRef nodeRef, String propertyName)
-    {
-        PropertyDefintionWrapper propertyDef = cmisDictionaryService.findProperty(propertyName);
-        return propertyDef.getPropertyAccessor().getValue(nodeRef);
-    }
-
-    /*
-     * (non-Javadoc)
-     * 
-     * @see
-     * org.alfresco.repo.search.impl.querymodel.FunctionEvaluationContext#getScores
-     * ()
-     */
-    public Map<String, Float> getScores()
-    {
-        return scores;
-    }
-
-    /**
-     * @return the score
-     */
-    public Float getScore()
-    {
-        return score;
-    }
-
-    /**
-     * @param score
-     *            the score to set
-     */
-    public void setScore(Float score)
-    {
-        this.score = score;
-    }
-
-    public Query buildLuceneEquality(LuceneQueryParser lqp, String propertyName, Serializable value,
-            PredicateMode mode, LuceneFunction luceneFunction) throws ParseException
-    {
-        PropertyDefintionWrapper propertyDef = cmisDictionaryService.findProperty(propertyName);
-        return propertyDef.getPropertyLuceneBuilder().buildLuceneEquality(lqp, value, mode, luceneFunction);
-    }
-
-    /*
-     * (non-Javadoc)
-     * 
-     * @see org.alfresco.repo.search.impl.querymodel.FunctionEvaluationContext#
-     * buildLuceneExists(org.alfresco.repo.search.impl.lucene.LuceneQueryParser,
-     * org.alfresco.service.namespace.QName, java.lang.Boolean)
-     */
-    public Query buildLuceneExists(LuceneQueryParser lqp, String propertyName, Boolean not) throws ParseException
-    {
-        PropertyDefintionWrapper propertyDef = cmisDictionaryService.findProperty(propertyName);
-        return propertyDef.getPropertyLuceneBuilder().buildLuceneExists(lqp, not);
-    }
-
-    /*
-     * (non-Javadoc)
-     * 
-     * @see org.alfresco.repo.search.impl.querymodel.FunctionEvaluationContext#
-     * buildLuceneGreaterThan
-     * (org.alfresco.repo.search.impl.lucene.LuceneQueryParser,
-     * org.alfresco.service.namespace.QName, java.io.Serializable,
-     * org.alfresco.repo.search.impl.querymodel.PredicateMode)
-     */
-    public Query buildLuceneGreaterThan(LuceneQueryParser lqp, String propertyName, Serializable value,
-            PredicateMode mode, LuceneFunction luceneFunction) throws ParseException
-    {
-        PropertyDefintionWrapper propertyDef = cmisDictionaryService.findProperty(propertyName);
-        return propertyDef.getPropertyLuceneBuilder().buildLuceneGreaterThan(lqp, value, mode, luceneFunction);
-    }
-
-    /*
-     * (non-Javadoc)
-     * 
-     * @see org.alfresco.repo.search.impl.querymodel.FunctionEvaluationContext#
-     * buildLuceneGreaterThanOrEquals
-     * (org.alfresco.repo.search.impl.lucene.LuceneQueryParser,
-     * org.alfresco.service.namespace.QName, java.io.Serializable,
-     * org.alfresco.repo.search.impl.querymodel.PredicateMode)
-     */
-    public Query buildLuceneGreaterThanOrEquals(LuceneQueryParser lqp, String propertyName, Serializable value,
-            PredicateMode mode, LuceneFunction luceneFunction) throws ParseException
-    {
-        PropertyDefintionWrapper propertyDef = cmisDictionaryService.findProperty(propertyName);
-        return propertyDef.getPropertyLuceneBuilder().buildLuceneGreaterThanOrEquals(lqp, value, mode, luceneFunction);
-    }
-
-    /*
-     * (non-Javadoc)
-     * 
-     * @see org.alfresco.repo.search.impl.querymodel.FunctionEvaluationContext#
-     * buildLuceneIn(org.alfresco.repo.search.impl.lucene.LuceneQueryParser,
-     * org.alfresco.service.namespace.QName, java.util.Collection,
-     * java.lang.Boolean,
-     * org.alfresco.repo.search.impl.querymodel.PredicateMode)
-     */
-    public Query buildLuceneIn(LuceneQueryParser lqp, String propertyName, Collection<Serializable> values,
-            Boolean not, PredicateMode mode) throws ParseException
-    {
-        PropertyDefintionWrapper propertyDef = cmisDictionaryService.findProperty(propertyName);
-        return propertyDef.getPropertyLuceneBuilder().buildLuceneIn(lqp, values, not, mode);
-    }
-
-    /*
-     * (non-Javadoc)
-     * 
-     * @see org.alfresco.repo.search.impl.querymodel.FunctionEvaluationContext#
-     * buildLuceneInequality
-     * (org.alfresco.repo.search.impl.lucene.LuceneQueryParser,
-     * org.alfresco.service.namespace.QName, java.io.Serializable,
-     * org.alfresco.repo.search.impl.querymodel.PredicateMode)
-     */
-    public Query buildLuceneInequality(LuceneQueryParser lqp, String propertyName, Serializable value,
-            PredicateMode mode, LuceneFunction luceneFunction) throws ParseException
-    {
-        PropertyDefintionWrapper propertyDef = cmisDictionaryService.findProperty(propertyName);
-        return propertyDef.getPropertyLuceneBuilder().buildLuceneInequality(lqp, value, mode, luceneFunction);
-    }
-
-    /*
-     * (non-Javadoc)
-     * 
-     * @see org.alfresco.repo.search.impl.querymodel.FunctionEvaluationContext#
-     * buildLuceneLessThan
-     * (org.alfresco.repo.search.impl.lucene.LuceneQueryParser,
-     * org.alfresco.service.namespace.QName, java.io.Serializable,
-     * org.alfresco.repo.search.impl.querymodel.PredicateMode)
-     */
-    public Query buildLuceneLessThan(LuceneQueryParser lqp, String propertyName, Serializable value,
-            PredicateMode mode, LuceneFunction luceneFunction) throws ParseException
-    {
-        PropertyDefintionWrapper propertyDef = cmisDictionaryService.findProperty(propertyName);
-        return propertyDef.getPropertyLuceneBuilder().buildLuceneLessThan(lqp, value, mode, luceneFunction);
-    }
-
-    /*
-     * (non-Javadoc)
-     * 
-     * @see org.alfresco.repo.search.impl.querymodel.FunctionEvaluationContext#
-     * buildLuceneLessThanOrEquals
-     * (org.alfresco.repo.search.impl.lucene.LuceneQueryParser,
-     * org.alfresco.service.namespace.QName, java.io.Serializable,
-     * org.alfresco.repo.search.impl.querymodel.PredicateMode)
-     */
-    public Query buildLuceneLessThanOrEquals(LuceneQueryParser lqp, String propertyName, Serializable value,
-            PredicateMode mode, LuceneFunction luceneFunction) throws ParseException
-    {
-        PropertyDefintionWrapper propertyDef = cmisDictionaryService.findProperty(propertyName);
-        return propertyDef.getPropertyLuceneBuilder().buildLuceneLessThanOrEquals(lqp, value, mode, luceneFunction);
-    }
-
-    /*
-     * (non-Javadoc)
-     * 
-     * @see org.alfresco.repo.search.impl.querymodel.FunctionEvaluationContext#
-     * buildLuceneLike(org.alfresco.repo.search.impl.lucene.LuceneQueryParser,
-     * org.alfresco.service.namespace.QName, java.io.Serializable,
-     * java.lang.Boolean)
-     */
-    public Query buildLuceneLike(LuceneQueryParser lqp, String propertyName, Serializable value, Boolean not)
-            throws ParseException
-    {
-        PropertyDefintionWrapper propertyDef = cmisDictionaryService.findProperty(propertyName);
-        return propertyDef.getPropertyLuceneBuilder().buildLuceneLike(lqp, value, not);
-    }
-
-    /*
-     * (non-Javadoc)
-     * 
-     * @see org.alfresco.repo.search.impl.querymodel.FunctionEvaluationContext#
-     * getLuceneSortField(org.alfresco.service.namespace.QName)
-     */
-    public String getLuceneSortField(LuceneQueryParser lqp, String propertyName)
-    {
-        PropertyDefintionWrapper propertyDef = cmisDictionaryService.findProperty(propertyName);
-        return propertyDef.getPropertyLuceneBuilder().getLuceneSortField(lqp);
-    }
-
-    public boolean isObjectId(String propertyName)
-    {
-        return CMISDictionaryModel.PROP_OBJECT_ID.equalsIgnoreCase(propertyName);
-    }
-
-    public boolean isOrderable(String fieldName)
-    {
-        PropertyDefintionWrapper propertyDef = cmisDictionaryService.findProperty(fieldName);
-        if (propertyDef == null)
-        {
-            return false;
-        } else
-        {
-            return propertyDef.getPropertyDefinition().isOrderable();
-        }
-    }
-
-    public boolean isQueryable(String fieldName)
-    {
-        PropertyDefintionWrapper propertyDef = cmisDictionaryService.findProperty(fieldName);
-        if (propertyDef == null)
-        {
-            return true;
-        } else
-        {
-            return propertyDef.getPropertyDefinition().isQueryable();
-        }
-    }
-
-    public String getLuceneFieldName(String propertyName)
-    {
-        PropertyDefintionWrapper propertyDef = cmisDictionaryService.findProperty(propertyName);
-        if (propertyDef != null)
-        {
-            return propertyDef.getPropertyLuceneBuilder().getLuceneFieldName();
-        } else
-        {
-            // TODO: restrict to supported "special" fields
-            return propertyName;
-        }
-    }
-
-    public LuceneFunction getLuceneFunction(FunctionArgument functionArgument)
-    {
-        if (functionArgument == null)
-        {
-            return LuceneFunction.FIELD;
-        } else
-        {
-            String functionName = functionArgument.getFunction().getName();
-            if (functionName.equals(Upper.NAME))
-            {
-                return LuceneFunction.UPPER;
-            } else if (functionName.equals(Lower.NAME))
-            {
-                return LuceneFunction.LOWER;
-            } else
-            {
-                throw new QueryModelException("Unsupported function: " + functionName);
-            }
-        }
-    }
-
-    /*
-     * (non-Javadoc)
-     * 
-     * @see org.alfresco.repo.search.impl.querymodel.FunctionEvaluationContext#
-     * checkFieldApplies(org.alfresco.service.namespace.QName, java.lang.String)
-     */
-    public void checkFieldApplies(Selector selector, String propertyName)
-    {
-        PropertyDefintionWrapper propDef = cmisDictionaryService.findPropertyByQueryName(propertyName);
-        if (propDef == null)
-        {
-            throw new CmisInvalidArgumentException("Unknown column/property " + propertyName);
-        }
-
-        TypeDefinitionWrapper typeDef = cmisDictionaryService.findTypeForClass(selector.getType(), validScopes);
-        if (typeDef == null)
-        {
-            throw new CmisInvalidArgumentException("Type unsupported in CMIS queries: " + selector.getAlias());
-        }
-
-        // Check column/property applies to selector/type
-
-        if (typeDef.getPropertyById(propDef.getPropertyId()) == null)
-        {
-            throw new CmisInvalidArgumentException("Invalid column for "
-                    + typeDef.getTypeDefinition(false).getQueryName() + "." + propertyName);
-        }
-
-    }
-
-    /*
-     * (non-Javadoc)
-     * 
-     * @see org.alfresco.repo.search.impl.querymodel.FunctionEvaluationContext#
-     * isMultiValued(java.lang.String)
-     */
-    public boolean isMultiValued(String propertyName)
-    {
-        PropertyDefintionWrapper propDef = cmisDictionaryService.findPropertyByQueryName(propertyName);
-        if (propDef == null)
-        {
-            throw new CmisInvalidArgumentException("Unknown column/property " + propertyName);
-        }
-        return propDef.getPropertyDefinition().getCardinality() == Cardinality.MULTI;
-    }
-
-}
diff --git a/source/java/org/alfresco/repo/domain/permissions/AclChangeSet.java b/source/java/org/alfresco/repo/domain/permissions/AclChangeSet.java
index 014c431d66..edd458c0bf 100644
--- a/source/java/org/alfresco/repo/domain/permissions/AclChangeSet.java
+++ b/source/java/org/alfresco/repo/domain/permissions/AclChangeSet.java
@@ -27,5 +27,6 @@ package org.alfresco.repo.domain.permissions;
  */
 public interface AclChangeSet
 {
-    public Long getId();
+    Long getId();
+    Long getCommitTimeMs();
 }
diff --git a/source/java/org/alfresco/repo/domain/solr/AclChangeSetEntity.java b/source/java/org/alfresco/repo/domain/solr/AclChangeSetEntity.java
index 43fa25501c..d4668ab6e0 100644
--- a/source/java/org/alfresco/repo/domain/solr/AclChangeSetEntity.java
+++ b/source/java/org/alfresco/repo/domain/solr/AclChangeSetEntity.java
@@ -18,6 +18,8 @@
  */
 package org.alfresco.repo.domain.solr;
 
+import org.alfresco.repo.solr.AclChangeSet;
+
 /**
  * Interface for SOLR changeset objects.
  * 
@@ -30,6 +32,17 @@ public class AclChangeSetEntity implements AclChangeSet
     private Long commitTimeMs;
     private int aclCount;
 
+    @Override
+    public String toString()
+    {
+        return "AclChangeSetEntity " +
+        		"[id=" + id +
+        		", commitTimeMs=" + commitTimeMs +
+        		", aclCount=" + aclCount +
+        		"]";
+    }
+    
+    @Override
     public Long getId()
     {
         return id;
@@ -38,6 +51,7 @@ public class AclChangeSetEntity implements AclChangeSet
     {
         this.id = id;
     }
+    @Override
     public Long getCommitTimeMs()
     {
         return commitTimeMs;
@@ -46,6 +60,7 @@ public class AclChangeSetEntity implements AclChangeSet
     {
         this.commitTimeMs = commitTimeMs;
     }
+    @Override
     public int getAclCount()
     {
         return aclCount;
diff --git a/source/java/org/alfresco/repo/domain/solr/AclEntity.java b/source/java/org/alfresco/repo/domain/solr/AclEntity.java
new file mode 100644
index 0000000000..4e2b4a6e9c
--- /dev/null
+++ b/source/java/org/alfresco/repo/domain/solr/AclEntity.java
@@ -0,0 +1,77 @@
+/*
+ * Copyright (C) 2005-2011 Alfresco Software Limited.
+ *
+ * This file is part of Alfresco
+ *
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ */
+package org.alfresco.repo.domain.solr;
+
+import java.util.List;
+
+import org.alfresco.repo.solr.Acl;
+import org.alfresco.repo.solr.AclEntry;
+
+/**
+ * Interface for SOLR changeset objects.
+ * 
+ * @author Derek Hulley
+ * @since 4.0
+ */
+public class AclEntity implements Acl
+{
+    private Long id;
+    private Long aclChangeSetId;
+    private List<AclEntry> entries;
+
+    @Override
+    public String toString()
+    {
+        return "AclEntity " +
+        		"[id=" + id +
+                ", aclChangeSetId=" + aclChangeSetId +
+        		", entries=" + entries +
+        		"]";
+    }
+
+    @Override
+    public Long getId()
+    {
+        return id;
+    }
+    public void setId(Long id)
+    {
+        this.id = id;
+    }
+
+    @Override
+    public Long getAclChangeSetId()
+    {
+        return aclChangeSetId;
+    }
+    public void setAclChangeSetId(Long aclChangeSetId)
+    {
+        this.aclChangeSetId = aclChangeSetId;
+    }
+
+    @Override
+    public List<AclEntry> getEntries()
+    {
+        return entries;
+    }
+    public void setEntries(List<AclEntry> entries)
+    {
+        this.entries = entries;
+    }
+}
diff --git a/source/java/org/alfresco/repo/domain/solr/AclEntryEntity.java b/source/java/org/alfresco/repo/domain/solr/AclEntryEntity.java
new file mode 100644
index 0000000000..a33cde4313
--- /dev/null
+++ b/source/java/org/alfresco/repo/domain/solr/AclEntryEntity.java
@@ -0,0 +1,87 @@
+/*
+ * Copyright (C) 2005-2011 Alfresco Software Limited.
+ *
+ * This file is part of Alfresco
+ *
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ */
+package org.alfresco.repo.domain.solr;
+
+import org.alfresco.repo.solr.AclEntry;
+
+/**
+ * Interface for SOLR changeset objects.
+ * 
+ * @author Derek Hulley
+ * @since 4.0
+ */
+public class AclEntryEntity implements AclEntry
+{
+    private Long id;
+    private Long aclId;
+    private Long aclPermissionId;
+    private String aclAuthority;
+
+    @Override
+    public String toString()
+    {
+        return "AclEntryEntity " +
+        		"[id=" + id +
+                ", aclId=" + aclId +
+        		", aclPermissionId=" + aclPermissionId +
+                ", aclAuthority=" + aclAuthority +
+        		"]";
+    }
+
+    @Override
+    public Long getId()
+    {
+        return id;
+    }
+    public void setId(Long id)
+    {
+        this.id = id;
+    }
+
+    @Override
+    public Long getAclId()
+    {
+        return aclId;
+    }
+
+    public void setAclId(Long aclId)
+    {
+        this.aclId = aclId;
+    }
+
+    @Override
+    public Long getAclPermissionId()
+    {
+        return aclPermissionId;
+    }
+    public void setAclPermissionId(Long aclPermissionId)
+    {
+        this.aclPermissionId = aclPermissionId;
+    }
+
+    @Override
+    public String getAclAuthority()
+    {
+        return aclAuthority;
+    }
+    public void setAclAuthority(String aclAuthority)
+    {
+        this.aclAuthority = aclAuthority;
+    }
+}
diff --git a/source/java/org/alfresco/repo/domain/solr/SOLRDAO.java b/source/java/org/alfresco/repo/domain/solr/SOLRDAO.java
index ece69d9659..56eb07de55 100644
--- a/source/java/org/alfresco/repo/domain/solr/SOLRDAO.java
+++ b/source/java/org/alfresco/repo/domain/solr/SOLRDAO.java
@@ -21,7 +21,11 @@ package org.alfresco.repo.domain.solr;
 import java.util.List;
 
 import org.alfresco.repo.domain.node.Node;
+import org.alfresco.repo.solr.Acl;
+import org.alfresco.repo.solr.AclChangeSet;
+import org.alfresco.repo.solr.AclEntry;
 import org.alfresco.repo.solr.NodeParameters;
+import org.alfresco.repo.solr.Transaction;
 
 /**
  * DAO support for SOLR web scripts.
@@ -31,15 +35,34 @@ import org.alfresco.repo.solr.NodeParameters;
 public interface SOLRDAO
 {
     /**
-     * Get the ACL changesets for given range parameters
+     * Get the ACL changesets summary (rollup count) with paging options
      * 
      * @param minAclChangeSetId         minimum ACL changeset ID - (inclusive and optional)
      * @param fromCommitTime            minimum ACL commit time - (inclusive and optional)
-     * @param maxResults                limit the results. 0 or Integer.MAX_VALUE does not limit the results
-     * @return                          list of ACL changesets
+     * @param maxResults                limit the results (must be greater than zero and less than MAX)
+     * @return                          list of ACL changesets (no details)
      */
     public List<AclChangeSet> getAclChangeSets(Long minAclChangeSetId, Long fromCommitTime, int maxResults);
     
+    /**
+     * Get the ACLs (no rollup count) with paging options for a specific change set
+     * 
+     * @param aclChangeSetIds           the ACL ChangeSet IDs
+     * @param minAclId                  the minimum ACL ID - (inclusive and optional).
+     * @param maxResults                the maximum number of results (must be greater than zero and less than MAX)
+     * @return                          list of detailed ACL ChangeSets (details included, no roll-up)
+     */
+    public List<Acl> getAcls(List<Long> aclChangeSetIds, Long minAclId, int maxResults);
+
+    /**
+     * Get the ACL entries for specific ACLs, optionally pulling back authority details.
+     * 
+     * @param aclIds                    the ACL IDs
+     * @param includeAuthorities        <tt>true</tt> to pull back authorities with read permission
+     * @return                          
+     */
+    public List<AclEntry> getAclEntries(List<Long> aclIds, boolean includeAuthorities);
+    
     /**
      * Get the transactions from either minTxnId or fromCommitTime, optionally limited to maxResults
      * 
diff --git a/source/java/org/alfresco/repo/domain/solr/SOLRDAOTest.java b/source/java/org/alfresco/repo/domain/solr/SOLRDAOTest.java
index c95215f5da..6738e64817 100644
--- a/source/java/org/alfresco/repo/domain/solr/SOLRDAOTest.java
+++ b/source/java/org/alfresco/repo/domain/solr/SOLRDAOTest.java
@@ -19,13 +19,20 @@
 package org.alfresco.repo.domain.solr;
 
 import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.Iterator;
 import java.util.List;
+import java.util.Set;
 
 import junit.framework.TestCase;
 
 import org.alfresco.repo.domain.node.Node;
 import org.alfresco.repo.security.authentication.AuthenticationComponent;
+import org.alfresco.repo.solr.Acl;
+import org.alfresco.repo.solr.AclChangeSet;
 import org.alfresco.repo.solr.NodeParameters;
+import org.alfresco.repo.solr.Transaction;
 import org.alfresco.service.cmr.repository.StoreRef;
 import org.alfresco.util.ApplicationContextHelper;
 import org.springframework.context.ConfigurableApplicationContext;
@@ -51,7 +58,117 @@ public class SOLRDAOTest extends TestCase
         authenticationComponent.setSystemUserAsCurrentUser();
     }
     
-    public void testQueryTransactionsNoLimit()
+    public void testQueryChangeSets_NoLimit()
+    {
+        long startTime = System.currentTimeMillis() - (5 * 60000L);
+
+        try
+        {
+            solrDAO.getAclChangeSets(null, startTime, 0);
+            fail("Must have result limit");
+        }
+        catch (IllegalArgumentException e)
+        {
+            // Expected
+        }
+    }
+    
+    public void testQueryChangeSets_Time()
+    {
+        long startTime = System.currentTimeMillis() + (5 * 60000L);             // The future
+        List<AclChangeSet> results = solrDAO.getAclChangeSets(null, startTime, 50);
+        assertTrue("ChangeSet count not limited", results.size() == 0);
+    }
+    
+    public void testQueryChangeSets_Limit()
+    {
+        List<AclChangeSet> results = solrDAO.getAclChangeSets(null, 0L, 50);
+        assertTrue("Transaction count not limited", results.size() <= 50);
+    }
+    
+    /**
+     * Argument checks.
+     */
+    public void testQueryAcls_Arguments()
+    {
+        try
+        {
+            // No IDs
+            solrDAO.getAcls(Collections.<Long>emptyList(), null, 50);
+            fail("Expected IllegalArgumentException");
+        }
+        catch (IllegalArgumentException e)
+        {
+            // Expected
+        }
+        try
+        {
+            // No limit on results
+            solrDAO.getAcls(Collections.<Long>singletonList(1L), null, 0);
+            fail("Expected IllegalArgumentException");
+        }
+        catch (IllegalArgumentException e)
+        {
+            // Expected
+        }
+    }
+    
+    public void testQueryAcls_All()
+    {
+        // Do a query for some changesets
+        List<AclChangeSet> aclChangeSets = solrDAO.getAclChangeSets(null, 0L, 50);
+        
+        // Choose some changesets with changes
+        int aclTotal = 0;
+        Iterator<AclChangeSet> aclChangeSetsIterator = aclChangeSets.iterator();
+        while (aclChangeSetsIterator.hasNext())
+        {
+            AclChangeSet aclChangeSet = aclChangeSetsIterator.next();
+            if (aclChangeSet.getAclCount() == 0)
+            {
+                aclChangeSetsIterator.remove();
+            }
+            else
+            {
+                aclTotal += aclChangeSet.getAclCount();
+            }
+        }
+        // Stop if we don't have ACLs
+        if (aclTotal == 0)
+        {
+            return;
+        }
+        
+        List<Long> aclChangeSetIds = toIds(aclChangeSets);
+
+        // Now use those to query for details
+        List<Acl> acls = solrDAO.getAcls(aclChangeSetIds, null, 10);
+        assertTrue("Results not limited", acls.size() <= 10);
+
+        // Get again, but allow all results
+        acls = solrDAO.getAcls(aclChangeSetIds, null, aclTotal);
+        assertEquals("Expected exact results", aclTotal, acls.size());
+        
+        // Check that the ACL ChangeSet IDs are correct
+        Set<Long> aclChangeSetIdsSet = new HashSet<Long>(aclChangeSetIds);
+        for (Acl acl : acls)
+        {
+            Long aclChangeSetId = acl.getAclChangeSetId();
+            assertTrue("ACL ChangeSet ID not in original list", aclChangeSetIdsSet.contains(aclChangeSetId));
+        }
+    }
+    
+    private List<Long> toIds(List<AclChangeSet> aclChangeSets)
+    {
+        List<Long> ids = new ArrayList<Long>(aclChangeSets.size());
+        for (AclChangeSet aclChangeSet : aclChangeSets)
+        {
+            ids.add(aclChangeSet.getId());
+        }
+        return ids;
+    }
+    
+    public void testQueryTransactions_NoLimit()
     {
         long startTime = System.currentTimeMillis() - (5 * 60000L);
 
@@ -66,17 +183,17 @@ public class SOLRDAOTest extends TestCase
         }
     }
     
-    public void testQueryTransactionsTime()
+    public void testQueryTransactions_Time()
     {
         long startTime = System.currentTimeMillis() + (5 * 60000L);             // The future
-        List<Transaction> txns = solrDAO.getTransactions(null, startTime, 50);
-        assertTrue("Transaction count not limited", txns.size() == 0);
+        List<Transaction> results = solrDAO.getTransactions(null, startTime, 50);
+        assertTrue("Transaction count not limited", results.size() == 0);
     }
     
-    public void testQueryTransactionsLimit()
+    public void testQueryTransactions_Limit()
     {
-        List<Transaction> txns = solrDAO.getTransactions(null, 0L, 50);
-        assertTrue("Transaction count not limited", txns.size() <= 50);
+        List<Transaction> results = solrDAO.getTransactions(null, 0L, 50);
+        assertTrue("Transaction count not limited", results.size() <= 50);
     }
     
     public void testGetNodesSimple()
diff --git a/source/java/org/alfresco/repo/domain/solr/SOLRTrackingParameters.java b/source/java/org/alfresco/repo/domain/solr/SOLRTrackingParameters.java
index c7b04f5ce3..4dd6ee0e9b 100644
--- a/source/java/org/alfresco/repo/domain/solr/SOLRTrackingParameters.java
+++ b/source/java/org/alfresco/repo/domain/solr/SOLRTrackingParameters.java
@@ -33,10 +33,7 @@ public class SOLRTrackingParameters
     private List<Long> ids;
     private Long fromRelatedIdInclusive;
     private Long toRelatedIdExclusive;
-
-    public SOLRTrackingParameters()
-    {
-    }
+    private boolean trueOrFalse;
 
     public Long getFromIdInclusive()
     {
@@ -58,12 +55,12 @@ public class SOLRTrackingParameters
         this.fromCommitTimeInclusive = fromCommitTimeInclusive;
     }
 
-    public List<Long> getIdsx()
+    public List<Long> getIds()
     {
         return ids;
     }
 
-    public void setIdsx(List<Long> ids)
+    public void setIds(List<Long> ids)
     {
         this.ids = ids;
     }
@@ -108,7 +105,23 @@ public class SOLRTrackingParameters
 	    return false;
 	}
 
-	@Override
+	/**
+	 * Simple mutalbe cross-DB boolean value
+	 */
+	public boolean isTrueOrFalse()
+    {
+        return trueOrFalse;
+    }
+
+	/**
+     * Simple mutalbe cross-DB boolean value
+	 */
+    public void setTrueOrFalse(boolean trueOrFalse)
+    {
+        this.trueOrFalse = trueOrFalse;
+    }
+
+    @Override
     public String toString()
     {
         StringBuilder sb = new StringBuilder(512);
diff --git a/source/java/org/alfresco/repo/domain/solr/TransactionEntity.java b/source/java/org/alfresco/repo/domain/solr/TransactionEntity.java
index fc3b2f3d87..abc8f4f46a 100644
--- a/source/java/org/alfresco/repo/domain/solr/TransactionEntity.java
+++ b/source/java/org/alfresco/repo/domain/solr/TransactionEntity.java
@@ -18,6 +18,8 @@
  */
 package org.alfresco.repo.domain.solr;
 
+import org.alfresco.repo.solr.Transaction;
+
 /**
  * Bean to represent SOLR transaction data.
  * 
diff --git a/source/java/org/alfresco/repo/domain/solr/ibatis/SOLRDAOImpl.java b/source/java/org/alfresco/repo/domain/solr/ibatis/SOLRDAOImpl.java
index 930efa8da4..70d4d1a775 100644
--- a/source/java/org/alfresco/repo/domain/solr/ibatis/SOLRDAOImpl.java
+++ b/source/java/org/alfresco/repo/domain/solr/ibatis/SOLRDAOImpl.java
@@ -22,12 +22,14 @@ import java.util.List;
 
 import org.alfresco.repo.domain.node.Node;
 import org.alfresco.repo.domain.qname.QNameDAO;
-import org.alfresco.repo.domain.solr.AclChangeSet;
 import org.alfresco.repo.domain.solr.NodeParametersEntity;
 import org.alfresco.repo.domain.solr.SOLRDAO;
 import org.alfresco.repo.domain.solr.SOLRTrackingParameters;
-import org.alfresco.repo.domain.solr.Transaction;
+import org.alfresco.repo.solr.Acl;
+import org.alfresco.repo.solr.AclChangeSet;
+import org.alfresco.repo.solr.AclEntry;
 import org.alfresco.repo.solr.NodeParameters;
+import org.alfresco.repo.solr.Transaction;
 import org.alfresco.util.PropertyCheck;
 import org.apache.ibatis.session.RowBounds;
 import org.mybatis.spring.SqlSessionTemplate;
@@ -39,6 +41,9 @@ import org.mybatis.spring.SqlSessionTemplate;
  */
 public class SOLRDAOImpl implements SOLRDAO
 {
+    private static final String SELECT_CHANGESETS_SUMMARY = "alfresco.solr.select_ChangeSets_Summary";
+    private static final String SELECT_ACLS_BY_CHANGESET_IDS = "alfresco.solr.select_AclsByChangeSetIds";
+    private static final String SELECT_ACLENTRIESS_BY_ACL_IDS = "alfresco.solr.select_AclEntriessByAclIds";
     private static final String SELECT_TRANSACTIONS = "alfresco.solr.select_Txns";
     private static final String SELECT_NODES = "alfresco.solr.select_Txn_Nodes";
     
@@ -64,30 +69,76 @@ public class SOLRDAOImpl implements SOLRDAO
         PropertyCheck.mandatory(this, "qnameDAO", qnameDAO);
     }
     
+    /**
+     * {@inheritDoc}
+     */
 	@Override
     @SuppressWarnings("unchecked")
     public List<AclChangeSet> getAclChangeSets(Long minAclChangeSetId, Long fromCommitTime, int maxResults)
     {
-        if (minAclChangeSetId == null && fromCommitTime == null && (maxResults == 0 || maxResults == Integer.MAX_VALUE))
+        if (maxResults <= 0 || maxResults == Integer.MAX_VALUE)
         {
-            throw new IllegalArgumentException("Must specify at least one parameter");
+            throw new IllegalArgumentException("Maximum results must be a reasonable number.");
         }
 
         SOLRTrackingParameters params = new SOLRTrackingParameters();
         params.setFromIdInclusive(minAclChangeSetId);
         params.setFromCommitTimeInclusive(fromCommitTime);
 
-        List<AclChangeSet> results = null;
-        if(maxResults != 0 && maxResults != Integer.MAX_VALUE)
+        return (List<AclChangeSet>) template.selectList(SELECT_CHANGESETS_SUMMARY, params, new RowBounds(0, maxResults));
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    @SuppressWarnings("unchecked")
+    public List<Acl> getAcls(List<Long> aclChangeSetIds, Long minAclId, int maxResults)
+    {
+        if (maxResults <= 0 || maxResults == Integer.MAX_VALUE)
         {
-            results = (List<AclChangeSet>)template.selectList(SELECT_TRANSACTIONS, params, new RowBounds(0, maxResults));
+            throw new IllegalArgumentException("Maximum results must be a reasonable number.");
         }
-        else
+        if (aclChangeSetIds == null || aclChangeSetIds.size() == 0)
         {
-            results = (List<AclChangeSet>)template.selectList(SELECT_TRANSACTIONS, params);
+            throw new IllegalArgumentException("'aclChangeSetIds' must contain IDs.");
+        }
+        if (aclChangeSetIds.size() > 512)
+        {
+            throw new IllegalArgumentException("'aclChangeSetIds' cannot have more than 512 entries.");
+        }
+        if (minAclId != null)
+        {
+            throw new IllegalArgumentException("When 'minAclId' is specified then there should be only one 'aclChangeSetIds'.");
         }
         
-        return results;
+        SOLRTrackingParameters params = new SOLRTrackingParameters();
+        params.setIds(aclChangeSetIds);
+        params.setFromIdInclusive(minAclId);
+
+        return (List<Acl>) template.selectList(SELECT_ACLS_BY_CHANGESET_IDS, params, new RowBounds(0, maxResults));
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    @SuppressWarnings("unchecked")
+    public List<AclEntry> getAclEntries(List<Long> aclIds, boolean includeAuthorities)
+    {
+        if (aclIds == null || aclIds.size() == 0)
+        {
+            throw new IllegalArgumentException("'aclIds' must contain IDs.");
+        }
+        if (aclIds.size() > 512)
+        {
+            throw new IllegalArgumentException("'aclIds' cannot have more than 512 entries.");
+        }
+        SOLRTrackingParameters params = new SOLRTrackingParameters();
+        params.setIds(aclIds);
+        params.setTrueOrFalse(includeAuthorities);
+
+        return (List<AclEntry>) template.selectList(SELECT_ACLENTRIESS_BY_ACL_IDS, params);
     }
 
     /**
@@ -128,429 +179,4 @@ public class SOLRDAOImpl implements SOLRDAO
 	        return (List<Node>) template.selectList(SELECT_NODES, params);
 	    }
 	}
-//
-//	/**
-//	 * A dumb iterator that iterates over longs in sequence.
-//	 *
-//	 */
-//	private static class SequenceIterator implements Iterable<Long>, Iterator<Long>
-//	{
-//	    private long fromId;
-//	    private long toId;
-//	    private long counter;
-//	    private int maxResults;
-//	    private boolean inUse = false;
-//
-//	    SequenceIterator(Long fromId, Long toId, int maxResults)
-//	    {
-//	        this.fromId = (fromId == null ? 1 : fromId.longValue());
-//	        this.toId = (toId == null ? Long.MAX_VALUE : toId.longValue());
-//	        this.maxResults = maxResults;
-//	        this.counter = this.fromId;
-//	    }
-//	    
-//	    public List<Long> getList()
-//	    {
-//            List<Long> ret = new ArrayList<Long>(100);
-//            @SuppressWarnings("rawtypes")
-//            Iterator nodeIds = iterator();
-//            while(nodeIds.hasNext())
-//            {
-//                ret.add((Long)nodeIds.next());
-//            }
-//            return ret;
-//	    }
-//
-//        @Override
-//        public Iterator<Long> iterator()
-//        {
-//            if(inUse)
-//            {
-//                throw new IllegalStateException("Already in use");
-//            }
-//            this.counter = this.fromId;
-//            this.inUse = true;
-//            return this;
-//        }
-//
-//        @Override
-//        public boolean hasNext()
-//        {
-//            return ((counter - this.fromId) < maxResults) &&  counter <= toId;
-//        }
-//
-//        @Override
-//        public Long next()
-//        {
-//            return counter++;
-//        }
-//
-//        @Override
-//        public void remove()
-//        {
-//            throw new UnsupportedOperationException();
-//        }
-//	}
-
-//    private boolean isCategorised(AspectDefinition aspDef)
-//    {
-//        if(aspDef == null)
-//        {
-//            return false;
-//        }
-//        AspectDefinition current = aspDef;
-//        while (current != null)
-//        {
-//            if (current.getName().equals(ContentModel.ASPECT_CLASSIFIABLE))
-//            {
-//                return true;
-//            }
-//            else
-//            {
-//                QName parentName = current.getParentName();
-//                if (parentName == null)
-//                {
-//                    break;
-//                }
-//                current = dictionaryService.getAspect(parentName);
-//            }
-//        }
-//        return false;
-//    }
-//    
-//    // TODO: Push into Abstract class
-//    private Collection<Pair<Path, QName>> getCategoryPaths(NodeRef nodeRef, Set<QName> aspects, Map<QName, Serializable> properties)
-//    {
-//        ArrayList<Pair<Path, QName>> categoryPaths = new ArrayList<Pair<Path, QName>>();
-//
-//        for (QName classRef : aspects)
-//        {
-//            AspectDefinition aspDef = dictionaryService.getAspect(classRef);
-//            if (isCategorised(aspDef))
-//            {
-//                LinkedList<Pair<Path, QName>> aspectPaths = new LinkedList<Pair<Path, QName>>();
-//                for (PropertyDefinition propDef : aspDef.getProperties().values())
-//                {
-//                    if (propDef.getDataType().getName().equals(DataTypeDefinition.CATEGORY))
-//                    {
-//                        for (NodeRef catRef : DefaultTypeConverter.INSTANCE.getCollection(NodeRef.class, properties.get(propDef.getName())))
-//                        {
-//                            if (catRef != null)
-//                            {
-//                                // can be running in context of System user, hence use input nodeRef
-//                                catRef = tenantService.getName(nodeRef, catRef);
-//
-//                                try
-//                                {
-//                                    Pair<Long, NodeRef> pair = nodeDAO.getNodePair(catRef);
-//                                    for (Path path : nodeDAO.getPaths(pair, false))
-//                                    {
-//                                        if ((path.size() > 1) && (path.get(1) instanceof Path.ChildAssocElement))
-//                                        {
-//                                            Path.ChildAssocElement cae = (Path.ChildAssocElement) path.get(1);
-//                                            boolean isFakeRoot = true;
-//
-//                                            final List<ChildAssociationRef> results = new ArrayList<ChildAssociationRef>(10);
-//                                            // We have a callback handler to filter results
-//                                            ChildAssocRefQueryCallback callback = new ChildAssocRefQueryCallback()
-//                                            {
-//                                                public boolean preLoadNodes()
-//                                                {
-//                                                    return false;
-//                                                }
-//                                                
-//                                                public boolean handle(
-//                                                        Pair<Long, ChildAssociationRef> childAssocPair,
-//                                                        Pair<Long, NodeRef> parentNodePair,
-//                                                        Pair<Long, NodeRef> childNodePair)
-//                                                {
-//                                                    results.add(childAssocPair.getSecond());
-//                                                    return true;
-//                                                }
-//
-//                                                public void done()
-//                                                {
-//                                                }                               
-//                                            };
-//                                            
-//                                            Pair<Long, NodeRef> caePair = nodeDAO.getNodePair(cae.getRef().getChildRef());
-//                                            nodeDAO.getParentAssocs(caePair.getFirst(), null, null, false, callback);
-//                                            for (ChildAssociationRef car : results)
-//                                            {
-//                                                if (cae.getRef().equals(car))
-//                                                {
-//                                                    isFakeRoot = false;
-//                                                    break;
-//                                                }
-//                                            }
-//                                            if (isFakeRoot)
-//                                            {
-//                                                if (path.toString().indexOf(aspDef.getName().toString()) != -1)
-//                                                {
-//                                                    aspectPaths.add(new Pair<Path, QName>(path, aspDef.getName()));
-//                                                }
-//                                            }
-//                                        }
-//                                    }
-//                                }
-//                                catch (InvalidNodeRefException e)
-//                                {
-//                                    // If the category does not exists we move on the next
-//                                }
-//
-//                            }
-//                        }
-//                    }
-//                }
-//                categoryPaths.addAll(aspectPaths);
-//            }
-//        }
-//        // Add member final element
-//        for (Pair<Path, QName> pair : categoryPaths)
-//        {
-//            if (pair.getFirst().last() instanceof Path.ChildAssocElement)
-//            {
-//                Path.ChildAssocElement cae = (Path.ChildAssocElement) pair.getFirst().last();
-//                ChildAssociationRef assocRef = cae.getRef();
-//                pair.getFirst().append(new Path.ChildAssocElement(new ChildAssociationRef(assocRef.getTypeQName(), assocRef.getChildRef(), QName.createQName("member"), nodeRef)));
-//            }
-//        }
-//
-//        return categoryPaths;
-//    }
-//    
-//    private List<Long> preCacheNodes(NodeMetaDataParameters nodeMetaDataParameters)
-//    {
-//        int maxResults = nodeMetaDataParameters.getMaxResults();
-//        boolean isLimitSet = (maxResults != 0 && maxResults != Integer.MAX_VALUE);
-//
-//        List<Long> nodeIds = null;
-//        Iterable<Long> iterable = null;
-//        List<Long> allNodeIds = nodeMetaDataParameters.getNodeIds();
-//        if(allNodeIds != null)
-//        {
-//            int toIndex = (maxResults > allNodeIds.size() ? allNodeIds.size() : maxResults);
-//            nodeIds = isLimitSet ? allNodeIds.subList(0, toIndex) : nodeMetaDataParameters.getNodeIds();
-//            iterable = nodeMetaDataParameters.getNodeIds();
-//        }
-//        else
-//        {
-//            Long fromNodeId = nodeMetaDataParameters.getFromNodeId();
-//            Long toNodeId = nodeMetaDataParameters.getToNodeId();
-//            nodeIds = new ArrayList<Long>(isLimitSet ? maxResults : 100); // TODO better default here?
-//            iterable = new SequenceIterator(fromNodeId, toNodeId, maxResults);
-//            int counter = 1;
-//            for(Long nodeId : iterable)
-//            {
-//                if(isLimitSet && counter++ > maxResults)
-//                {
-//                    break;
-//                }
-//                nodeIds.add(nodeId);
-//            }
-//        }
-//        // pre-cache nodes
-//        nodeDAO.cacheNodesById(nodeIds);
-//        
-//        return nodeIds;
-//    }
-//
-//    /**
-//     * {@inheritDoc}
-//     */
-//    public void getNodesMetadata(
-//            NodeMetaDataParameters nodeMetaDataParameters,
-//            MetaDataResultsFilter resultFilter,
-//            NodeMetaDataQueryCallback callback)
-//    {
-//        int maxResults = nodeMetaDataParameters.getMaxResults();
-//        NodeMetaDataQueryRowHandler rowHandler = new NodeMetaDataQueryRowHandler(callback);
-//        boolean isLimitSet = (maxResults != 0 && maxResults != Integer.MAX_VALUE);
-//        boolean includeType = (resultFilter == null ? true : resultFilter.getIncludeType());
-//        boolean includeProperties = (resultFilter == null ? true : resultFilter.getIncludeProperties());
-//        boolean includeAspects = (resultFilter == null ? true : resultFilter.getIncludeAspects());
-//        boolean includePaths = (resultFilter == null ? true : resultFilter.getIncludePaths());
-//        boolean includeNodeRef = (resultFilter == null ? true : resultFilter.getIncludeNodeRef());
-//        boolean includeAssociations = (resultFilter == null ? true : resultFilter.getIncludeAssociations());
-//        boolean includeChildAssociations = (resultFilter == null ? true : resultFilter.getIncludeChildAssociations());
-//        boolean includeOwner = (resultFilter == null ? true : resultFilter.getIncludeOwner());
-//        
-//        List<Long> nodeIds = preCacheNodes(nodeMetaDataParameters);
-//
-//        for(Long nodeId : nodeIds)
-//        {
-//            Map<QName, Serializable> props = null;
-//            Set<QName> aspects = null;
-//            
-//            if (!nodeDAO.exists(nodeId))
-//            {
-//                // Deleted nodes have no metadata
-//                continue;
-//            }
-//
-//            NodeMetaDataEntity nodeMetaData = new NodeMetaDataEntity();
-//            nodeMetaData.setNodeId(nodeId);
-//
-//            Pair<Long, NodeRef> pair = nodeDAO.getNodePair(nodeId);
-//            nodeMetaData.setAclId(nodeDAO.getNodeAclId(nodeId));
-//
-//            if(includeType)
-//            {
-//                QName nodeType = nodeDAO.getNodeType(nodeId);
-//                nodeMetaData.setNodeType(nodeType);
-//            }
-//
-//            if(includePaths || includeProperties)
-//            {
-//                props = nodeDAO.getNodeProperties(nodeId);
-//            }
-//            nodeMetaData.setProperties(props);
-//
-//            if(includePaths || includeAspects)
-//            {
-//                aspects = nodeDAO.getNodeAspects(nodeId);
-//            }
-//            nodeMetaData.setAspects(aspects);
-//
-//            // TODO paths may change during get i.e. node moved around in the graph
-//            if(includePaths)
-//            {
-//                Collection<Pair<Path, QName>> categoryPaths = getCategoryPaths(pair.getSecond(), aspects, props);
-//                List<Path> directPaths = nodeDAO.getPaths(pair, false);
-//
-//                Collection<Pair<Path, QName>> paths = new ArrayList<Pair<Path, QName>>(directPaths.size() + categoryPaths.size());
-//                for (Path path : directPaths)
-//                {
-//                    paths.add(new Pair<Path, QName>(path, null));
-//                }
-//                paths.addAll(categoryPaths);
-//
-//                nodeMetaData.setPaths(paths);
-//            }
-//
-//            if(includeNodeRef)
-//            {
-//                nodeMetaData.setNodeRef(pair.getSecond());
-//            }
-//        
-//            if(includeChildAssociations)
-//            {
-//                final List<ChildAssociationRef> childAssocs = new ArrayList<ChildAssociationRef>(100);
-//                nodeDAO.getChildAssocs(nodeId, null, null, null, null, null, new ChildAssocRefQueryCallback()
-//                {
-//                    @Override
-//                    public boolean preLoadNodes()
-//                    {
-//                        return false;
-//                    }
-//                    
-//                    @Override
-//                    public boolean handle(Pair<Long, ChildAssociationRef> childAssocPair, Pair<Long, NodeRef> parentNodePair,
-//                            Pair<Long, NodeRef> childNodePair)
-//                    {
-//                        childAssocs.add(childAssocPair.getSecond());
-//                        return true;
-//                    }
-//                    
-//                    @Override
-//                    public void done()
-//                    {
-//                    }
-//                });
-//                nodeMetaData.setChildAssocs(childAssocs);
-//            }
-//
-//            if(includeAssociations)
-//            {
-//                final List<ChildAssociationRef> parentAssocs = new ArrayList<ChildAssociationRef>(100);
-//                nodeDAO.getParentAssocs(nodeId, null, null, null, new ChildAssocRefQueryCallback()
-//                {
-//                    @Override
-//                    public boolean handle(Pair<Long, ChildAssociationRef> childAssocPair,
-//                            Pair<Long, NodeRef> parentNodePair, Pair<Long, NodeRef> childNodePair)
-//                    {
-//                        parentAssocs.add(childAssocPair.getSecond());
-//                        return true;
-//                    }
-//
-//                    @Override
-//                    public boolean preLoadNodes()
-//                    {
-//                        return false;
-//                    }
-//
-//                    @Override
-//                    public void done()
-//                    {
-//                    }
-//                });
-//                        
-//                // TODO non-child associations
-////                Collection<Pair<Long, AssociationRef>> sourceAssocs = nodeDAO.getSourceNodeAssocs(nodeId);
-////                Collection<Pair<Long, AssociationRef>> targetAssocs = nodeDAO.getTargetNodeAssocs(nodeId);
-////                
-////                nodeMetaData.setAssocs();
-//            }
-//            
-//            if(includeOwner)
-//            {
-//                // cached in OwnableService
-//                nodeMetaData.setOwner(ownableService.getOwner(pair.getSecond()));
-//            }
-// 
-//            rowHandler.processResult(nodeMetaData);
-//        }
-//    }
-//    
-//    /**
-//     * Class that passes results from a result entity into the client callback
-//     */
-//    protected class NodeQueryRowHandler
-//    {
-//        private final NodeQueryCallback callback;
-//        private boolean more;
-//
-//        private NodeQueryRowHandler(NodeQueryCallback callback)
-//        {
-//            this.callback = callback;
-//            this.more = true;
-//        }
-//        
-//        public void processResult(Node row)
-//        {
-//            if (!more)
-//            {
-//                // No more results required
-//                return;
-//            }
-//            
-//            more = callback.handleNode(row);
-//        }
-//    }
-//    
-//    /**
-//     * Class that passes results from a result entity into the client callback
-//     */
-//    protected class NodeMetaDataQueryRowHandler
-//    {
-//        private final NodeMetaDataQueryCallback callback;
-//        private boolean more;
-//
-//        private NodeMetaDataQueryRowHandler(NodeMetaDataQueryCallback callback)
-//        {
-//            this.callback = callback;
-//            this.more = true;
-//        }
-//        
-//        public void processResult(NodeMetaData row)
-//        {
-//            if (!more)
-//            {
-//                // No more results required
-//                return;
-//            }
-//            
-//            more = callback.handleNodeMetaData(row);
-//        }
-//    }
 }
diff --git a/source/java/org/alfresco/repo/exporter/ACPExportPackageHandler.java b/source/java/org/alfresco/repo/exporter/ACPExportPackageHandler.java
index c8cbb105c3..e16ee9d829 100644
--- a/source/java/org/alfresco/repo/exporter/ACPExportPackageHandler.java
+++ b/source/java/org/alfresco/repo/exporter/ACPExportPackageHandler.java
@@ -121,7 +121,6 @@ public class ACPExportPackageHandler
         this.contentDir = contentDir;
         this.mimetypeService = mimetypeService;
     }
-
     
     /**
      * @param nodeService
diff --git a/source/java/org/alfresco/repo/model/filefolder/FileFolderServiceImpl.java b/source/java/org/alfresco/repo/model/filefolder/FileFolderServiceImpl.java
index 485075ddee..b880f11339 100644
--- a/source/java/org/alfresco/repo/model/filefolder/FileFolderServiceImpl.java
+++ b/source/java/org/alfresco/repo/model/filefolder/FileFolderServiceImpl.java
@@ -127,7 +127,7 @@ public class FileFolderServiceImpl implements FileFolderService
     private SearchService searchService;
     private ContentService contentService;
     private MimetypeService mimetypeService;
-    private NamedObjectRegistry<CannedQueryFactory> cannedQueryRegistry;
+    private NamedObjectRegistry<CannedQueryFactory<NodeRef>> cannedQueryRegistry;
     
     private Set<String> systemNamespaces;
     
@@ -180,7 +180,7 @@ public class FileFolderServiceImpl implements FileFolderService
     /**
      * Set the registry of {@link CannedQueryFactory canned queries}
      */
-    public void setCannedQueryRegistry(NamedObjectRegistry<CannedQueryFactory> cannedQueryRegistry)
+    public void setCannedQueryRegistry(NamedObjectRegistry<CannedQueryFactory<NodeRef>> cannedQueryRegistry)
     {
         this.cannedQueryRegistry = cannedQueryRegistry;
     }
diff --git a/source/java/org/alfresco/repo/node/locator/AbstractNodeLocator.java b/source/java/org/alfresco/repo/nodelocator/AbstractNodeLocator.java
similarity index 83%
rename from source/java/org/alfresco/repo/node/locator/AbstractNodeLocator.java
rename to source/java/org/alfresco/repo/nodelocator/AbstractNodeLocator.java
index db3775dae9..b24b5fe1c6 100644
--- a/source/java/org/alfresco/repo/node/locator/AbstractNodeLocator.java
+++ b/source/java/org/alfresco/repo/nodelocator/AbstractNodeLocator.java
@@ -17,23 +17,22 @@
  * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package org.alfresco.repo.node.locator;
+package org.alfresco.repo.nodelocator;
 
 import java.util.Collections;
 import java.util.List;
 
 import org.alfresco.service.cmr.action.ParameterDefinition;
-import org.alfresco.service.cmr.repository.NodeLocator;
-import org.alfresco.service.cmr.repository.NodeLocatorService;
 
 /**
+ * Base class for all {@link NodeLocator} implementations. 
+ * <p>Extending this class with automatically register the node locator with the NodeLocatorService.</p>
+ * 
  * @author Nick Smith
  * @since 4.0
- *
  */
 public abstract class AbstractNodeLocator implements NodeLocator
 {
-
     public void setNodeLocatorService(NodeLocatorService nodeLocatorService)
     {
         nodeLocatorService.register(getName(), this);
diff --git a/source/java/org/alfresco/repo/node/locator/AncestorNodeLocator.java b/source/java/org/alfresco/repo/nodelocator/AncestorNodeLocator.java
similarity index 81%
rename from source/java/org/alfresco/repo/node/locator/AncestorNodeLocator.java
rename to source/java/org/alfresco/repo/nodelocator/AncestorNodeLocator.java
index 680e8a3cc7..de693e812b 100644
--- a/source/java/org/alfresco/repo/node/locator/AncestorNodeLocator.java
+++ b/source/java/org/alfresco/repo/nodelocator/AncestorNodeLocator.java
@@ -17,7 +17,7 @@
  * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package org.alfresco.repo.node.locator;
+package org.alfresco.repo.nodelocator;
 
 import java.io.Serializable;
 import java.util.ArrayList;
@@ -34,13 +34,17 @@ import org.alfresco.service.namespace.NamespaceService;
 import org.alfresco.service.namespace.QName;
 
 /**
+ * This {@link NodeLocator} identifies an ancestor of the source node.
+ * <p>The node returned can be of a specific <code>type</code> and/or have a specific <code>aspect</code> applied.  
+ * 
+ * <p>If no parameters are passed the immediate primary parent is returned.</p>
+ * 
  * @author Nick Smith
  * @since 4.0
- *
  */
 public class AncestorNodeLocator extends AbstractNodeLocator
 {
-    public static final String NAME = "AncestorNodeLocator";
+    public static final String NAME = "ancestor";
     public static final String TYPE_KEY = "type";
     public static final String ASPECT_KEY = "aspect";
     
@@ -56,19 +60,19 @@ public class AncestorNodeLocator extends AbstractNodeLocator
         QName type = getQNameParam(TYPE_KEY, params);
         QName aspect = getQNameParam(ASPECT_KEY, params);
         NodeRef child = source;
-        while(true)
+        while (true)
         {
             ChildAssociationRef parentAssoc = nodeService.getPrimaryParent(child);
-            if(parentAssoc == null)
+            if (parentAssoc == null)
             {
                 break; // No matching ancestor found.
             }
             NodeRef parent = parentAssoc.getParentRef();
-            if(parent == null)
+            if (parent == null)
             {
                 break; // No matching ancestor found.
             }
-            if(typeMatches(type, parent) && aspectMatches(aspect, parent))
+            if (typeMatches(type, parent) && aspectMatches(aspect, parent))
             {
                 return parent; // Matching ancestor was found.
             }
@@ -91,18 +95,18 @@ public class AncestorNodeLocator extends AbstractNodeLocator
     
     private boolean typeMatches(QName type, NodeRef parent)
     {
-        return type==null || type.equals(nodeService.getType(parent));
+        return type == null || type.equals(nodeService.getType(parent));
     }
     
     private boolean aspectMatches(QName aspect, NodeRef parent)
     {
-        return aspect==null || nodeService.getAspects(parent).contains(aspect);
+        return aspect == null || nodeService.getAspects(parent).contains(aspect);
     }
 
     private QName getQNameParam(String key, Map<String, Serializable> params)
     {
         String value = (String) params.get(key);
-        if(value!=null)
+        if (value != null)
         {
             return QName.createQName(value, namespaceService);
         }
@@ -133,5 +137,4 @@ public class AncestorNodeLocator extends AbstractNodeLocator
     {
         this.namespaceService = namespaceService;
     }
-
 }
diff --git a/source/java/org/alfresco/repo/node/locator/CompanyHomeNodeLocator.java b/source/java/org/alfresco/repo/nodelocator/CompanyHomeNodeLocator.java
similarity index 89%
rename from source/java/org/alfresco/repo/node/locator/CompanyHomeNodeLocator.java
rename to source/java/org/alfresco/repo/nodelocator/CompanyHomeNodeLocator.java
index 9833a68095..a446a6f134 100644
--- a/source/java/org/alfresco/repo/node/locator/CompanyHomeNodeLocator.java
+++ b/source/java/org/alfresco/repo/nodelocator/CompanyHomeNodeLocator.java
@@ -17,7 +17,7 @@
  * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package org.alfresco.repo.node.locator;
+package org.alfresco.repo.nodelocator;
 
 
 import java.io.Serializable;
@@ -31,11 +31,10 @@ import org.alfresco.service.cmr.repository.NodeRef;
  * 
  * @author Nick Smith
  * @since 4.0
- *
  */
 public class CompanyHomeNodeLocator extends AbstractNodeLocator
 {
-    public static final String NAME = "CompanyHomeNodeLocator";
+    public static final String NAME = "companyhome";
     
     private Repository repoHelper;
 
@@ -63,5 +62,4 @@ public class CompanyHomeNodeLocator extends AbstractNodeLocator
     {
         this.repoHelper = repoHelper;
     }
-
 }
diff --git a/source/java/org/alfresco/service/cmr/repository/NodeLocator.java b/source/java/org/alfresco/repo/nodelocator/NodeLocator.java
similarity index 92%
rename from source/java/org/alfresco/service/cmr/repository/NodeLocator.java
rename to source/java/org/alfresco/repo/nodelocator/NodeLocator.java
index 758969631a..fff7cdcf0b 100644
--- a/source/java/org/alfresco/service/cmr/repository/NodeLocator.java
+++ b/source/java/org/alfresco/repo/nodelocator/NodeLocator.java
@@ -17,13 +17,14 @@
  * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package org.alfresco.service.cmr.repository;
+package org.alfresco.repo.nodelocator;
 
 import java.io.Serializable;
 import java.util.List;
 import java.util.Map;
 
 import org.alfresco.service.cmr.action.ParameterDefinition;
+import org.alfresco.service.cmr.repository.NodeRef;
 
 /**
  * A strategy for locating a {@link NodeRef} in the repository, given a source node and an arbitrary set of parameters.
diff --git a/source/java/org/alfresco/service/cmr/repository/NodeLocatorService.java b/source/java/org/alfresco/repo/nodelocator/NodeLocatorService.java
similarity index 91%
rename from source/java/org/alfresco/service/cmr/repository/NodeLocatorService.java
rename to source/java/org/alfresco/repo/nodelocator/NodeLocatorService.java
index c418d709b4..d435e6552c 100644
--- a/source/java/org/alfresco/service/cmr/repository/NodeLocatorService.java
+++ b/source/java/org/alfresco/repo/nodelocator/NodeLocatorService.java
@@ -17,11 +17,13 @@
  * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package org.alfresco.service.cmr.repository;
+package org.alfresco.repo.nodelocator;
 
 import java.io.Serializable;
 import java.util.Map;
 
+import org.alfresco.service.cmr.repository.NodeRef;
+
 /**
  * This service is responsible for locating {@link NodeRef}s in the repository using {@link NodeLocator} strategies.
  * 
diff --git a/source/java/org/alfresco/repo/node/locator/NodeLocatorServiceImpl.java b/source/java/org/alfresco/repo/nodelocator/NodeLocatorServiceImpl.java
similarity index 63%
rename from source/java/org/alfresco/repo/node/locator/NodeLocatorServiceImpl.java
rename to source/java/org/alfresco/repo/nodelocator/NodeLocatorServiceImpl.java
index 157682e778..eba9d3b4f8 100644
--- a/source/java/org/alfresco/repo/node/locator/NodeLocatorServiceImpl.java
+++ b/source/java/org/alfresco/repo/nodelocator/NodeLocatorServiceImpl.java
@@ -17,24 +17,29 @@
  * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package org.alfresco.repo.node.locator;
+package org.alfresco.repo.nodelocator;
 
 import java.io.Serializable;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.alfresco.service.cmr.repository.NodeLocator;
-import org.alfresco.service.cmr.repository.NodeLocatorService;
 import org.alfresco.service.cmr.repository.NodeRef;
 import org.alfresco.util.ParameterCheck;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
 
 /**
+ * Implementation of the {@link NodeLocatorService} which is responsible for locating a 
+ * {@link NodeRef} using a named lookup strategy.
+ * 
  * @author Nick Smith
  * @since 4.0
- *
  */
 public class NodeLocatorServiceImpl implements NodeLocatorService
 {
+    /** Logger */
+    private static Log logger = LogFactory.getLog(NodeLocatorServiceImpl.class);
+    
     private final Map<String, NodeLocator> locators = new HashMap<String, NodeLocator>();
     
     /**
@@ -44,12 +49,21 @@ public class NodeLocatorServiceImpl implements NodeLocatorService
     public NodeRef getNode(String locatorName, NodeRef source, Map<String, Serializable> params)
     {
         NodeLocator locator = locators.get(locatorName);
-        if(locator == null)
+        
+        if (locator == null)
         {
-            String msg = "No NodeLocator is registered with name " +locatorName;
+            String msg = "No NodeLocator is registered with name: " + locatorName;
             throw new IllegalArgumentException(msg);
         }
-        return locator.getNode(source, params);
+        
+        NodeRef node = locator.getNode(source, params);
+        
+        if (logger.isDebugEnabled())
+        {
+            logger.debug("Node locator named '" + locatorName + "' found node: " + node);
+        }
+        
+        return node;
     }
 
     /**
@@ -60,11 +74,18 @@ public class NodeLocatorServiceImpl implements NodeLocatorService
     {
         ParameterCheck.mandatory("locatorName", locatorName);
         ParameterCheck.mandatory("locator", locator);
-        if(locators.containsKey(locatorName))
+        
+        if (locators.containsKey(locatorName))
         {
-            String msg = "Locator with name: " +locatorName + " is already registered!";
+            String msg = "Locator with name '" + locatorName + "' is already registered!";
             throw new IllegalArgumentException(msg);
         }
+        
+        if (logger.isDebugEnabled())
+        {
+            logger.debug("Registered node locator: " + locatorName);
+        }
+        
         locators.put(locatorName, locator);
     }
 
diff --git a/source/java/org/alfresco/repo/node/locator/NodeLocatorServiceImplTest.java b/source/java/org/alfresco/repo/nodelocator/NodeLocatorServiceImplTest.java
similarity index 92%
rename from source/java/org/alfresco/repo/node/locator/NodeLocatorServiceImplTest.java
rename to source/java/org/alfresco/repo/nodelocator/NodeLocatorServiceImplTest.java
index efa3ff4241..245c7a0a37 100644
--- a/source/java/org/alfresco/repo/node/locator/NodeLocatorServiceImplTest.java
+++ b/source/java/org/alfresco/repo/nodelocator/NodeLocatorServiceImplTest.java
@@ -17,16 +17,16 @@
  * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package org.alfresco.repo.node.locator;
+package org.alfresco.repo.nodelocator;
 
-import static junit.framework.Assert.*;
+import static junit.framework.Assert.assertEquals;
+import static junit.framework.Assert.fail;
 import static org.mockito.Mockito.when;
 
 import javax.annotation.Resource;
 
 import org.alfresco.repo.model.Repository;
 import org.alfresco.repo.site.SiteServiceInternal;
-import org.alfresco.service.cmr.repository.NodeLocatorService;
 import org.alfresco.service.cmr.repository.NodeRef;
 import org.junit.Before;
 import org.junit.Test;
diff --git a/source/java/org/alfresco/repo/node/locator/SelfNodeLocator.java b/source/java/org/alfresco/repo/nodelocator/SelfNodeLocator.java
similarity index 86%
rename from source/java/org/alfresco/repo/node/locator/SelfNodeLocator.java
rename to source/java/org/alfresco/repo/nodelocator/SelfNodeLocator.java
index 116d9647ef..3be32c1126 100644
--- a/source/java/org/alfresco/repo/node/locator/SelfNodeLocator.java
+++ b/source/java/org/alfresco/repo/nodelocator/SelfNodeLocator.java
@@ -17,7 +17,7 @@
  * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package org.alfresco.repo.node.locator;
+package org.alfresco.repo.nodelocator;
 
 import java.io.Serializable;
 import java.util.Map;
@@ -25,13 +25,14 @@ import java.util.Map;
 import org.alfresco.service.cmr.repository.NodeRef;
 
 /**
+ * This {@link NodeLocator} returns the source node.
+ * 
  * @author Nick Smith
  * @since 4.0
- *
  */
 public class SelfNodeLocator extends AbstractNodeLocator
 {
-    public static final String NAME = "SelfNodeLocator";
+    public static final String NAME = "self";
     /**
     * {@inheritDoc}
     */
@@ -49,5 +50,4 @@ public class SelfNodeLocator extends AbstractNodeLocator
     {
         return NAME;
     }
-
 }
diff --git a/source/java/org/alfresco/repo/node/locator/SitesHomeNodeLocator.java b/source/java/org/alfresco/repo/nodelocator/SitesHomeNodeLocator.java
similarity index 88%
rename from source/java/org/alfresco/repo/node/locator/SitesHomeNodeLocator.java
rename to source/java/org/alfresco/repo/nodelocator/SitesHomeNodeLocator.java
index af2b563b2d..60aa61e61f 100644
--- a/source/java/org/alfresco/repo/node/locator/SitesHomeNodeLocator.java
+++ b/source/java/org/alfresco/repo/nodelocator/SitesHomeNodeLocator.java
@@ -17,7 +17,7 @@
  * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package org.alfresco.repo.node.locator;
+package org.alfresco.repo.nodelocator;
 
 
 import java.io.Serializable;
@@ -27,13 +27,14 @@ import org.alfresco.repo.site.SiteServiceInternal;
 import org.alfresco.service.cmr.repository.NodeRef;
 
 /**
+ * Locates the Sites Home {@link NodeRef}.
+ * 
  * @author Nick Smith
  * @since 4.0
- *
  */
 public class SitesHomeNodeLocator extends AbstractNodeLocator
 {
-    public static final String NAME = "SitesHomeNodeLocator"; 
+    public static final String NAME = "siteshome"; 
 
     SiteServiceInternal siteService;
     
@@ -62,5 +63,4 @@ public class SitesHomeNodeLocator extends AbstractNodeLocator
     {
         this.siteService = siteService;
     }
-
 }
diff --git a/source/java/org/alfresco/repo/node/locator/UserHomeNodeLocator.java b/source/java/org/alfresco/repo/nodelocator/UserHomeNodeLocator.java
similarity index 84%
rename from source/java/org/alfresco/repo/node/locator/UserHomeNodeLocator.java
rename to source/java/org/alfresco/repo/nodelocator/UserHomeNodeLocator.java
index 75c7612898..823495538e 100644
--- a/source/java/org/alfresco/repo/node/locator/UserHomeNodeLocator.java
+++ b/source/java/org/alfresco/repo/nodelocator/UserHomeNodeLocator.java
@@ -17,7 +17,7 @@
  * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package org.alfresco.repo.node.locator;
+package org.alfresco.repo.nodelocator;
 
 import java.io.Serializable;
 import java.util.Map;
@@ -26,13 +26,14 @@ import org.alfresco.repo.model.Repository;
 import org.alfresco.service.cmr.repository.NodeRef;
 
 /**
+ * This {@link NodeLocator} identifies and returns the node representing the current users home folder.
+ * 
  * @author Nick Smith
  * @since 4.0
- *
  */
 public class UserHomeNodeLocator extends AbstractNodeLocator
 {
-    public static final String NAME = "UserHomeNodeLocator";
+    public static final String NAME = "userhome";
     private Repository repositoryHelper;
     
     /**
@@ -42,7 +43,7 @@ public class UserHomeNodeLocator extends AbstractNodeLocator
     public NodeRef getNode(NodeRef source, Map<String, Serializable> params)
     {
         NodeRef person = repositoryHelper.getPerson();
-        if(person != null)
+        if (person != null)
         {
             return repositoryHelper.getUserHome(person);
         }
diff --git a/source/java/org/alfresco/repo/node/locator/XPathNodeLocator.java b/source/java/org/alfresco/repo/nodelocator/XPathNodeLocator.java
similarity index 89%
rename from source/java/org/alfresco/repo/node/locator/XPathNodeLocator.java
rename to source/java/org/alfresco/repo/nodelocator/XPathNodeLocator.java
index f8c7aa8d82..fab0794e7d 100644
--- a/source/java/org/alfresco/repo/node/locator/XPathNodeLocator.java
+++ b/source/java/org/alfresco/repo/nodelocator/XPathNodeLocator.java
@@ -17,7 +17,7 @@
  * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package org.alfresco.repo.node.locator;
+package org.alfresco.repo.nodelocator;
 
 import java.io.Serializable;
 import java.util.ArrayList;
@@ -35,13 +35,14 @@ import org.alfresco.service.cmr.search.SearchService;
 import org.alfresco.util.ParameterCheck;
 
 /**
+ * This {@link NodeLocator} identifies a node from an XPath provided via the <code>xpath</code> parameter.
+ * 
  * @author Nick Smith
  * @since 4.0
- *
  */
 public class XPathNodeLocator extends AbstractNodeLocator
 {
-    public static final String NAME = "XPathNodeLocator";
+    public static final String NAME = "xpath";
     public static final String QUERY_KEY = "query";
     public static final String STORE_TYPE_KEY = "store_type";
     public static final String STORE_ID_KEY = "store_id";
@@ -58,7 +59,7 @@ public class XPathNodeLocator extends AbstractNodeLocator
         String query = (String) params.get(QUERY_KEY);
         ParameterCheck.mandatoryString("query", query);
         StoreRef store = null;
-        if(source!=null)
+        if (source!=null)
         {
             store = source.getStoreRef();
         }
@@ -66,7 +67,7 @@ public class XPathNodeLocator extends AbstractNodeLocator
         {
             String storeType = (String) params.get(STORE_TYPE_KEY);
             String storeId = (String) params.get(STORE_ID_KEY);
-            if(storeType !=null && storeId != null)
+            if (storeType != null && storeId != null)
             {
                 store = new StoreRef(storeType, storeId);
             }
@@ -81,7 +82,7 @@ public class XPathNodeLocator extends AbstractNodeLocator
                 return nodes.get(0);
             }
         }
-        catch(Exception e)
+        catch (Exception e)
         {
             String msg = "Error while searching XPath. StoreRef: " + store + " Query: " + query;
             throw new AlfrescoRuntimeException(msg, e);
diff --git a/source/java/org/alfresco/repo/publishing/AbstractChannelType.java b/source/java/org/alfresco/repo/publishing/AbstractChannelType.java
new file mode 100644
index 0000000000..841f1362dd
--- /dev/null
+++ b/source/java/org/alfresco/repo/publishing/AbstractChannelType.java
@@ -0,0 +1,37 @@
+/*
+ * Copyright (C) 2005-2011 Alfresco Software Limited.
+ *
+ * This file is part of Alfresco
+ *
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package org.alfresco.repo.publishing;
+
+import org.alfresco.service.cmr.publishing.channels.ChannelService;
+import org.alfresco.service.cmr.publishing.channels.ChannelType;
+
+/**
+ * @author Nick Smith
+ * @since 4.0
+ *
+ */
+public abstract class AbstractChannelType implements ChannelType
+{
+    public void setChannelService(ChannelService channelService)
+    {
+        channelService.register(this);
+    }
+
+}
diff --git a/source/java/org/alfresco/repo/publishing/ChannelImpl.java b/source/java/org/alfresco/repo/publishing/ChannelImpl.java
new file mode 100644
index 0000000000..e547d61edf
--- /dev/null
+++ b/source/java/org/alfresco/repo/publishing/ChannelImpl.java
@@ -0,0 +1,77 @@
+/*
+ * Copyright (C) 2005-2010 Alfresco Software Limited.
+ *
+ * This file is part of Alfresco
+ *
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package org.alfresco.repo.publishing;
+
+import org.alfresco.service.cmr.publishing.channels.Channel;
+import org.alfresco.service.cmr.publishing.channels.ChannelType;
+import org.alfresco.service.cmr.repository.NodeRef;
+
+/**
+ * @author Brian
+ *
+ */
+public class ChannelImpl implements Channel
+{
+    private final NodeRef nodeRef;
+    private final ChannelType channelType;
+    private final String name;
+    private final ChannelServiceImpl channelService;
+
+    /**
+     * @param channelType
+     * @param name
+     * @param channelService
+     */
+    public ChannelImpl(ChannelType channelType, NodeRef nodeRef, String name, ChannelServiceImpl channelService)
+    {
+        this.nodeRef = nodeRef;
+        this.channelType = channelType;
+        this.name = name;
+        this.channelService = channelService;
+    }
+
+    /* (non-Javadoc)
+     * @see org.alfresco.service.cmr.publishing.channels.Channel#getChannelType()
+     */
+    @Override
+    public ChannelType getChannelType()
+    {
+        return channelType;
+    }
+
+    /* (non-Javadoc)
+     * @see org.alfresco.service.cmr.publishing.channels.Channel#getName()
+     */
+    @Override
+    public String getName()
+    {
+        return name;
+    }
+
+    /* (non-Javadoc)
+     * @see org.alfresco.service.cmr.publishing.channels.Channel#getNodeRef()
+     */
+    @Override
+    public NodeRef getNodeRef()
+    {
+        return nodeRef;
+    }
+
+}
diff --git a/source/java/org/alfresco/repo/publishing/ChannelServiceImpl.java b/source/java/org/alfresco/repo/publishing/ChannelServiceImpl.java
new file mode 100644
index 0000000000..63ca8ab161
--- /dev/null
+++ b/source/java/org/alfresco/repo/publishing/ChannelServiceImpl.java
@@ -0,0 +1,214 @@
+/*
+ * Copyright (C) 2005-2011 Alfresco Software Limited.
+ *
+ * This file is part of Alfresco
+ *
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package org.alfresco.repo.publishing;
+
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.TreeMap;
+
+import org.alfresco.model.ContentModel;
+import org.alfresco.repo.security.authentication.AuthenticationUtil;
+import org.alfresco.repo.security.authentication.AuthenticationUtil.RunAsWork;
+import org.alfresco.service.cmr.dictionary.DictionaryService;
+import org.alfresco.service.cmr.publishing.channels.Channel;
+import org.alfresco.service.cmr.publishing.channels.ChannelService;
+import org.alfresco.service.cmr.publishing.channels.ChannelType;
+import org.alfresco.service.cmr.repository.ChildAssociationRef;
+import org.alfresco.service.cmr.repository.NodeRef;
+import org.alfresco.service.cmr.repository.NodeService;
+import org.alfresco.service.cmr.site.SiteService;
+import org.alfresco.service.namespace.NamespaceService;
+import org.alfresco.service.namespace.QName;
+import org.alfresco.util.ParameterCheck;
+
+/**
+ * @author Nick Smith
+ * @since 4.0
+ * 
+ */
+public class ChannelServiceImpl implements ChannelService
+{
+    private static final String CHANNEL_CONTAINER_NAME = "channels";
+    private final Map<String, ChannelType> channelTypes = new TreeMap<String, ChannelType>();
+    private SiteService siteService;
+    private NodeService nodeService;
+    private DictionaryService dictionaryService;
+    private EnvironmentHelper environmentHelper;
+
+    
+    
+    /**
+     * @param siteService the siteService to set
+     */
+    public void setSiteService(SiteService siteService)
+    {
+        this.siteService = siteService;
+    }
+
+    /**
+     * @param nodeService the nodeService to set
+     */
+    public void setNodeService(NodeService nodeService)
+    {
+        this.nodeService = nodeService;
+    }
+
+    /**
+     * @param dictionaryService the dictionaryService to set
+     */
+    public void setDictionaryService(DictionaryService dictionaryService)
+    {
+        this.dictionaryService = dictionaryService;
+    }
+
+    /**
+     * @param environmentHelper the environmentHelper to set
+     */
+    public void setEnvironmentHelper(EnvironmentHelper environmentHelper)
+    {
+        this.environmentHelper = environmentHelper;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public void register(ChannelType channelType)
+    {
+        ParameterCheck.mandatory("channelType", channelType);
+        String id = channelType.getId();
+        if (channelTypes.containsKey(id))
+        {
+            throw new IllegalArgumentException("Channel type " + id + " is already registered!");
+        }
+        channelTypes.put(id, channelType);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public List<ChannelType> getChannelTypes()
+    {
+        return new ArrayList<ChannelType>(channelTypes.values());
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public Channel createChannel(String siteId, String channelTypeId, String name, Map<QName, Serializable> properties)
+    {
+        NodeRef channelContainer = getChannelContainer(siteId);
+        ChannelType channelType = channelTypes.get(channelTypeId);
+        Channel channel = null;
+        if (channelType != null)
+        {
+            QName channelNodeType = channelType.getChannelNodeType();
+            HashMap<QName, Serializable> actualProps = new HashMap<QName, Serializable>(properties);
+            actualProps.put(PublishingModel.PROP_CHANNEL_TYPE, channelType.getId());
+            QName channelQName = QName.createQName(NamespaceService.APP_MODEL_1_0_URI, name);
+            ChildAssociationRef assoc = nodeService.createNode(channelContainer, ContentModel.ASSOC_CONTAINS,
+                    channelQName, channelNodeType, actualProps);
+            channel = buildChannelObject(assoc.getChildRef());
+            QName rootNodeType = channelType.getContentRootNodeType();
+            nodeService.createNode(assoc.getChildRef(), ContentModel.ASSOC_CONTAINS, QName.createQName(
+                    NamespaceService.CONTENT_MODEL_1_0_URI, "root"), rootNodeType);
+
+            // Now create the corresponding channel nodes in each of the
+            // configured environments
+            //FIXME: BJR: 20110506: Should we provide a means for supplying separate properties for each environment?
+            Map<String, NodeRef> environments = environmentHelper.getEnvironments(siteId);
+            for (NodeRef environment : environments.values())
+            {
+                nodeService.createNode(environment, ContentModel.ASSOC_CONTAINS, channelQName, channelNodeType,
+                        actualProps);
+            }
+        }
+        return channel;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public void deleteChannel(String siteId, String channelName)
+    {
+        // TODO Auto-generated method stub
+
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public List<Channel> getChannels(String siteId)
+    {
+        ParameterCheck.mandatory("siteId", siteId);
+
+        NodeRef channelContainer = getChannelContainer(siteId);
+        Collection<QName> channelNodeTypes = dictionaryService.getSubTypes(PublishingModel.TYPE_DELIVERY_CHANNEL, true);
+        List<ChildAssociationRef> channelAssocs = nodeService.getChildAssocs(channelContainer, new HashSet<QName>(
+                channelNodeTypes));
+        List<Channel> channelList = new ArrayList<Channel>(channelAssocs.size());
+        for (ChildAssociationRef channelAssoc : channelAssocs)
+        {
+            channelList.add(buildChannelObject(channelAssoc.getChildRef()));
+        }
+        return Collections.unmodifiableList(channelList);
+    }
+
+    /**
+     * @param siteId
+     * @return
+     */
+    private NodeRef getChannelContainer(final String siteId)
+    {
+        return AuthenticationUtil.runAs(new RunAsWork<NodeRef>()
+        {
+            public NodeRef doWork() throws Exception
+            {
+                NodeRef channelContainer = siteService.getContainer(siteId, CHANNEL_CONTAINER_NAME);
+                if (channelContainer == null)
+                {
+                    // No channel container exists for this site yet. Create it.
+                    channelContainer = siteService.createContainer(siteId, CHANNEL_CONTAINER_NAME,
+                            PublishingModel.TYPE_CHANNEL_CONTAINER, null);
+                }
+                return channelContainer;
+            }
+        }, AuthenticationUtil.getSystemUserName());
+
+    }
+
+    /**
+     * @param childRef
+     * @return
+     */
+    private Channel buildChannelObject(NodeRef nodeRef)
+    {
+        Map<QName, Serializable> props = nodeService.getProperties(nodeRef);
+        ChannelType channelType = channelTypes.get((String) props.get(PublishingModel.PROP_CHANNEL_TYPE));
+        String name = (String) props.get(ContentModel.PROP_NAME);
+        return new ChannelImpl(channelType, nodeRef, name, this);
+    }
+
+}
diff --git a/source/java/org/alfresco/repo/publishing/EnvironmentHelper.java b/source/java/org/alfresco/repo/publishing/EnvironmentHelper.java
new file mode 100644
index 0000000000..8fb5232ed3
--- /dev/null
+++ b/source/java/org/alfresco/repo/publishing/EnvironmentHelper.java
@@ -0,0 +1,126 @@
+/*
+ * Copyright (C) 2005-2010 Alfresco Software Limited.
+ *
+ * This file is part of Alfresco
+ *
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package org.alfresco.repo.publishing;
+
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.TreeMap;
+
+import org.alfresco.model.ContentModel;
+import org.alfresco.repo.security.authentication.AuthenticationUtil;
+import org.alfresco.repo.security.authentication.AuthenticationUtil.RunAsWork;
+import org.alfresco.service.cmr.repository.ChildAssociationRef;
+import org.alfresco.service.cmr.repository.NodeRef;
+import org.alfresco.service.cmr.repository.NodeService;
+import org.alfresco.service.cmr.site.SiteService;
+import org.alfresco.service.namespace.QName;
+
+/**
+ * A utility class to help out with environment-related operations that are used by both the channel service
+ * and the publishing service.
+ * 
+ * @author Brian
+ *
+ */
+public class EnvironmentHelper
+{
+    private static final String ENVIRONMENT_CONTAINER_NAME = "environments";
+    
+    private Set<QName> environmentNodeTypes;
+    private SiteService siteService;
+    private NodeService nodeService;
+    
+    public EnvironmentHelper()
+    {
+        environmentNodeTypes = new HashSet<QName>();
+        environmentNodeTypes.add(PublishingModel.TYPE_ENVIRONMENT);
+    }
+    
+    /**
+     * @param environmentNodeTypes the environmentNodeTypes to set
+     */
+    public void setEnvironmentNodeTypes(Set<QName> environmentNodeTypes)
+    {
+        this.environmentNodeTypes = environmentNodeTypes;
+    }
+
+    /**
+     * @param siteService the siteService to set
+     */
+    public void setSiteService(SiteService siteService)
+    {
+        this.siteService = siteService;
+    }
+
+    /**
+     * @param nodeService the nodeService to set
+     */
+    public void setNodeService(NodeService nodeService)
+    {
+        this.nodeService = nodeService;
+    }
+
+    public Map<String,NodeRef> getEnvironments(String siteId)
+    {
+        Map<String,NodeRef> results = new TreeMap<String, NodeRef>(); 
+        NodeRef environmentContainer = getEnvironmentContainer(siteId);
+        List<ChildAssociationRef> envAssocs = nodeService.getChildAssocs(environmentContainer, getEnvironmentNodeTypes());
+        for (ChildAssociationRef envAssoc : envAssocs)
+        {
+            NodeRef environment = envAssoc.getChildRef();
+            String name = (String)nodeService.getProperty(environment, ContentModel.PROP_NAME);
+            results.put(name, environment);
+        }
+        return results;
+    }
+
+    /**
+     * @return
+     */
+    protected Set<QName> getEnvironmentNodeTypes()
+    {
+        return environmentNodeTypes;
+    }
+
+    /**
+     * @param siteId
+     * @return
+     */
+    private NodeRef getEnvironmentContainer(final String siteId)
+    {
+        return AuthenticationUtil.runAs(new RunAsWork<NodeRef>()
+        {
+            public NodeRef doWork() throws Exception
+            {
+                NodeRef channelContainer = siteService.getContainer(siteId, ENVIRONMENT_CONTAINER_NAME);
+                if (channelContainer == null)
+                {
+                    // No channel container exists for this site yet. Create it.
+                    channelContainer = siteService.createContainer(siteId, ENVIRONMENT_CONTAINER_NAME,
+                            PublishingModel.TYPE_CHANNEL_CONTAINER, null);
+                }
+                return channelContainer;
+            }
+        }, AuthenticationUtil.getSystemUserName());
+
+    }
+}
diff --git a/source/java/org/alfresco/repo/publishing/PublishingModel.java b/source/java/org/alfresco/repo/publishing/PublishingModel.java
new file mode 100644
index 0000000000..df2855784d
--- /dev/null
+++ b/source/java/org/alfresco/repo/publishing/PublishingModel.java
@@ -0,0 +1,45 @@
+/*
+ * Copyright (C) 2005-2011 Alfresco Software Limited.
+ *
+ * This file is part of Alfresco
+ *
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package org.alfresco.repo.publishing;
+
+import org.alfresco.service.namespace.QName;
+
+/**
+ * @author Nick Smith
+ * @since 4.0
+ *
+ */
+public interface PublishingModel
+{
+    public static final String NAMESPACE = "http://www.alfresco.org/model/publishing/1.0";
+    public static final String PREFIX = "pub";
+    
+    public static final QName TYPE_DELIVERY_CHANNEL = QName.createQName(NAMESPACE, "DeliveryChannel");
+    public static final QName TYPE_DELIVERY_SERVER = QName.createQName(NAMESPACE, "DeliveryServer");
+    public static final QName TYPE_ENVIRONMENT= QName.createQName(NAMESPACE, "Environment");
+    public static final QName TYPE_PUBLISHING_QUEUE = QName.createQName(NAMESPACE, "PublishingQueue");
+    public static final QName TYPE_CHANNEL_CONTAINER = QName.createQName(NAMESPACE, "SiteChannelContainer");
+    
+    public static final QName ASPECT_CONTENT_ROOT = QName.createQName(NAMESPACE, "ContentRoot");
+
+    public static final QName PROP_CHANNEL = QName.createQName(NAMESPACE, "channel");
+    public static final QName PROP_CHANNEL_TYPE = QName.createQName(NAMESPACE, "channelType");
+
+}
diff --git a/source/java/org/alfresco/repo/rendition/executer/AbstractRenderingEngine.java b/source/java/org/alfresco/repo/rendition/executer/AbstractRenderingEngine.java
index 0ac1fbdea7..7c9e2f709c 100644
--- a/source/java/org/alfresco/repo/rendition/executer/AbstractRenderingEngine.java
+++ b/source/java/org/alfresco/repo/rendition/executer/AbstractRenderingEngine.java
@@ -36,7 +36,8 @@ import org.alfresco.model.RenditionModel;
 import org.alfresco.repo.action.ParameterDefinitionImpl;
 import org.alfresco.repo.action.executer.ActionExecuterAbstractBase;
 import org.alfresco.repo.content.MimetypeMap;
-import org.alfresco.repo.node.locator.SelfNodeLocator;
+import org.alfresco.repo.nodelocator.NodeLocator;
+import org.alfresco.repo.nodelocator.SelfNodeLocator;
 import org.alfresco.repo.policy.BehaviourFilter;
 import org.alfresco.repo.rendition.RenderingEngineDefinitionImpl;
 import org.alfresco.repo.rendition.RenditionDefinitionImpl;
@@ -56,7 +57,6 @@ import org.alfresco.service.cmr.repository.ChildAssociationRef;
 import org.alfresco.service.cmr.repository.ContentReader;
 import org.alfresco.service.cmr.repository.ContentService;
 import org.alfresco.service.cmr.repository.ContentWriter;
-import org.alfresco.service.cmr.repository.NodeLocator;
 import org.alfresco.service.cmr.repository.NodeRef;
 import org.alfresco.service.cmr.repository.NodeService;
 import org.alfresco.service.namespace.NamespaceException;
diff --git a/source/java/org/alfresco/repo/search/impl/lucene/SolrAlfrescoFTSQueryLanguage.java b/source/java/org/alfresco/repo/search/impl/lucene/SolrAlfrescoFTSQueryLanguage.java
index e295f015fb..ba38c37593 100644
--- a/source/java/org/alfresco/repo/search/impl/lucene/SolrAlfrescoFTSQueryLanguage.java
+++ b/source/java/org/alfresco/repo/search/impl/lucene/SolrAlfrescoFTSQueryLanguage.java
@@ -95,15 +95,20 @@ public class SolrAlfrescoFTSQueryLanguage implements LuceneQueryLanguageSPI
             httpClient.getState().setCredentials(new AuthScope(AuthScope.ANY_HOST, AuthScope.ANY_PORT), new UsernamePasswordCredentials("admin", "admin"));
 
             StringBuilder url = new StringBuilder("http://localhost:8080/solr/test/alfresco/afts");
-            //url.append("?q=");
-            //URLCodec encoder = new URLCodec();
-            //url.append(encoder.encode(searchParameters.getQuery(), "UTF-8"));
+            //duplicate the query in the URL
+            url.append("?q=");
+            URLCodec encoder = new URLCodec();
+            url.append(encoder.encode(searchParameters.getQuery(), "UTF-8"));
             url.append("?wt=json");
             url.append("&fl=*,score");
             if(searchParameters.getMaxItems() > 0)
             {
                 url.append("&rows=").append(searchParameters.getMaxItems());
             }
+            else
+            {
+                url.append("&rows=").append(Integer.MAX_VALUE);
+            }
             url.append("&df=").append(searchParameters.getDefaultFieldName());
             url.append("&start=").append(searchParameters.getSkipCount());
             
@@ -119,15 +124,20 @@ public class SolrAlfrescoFTSQueryLanguage implements LuceneQueryLanguageSPI
                 authQuery.append("AUTHORITY:\"").append(authority).append("\"");
             }
             
-            url.append("&fq=");
-            URLCodec encoder = new URLCodec();
-            url.append(encoder.encode(authQuery.toString(), "UTF-8"));
+            //url.append("&fq=");
+            //encoder = new URLCodec();
+            //url.append(encoder.encode(authQuery.toString(), "UTF-8"));
+            
+            url.append("&fq=AUTHORITY_FILTER_FROM_JSON");
             
             // facets would go on url?
             
             JSONObject body = new JSONObject();
             body.put("query", searchParameters.getQuery());
             //body.put("defaultField", searchParameters.getDefaultFieldName());
+            
+            body.put("filter", authQuery);
+            
             JSONArray locales = new JSONArray();
             for(Locale locale : searchParameters.getLocales())
             {
diff --git a/source/java/org/alfresco/repo/search/impl/parsers/CMIS.g b/source/java/org/alfresco/repo/search/impl/parsers/CMIS.g
deleted file mode 100644
index f9510766ed..0000000000
--- a/source/java/org/alfresco/repo/search/impl/parsers/CMIS.g
+++ /dev/null
@@ -1,1670 +0,0 @@
-/*
- * Copyright (C) 2005-2010 Alfresco Software Limited.
- *
- * This file is part of Alfresco
- *
- * Alfresco is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Alfresco is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
- */
-/*
- * Parser for the CMIS query language
- *
- * The semantics of multivalued properties are ignored for the initial parse of the language.
- * They are applied in a second pass, when we have enough information to determine the column type. 
- */
-
-grammar CMIS;
-
-options
-{
-        output = AST;
-}
-
-tokens
-{
-        QUERY;
-        ALL_COLUMNS;
-        COLUMN;
-        COLUMNS;
-        COLUMN_REF;
-        QUALIFIER;
-        FUNCTION;
-        SOURCE;
-        TABLE;
-        TABLE_REF;
-        PARAMETER;
-        CONJUNCTION;
-        DISJUNCTION;
-        NEGATION;
-        PRED_COMPARISON;
-        PRED_IN;
-        PRED_EXISTS;
-        PRED_LIKE;
-        PRED_FTS;
-        LIST;
-        PRED_CHILD;
-        PRED_DESCENDANT;
-        SORT_SPECIFICATION;
-        NUMERIC_LITERAL;
-        STRING_LITERAL;
-        DATETIME_LITERAL;
-        BOOLEAN_LITERAL;
-        SINGLE_VALUED_PROPERTY;
-}
-
-@lexer::header
-{
-    package org.alfresco.repo.search.impl.parsers;
-    import org.alfresco.cmis.CMISQueryException;
-}
-
-@header
-{
-    package org.alfresco.repo.search.impl.parsers;
-    import org.alfresco.cmis.CMISQueryException;
-}
-/*
- * Instance methods and properties for the parser.
- * Realisations of the parser should over-ride these as required
- */
-
-
-@members
-{
-    private Stack<String> paraphrases = new Stack<String>();
-    
-    private boolean strict = false;
-
-    /**
-     * CMIS strict
-     */
-    public boolean strict()
-    {
-        return strict;
-    }
-	
-    public void setStrict(boolean strict)
-    {
-        this.strict = strict;
-    }
-        
-    protected Object recoverFromMismatchedToken(IntStream input, int ttype, BitSet follow) throws RecognitionException
-    {
-        throw new MismatchedTokenException(ttype, input);
-    }
-	
-    public Object recoverFromMismatchedSet(IntStream input, RecognitionException e, BitSet follow) throws RecognitionException
-    {
-        throw e;
-    }
-	
-    public String getErrorMessage(RecognitionException e, String[] tokenNames) 
-    {
-        List stack = getRuleInvocationStack(e, this.getClass().getName());
-        String msg = e.getMessage();
-        if ( e instanceof UnwantedTokenException ) 
-	    {
-            UnwantedTokenException ute = (UnwantedTokenException)e;
-            String tokenName="<unknown>";
-            if ( ute.expecting== Token.EOF ) 
-            {
-                tokenName = "EOF";
-            }
-            else 
-            {
-                tokenName = tokenNames[ute.expecting];
-            }
-            msg = "extraneous input " + getTokenErrorDisplay(ute.getUnexpectedToken())
-                + " expecting "+tokenName;
-        }
-        else if ( e instanceof MissingTokenException ) 
-        {
-            MissingTokenException mte = (MissingTokenException)e;
-            String tokenName="<unknown>";
-            if ( mte.expecting== Token.EOF ) 
-            {
-                tokenName = "EOF";
-            }
-            else 
-            {
-                tokenName = tokenNames[mte.expecting];
-            }
-            msg = "missing " + tokenName+" at " + getTokenErrorDisplay(e.token)
-                + "  (" + getLongTokenErrorDisplay(e.token) +")";
-        }
-        else if ( e instanceof MismatchedTokenException ) 
-        {
-            MismatchedTokenException mte = (MismatchedTokenException)e;
-            String tokenName="<unknown>";
-            if ( mte.expecting== Token.EOF ) 
-            {
-                tokenName = "EOF";
-            }
-            else
-            {
-                tokenName = tokenNames[mte.expecting];
-            }
-            msg = "mismatched input " + getTokenErrorDisplay(e.token)
-                + " expecting " + tokenName +"  (" + getLongTokenErrorDisplay(e.token) + ")";
-        }
-        else if ( e instanceof MismatchedTreeNodeException ) 
-        {
-            MismatchedTreeNodeException mtne = (MismatchedTreeNodeException)e;
-            String tokenName="<unknown>";
-            if ( mtne.expecting==Token.EOF )  
-            {
-                tokenName = "EOF";
-            }
-            else 
-            {
-                tokenName = tokenNames[mtne.expecting];
-            }
-            msg = "mismatched tree node: " + mtne.node + " expecting " + tokenName;
-        }
-        else if ( e instanceof NoViableAltException ) 
-        {
-            NoViableAltException nvae = (NoViableAltException)e;
-            msg = "no viable alternative at input " + getTokenErrorDisplay(e.token)
-                + "\n\t (decision=" + nvae.decisionNumber
-                + " state " + nvae.stateNumber + ")" 
-                + " decision=<<" + nvae.grammarDecisionDescription + ">>";
-        }
-        else if ( e instanceof EarlyExitException ) 
-        {
-            //EarlyExitException eee = (EarlyExitException)e;
-            // for development, can add "(decision="+eee.decisionNumber+")"
-            msg = "required (...)+ loop did not match anything at input " + getTokenErrorDisplay(e.token);
-        }
-	    else if ( e instanceof MismatchedSetException ) 
-	    {
-	        MismatchedSetException mse = (MismatchedSetException)e;
-	        msg = "mismatched input " + getTokenErrorDisplay(e.token)
-                + " expecting set " + mse.expecting;
-        }
-        else if ( e instanceof MismatchedNotSetException ) 
-        {
-            MismatchedNotSetException mse = (MismatchedNotSetException)e;
-            msg = "mismatched input " + getTokenErrorDisplay(e.token)
-                + " expecting set " + mse.expecting;
-        }
-        else if ( e instanceof FailedPredicateException ) 
-        {
-            FailedPredicateException fpe = (FailedPredicateException)e;
-            msg = "rule " + fpe.ruleName + " failed predicate: {" + fpe.predicateText + "}?";
-        }
-		
-        if(paraphrases.size() > 0)
-        {
-            String paraphrase = (String)paraphrases.peek();
-            msg = msg+" "+paraphrase;
-        }
-        return msg +"\n\t"+stack;
-    }
-	
-    public String getLongTokenErrorDisplay(Token t)
-    {
-        return t.toString();
-    }
-    
-
-    public String getErrorString(RecognitionException e)
-    {
-        String hdr = getErrorHeader(e);
-        String msg = getErrorMessage(e, this.getTokenNames());
-        return hdr+" "+msg;
-    }
-}
-
-@rulecatch
-{
-    catch(RecognitionException e)
-    {
-        throw new CMISQueryException(getErrorString(e), e);
-    }
-}
-
-@lexer::members
-{
-    public Token nextToken() {
-        while (true) 
-        {
-            state.token = null;
-            state.channel = Token.DEFAULT_CHANNEL;
-            state.tokenStartCharIndex = input.index();
-            state.tokenStartCharPositionInLine = input.getCharPositionInLine();
-            state.tokenStartLine = input.getLine();
-            state.text = null;
-            if ( input.LA(1)==CharStream.EOF ) 
-            {
-                return Token.EOF_TOKEN;
-            }
-            try 
-            {
-                mTokens();
-                if ( state.token==null ) 
-                {
-                    emit();
-                }
-                else if ( state.token==Token.SKIP_TOKEN ) 
-                {
-                    continue;
-                }
-                return state.token;
-            }
-            catch (RecognitionException re) 
-            {
-                throw new CMISQueryException(getErrorString(re), re);
-            }
-        }
-    }
-    
-    public String getErrorString(RecognitionException e)
-    {
-        String hdr = getErrorHeader(e);
-        String msg = getErrorMessage(e, this.getTokenNames());
-        return hdr+" "+msg;
-    }
-}
-
-/**
- * This is mostly a direct take fom the CMIS spec.
- * The only significant chnanges are to remove left recursion which is not supported in antlr
- *
- * The top level rule for the parser
- */
-query
-@init
-{
-    paraphrases.push("in query"); 
-}
-@after
-{
-    paraphrases.pop(); 
-}
-        :
-        SELECT selectList fromClause whereClause? orderByClause? EOF
-                ->
-                        ^(QUERY selectList fromClause whereClause? orderByClause?)
-        ;
-
-selectList
-@init
-{
-    paraphrases.push("in select list"); 
-}
-@after
-{
-    paraphrases.pop(); 
-}
-        :
-        STAR
-                ->
-                        ^(ALL_COLUMNS)
-        | selectSubList (COMMA selectSubList)*
-                ->
-                        ^(COLUMNS selectSubList+)
-        ;
-
-selectSubList
-        :
-        valueExpression (AS? columnName)?
-                ->
-                        ^(COLUMN valueExpression columnName?)
-        | qualifier DOTSTAR
-                ->
-                        ^(ALL_COLUMNS qualifier)
-        ;
-
-valueExpression
-@init
-{
-    paraphrases.push("in value expression"); 
-}
-@after
-{
-    paraphrases.pop(); 
-}
-        :
-        columnReference
-                -> columnReference
-        | valueFunction
-                -> valueFunction
-        ;
-
-columnReference
-@init
-{
-    paraphrases.push("in column reference"); 
-}
-@after
-{
-    paraphrases.pop(); 
-}
-        :
-        (qualifier DOT)? columnName
-                ->
-                        ^(COLUMN_REF columnName qualifier?)
-        ;
-
-valueFunction
-@init
-{
-    paraphrases.push("in function"); 
-}
-@after
-{
-    paraphrases.pop(); 
-}
-        :
-        cmisFunctionName=cmisFunction LPAREN functionArgument* RPAREN
-                ->
-                        ^(FUNCTION $cmisFunctionName LPAREN functionArgument* RPAREN)
-        | {strict == false}?=> functionName=keyWordOrId LPAREN functionArgument* RPAREN
-                ->
-                        ^(FUNCTION $functionName LPAREN functionArgument* RPAREN)
-        ;
-
-functionArgument
-        :
-        qualifier DOT columnName
-                ->
-                        ^(COLUMN_REF columnName qualifier)
-        | identifier
-        | literalOrParameterName
-        ;
-
-qualifier
-        :
-        (tableName) => tableName
-                -> tableName
-        | correlationName
-                -> correlationName
-        ;
-
-fromClause
-@init
-{
-    paraphrases.push("in fromClause"); 
-}
-@after
-{
-    paraphrases.pop(); 
-}
-        :
-        FROM tableReference
-                -> tableReference
-        ;
-
-tableReference
-@init
-{
-    paraphrases.push("in tableReference"); 
-}
-@after
-{
-    paraphrases.pop(); 
-}
-        :
-        singleTable joinedTable*
-                ->
-                        ^(SOURCE singleTable joinedTable*)
-        ;
-/*
- * Created to avoid left recursion between tableReference and joinedTable.
- */
-
-
-singleTable
-@init
-{
-    paraphrases.push("in singleTable"); 
-}
-@after
-{
-    paraphrases.pop(); 
-}
-        :
-        simpleTable
-                -> simpleTable
-        | complexTable
-                ->
-                        ^(TABLE complexTable)
-        ;
-
-simpleTable
-@init
-{
-    paraphrases.push("in simpleTable"); 
-}
-@after
-{
-    paraphrases.pop(); 
-}
-        :
-        tableName (AS? correlationName)?
-                ->
-                        ^(TABLE_REF tableName correlationName?)
-        ;
-
-joinedTable
-@init
-{
-    paraphrases.push("in joinedTable"); 
-}
-@after
-{
-    paraphrases.pop(); 
-}
-        :
-        joinType? JOIN tableReference joinSpecification
-                ->
-                        ^(JOIN tableReference joinType? joinSpecification)
-        ;
-
-complexTable
-@init
-{
-    paraphrases.push("in complexTable"); 
-}
-@after
-{
-    paraphrases.pop(); 
-}
-        :
-        (LPAREN singleTable joinedTable+ RPAREN) => LPAREN singleTable joinedTable+ RPAREN
-                ->
-                        ^(SOURCE singleTable joinedTable+)
-        | LPAREN complexTable RPAREN
-                -> complexTable
-        ;
-
-joinType
-        :
-        INNER
-                -> INNER
-        | LEFT OUTER?
-                -> LEFT
-        ;
-
-joinSpecification
-@init
-{
-    paraphrases.push("in join condition"); 
-}
-@after
-{
-    paraphrases.pop(); 
-}
-        :
-        ON lhs=columnReference EQUALS rhs=columnReference
-                ->
-                        ^(ON $lhs EQUALS $rhs)
-        ;
-/*
- * Broken out the left recursion from the spec 
- */
-
-
-whereClause
-@init
-{
-    paraphrases.push("in where"); 
-}
-@after
-{
-    paraphrases.pop(); 
-}
-        :
-        WHERE searchOrCondition
-                -> searchOrCondition
-        ;
-
-/**
- * Broken left recursion.
- */
-searchOrCondition
-        :
-        searchAndCondition (OR searchAndCondition)*
-                ->
-                        ^(DISJUNCTION searchAndCondition+)
-        ;
-
-/**
- * Broken left recursion.
- */
-searchAndCondition
-        :
-        searchNotCondition (AND searchNotCondition)*
-                ->
-                        ^(CONJUNCTION searchNotCondition+)
-        ;
-
-searchNotCondition
-        :
-        NOT searchTest
-                ->
-                        ^(NEGATION searchTest)
-        | searchTest
-                -> searchTest
-        ;
-
-searchTest
-        :
-        predicate
-                -> predicate
-        | LPAREN searchOrCondition RPAREN
-                -> searchOrCondition
-        ;
-
-predicate
-        :
-        comparisonPredicate
-        | inPredicate
-        | likePredicate
-        | nullPredicate
-        | quantifiedComparisonPredicate
-        | quantifiedInPredicate
-        | textSearchPredicate
-        | folderPredicate
-        ;
-
-comparisonPredicate
-        :
-        valueExpression compOp literalOrParameterName
-                ->
-                        ^(PRED_COMPARISON SINGLE_VALUED_PROPERTY valueExpression compOp literalOrParameterName)
-        ;
-
-compOp
-        :
-        EQUALS
-        | NOTEQUALS
-        | LESSTHAN
-        | GREATERTHAN
-        | LESSTHANOREQUALS
-        | GREATERTHANOREQUALS
-        ;
-
-literalOrParameterName
-        :
-        literal
-        | {strict == false}?=> parameterName
-        ;
-
-literal
-        :
-        signedNumericLiteral
-        | characterStringLiteral
-        | booleanLiteral
-        | datetimeLiteral
-        ;
-
-inPredicate
-        :
-        columnReference NOT? IN LPAREN inValueList RPAREN
-                ->
-                        ^(PRED_IN SINGLE_VALUED_PROPERTY columnReference inValueList NOT?)
-        ;
-
-inValueList
-        :
-        literalOrParameterName (COMMA literalOrParameterName)*
-                ->
-                        ^(LIST literalOrParameterName+)
-        ;
-
-likePredicate
-        :
-        columnReference NOT? LIKE characterStringLiteral
-                ->
-                        ^(PRED_LIKE columnReference characterStringLiteral NOT?)
-        ;
-
-nullPredicate
-        :
-        columnReference IS NULL
-                ->
-                        ^(PRED_EXISTS columnReference NOT)
-        | columnReference IS NOT NULL
-                ->
-                        ^(PRED_EXISTS columnReference)
-        ;
-
-quantifiedComparisonPredicate
-        :
-        literalOrParameterName compOp ANY columnReference
-                ->
-                        ^(PRED_COMPARISON ANY literalOrParameterName compOp columnReference)
-        ;
-
-quantifiedInPredicate
-        :
-        ANY columnReference NOT? IN LPAREN inValueList RPAREN
-                ->
-                        ^(PRED_IN ANY columnReference inValueList NOT?)
-        ;
-
-textSearchPredicate
-        :
-        CONTAINS LPAREN (qualifier COMMA)? textSearchExpression RPAREN
-                ->
-                        ^(PRED_FTS textSearchExpression qualifier?)
-        ;
-
-folderPredicate
-        :
-        IN_FOLDER folderPredicateArgs
-                ->
-                        ^(PRED_CHILD folderPredicateArgs)
-        | IN_TREE folderPredicateArgs
-                ->
-                        ^(PRED_DESCENDANT folderPredicateArgs)
-        ;
-
-folderPredicateArgs
-        :
-        LPAREN (qualifier COMMA)? folderId RPAREN
-                -> folderId qualifier?
-        ;
-
-orderByClause
-@init
-{
-    paraphrases.push("in order by"); 
-}
-@after
-{
-    paraphrases.pop(); 
-}
-        :
-        ORDER BY sortSpecification (COMMA sortSpecification)*
-                ->
-                        ^(ORDER sortSpecification+)
-        ;
-
-sortSpecification
-        :
-        columnReference
-                ->
-                        ^(SORT_SPECIFICATION columnReference ASC)
-        | columnReference
-        (
-                by=ASC
-                | by=DESC
-        )
-                ->
-                        ^(SORT_SPECIFICATION columnReference $by)
-        ;
-
-correlationName
-        :
-        identifier
-        ;
-/*
- * Parse time validation of the table name
- * TODO  wire up the look a head
- */
-
-
-tableName
-        :
-        identifier
-                -> identifier
-        ;
-
-columnName
-        :
-        identifier
-                -> identifier
-        ;
-
-parameterName
-        :
-        COLON identifier
-                ->
-                        ^(PARAMETER identifier)
-        ;
-
-folderId
-        :
-        characterStringLiteral
-                -> characterStringLiteral
-        ;
-
-textSearchExpression
-        :
-        QUOTED_STRING
-        ;
-
-identifier
-        :
-        ID
-                -> ID
-        | {strict == false}?=> DOUBLE_QUOTE keyWordOrId DOUBLE_QUOTE
-                ->
-                        ^(keyWordOrId)
-        ;
-
-signedNumericLiteral
-        :
-        FLOATING_POINT_LITERAL
-                ->
-                        ^(NUMERIC_LITERAL FLOATING_POINT_LITERAL)
-        | integerLiteral
-                -> integerLiteral
-        ;
-
-integerLiteral
-        :
-        DECIMAL_INTEGER_LITERAL
-                ->
-                        ^(NUMERIC_LITERAL DECIMAL_INTEGER_LITERAL)
-        ;
-
-booleanLiteral
-        :
-        TRUE
-                ->
-                        ^(BOOLEAN_LITERAL TRUE)
-        | FALSE
-                ->
-                        ^(BOOLEAN_LITERAL FALSE)
-        ;
-
-datetimeLiteral
-        :
-        TIMESTAMP QUOTED_STRING
-                ->
-                        ^(DATETIME_LITERAL QUOTED_STRING)
-        ;
-
-characterStringLiteral
-        :
-        QUOTED_STRING
-                ->
-                        ^(STRING_LITERAL QUOTED_STRING)
-        ;
-
-keyWord
-        :
-        SELECT
-        | AS
-        | FROM
-        | JOIN
-        | INNER
-        | LEFT
-        | OUTER
-        | ON
-        | WHERE
-        | OR
-        | AND
-        | NOT
-        | IN
-        | LIKE
-        | IS
-        | NULL
-        | ANY
-        | CONTAINS
-        | IN_FOLDER
-        | IN_TREE
-        | ORDER
-        | BY
-        | ASC
-        | DESC
-        | TIMESTAMP
-        | TRUE
-        | FALSE
-        | cmisFunction
-        ;
-
-cmisFunction
-        :
-        SCORE
-                -> SCORE
-        ;
-
-keyWordOrId
-        :
-        keyWord
-                -> keyWord
-        | ID
-                -> ID
-        ;
-/*
- * LEXER
- */
-/*
- * Quoted strings take precedence
- */
-
-
-
-QUOTED_STRING
-        :
-        '\''
-        (
-                ~('\'' | '\\')
-                | '\\' .
-        )*
-        '\''
-        ;
-
-SELECT
-        :
-        (
-                'S'
-                | 's'
-        )
-        (
-                'E'
-                | 'e'
-        )
-        (
-                'L'
-                | 'l'
-        )
-        (
-                'E'
-                | 'e'
-        )
-        (
-                'C'
-                | 'c'
-        )
-        (
-                'T'
-                | 't'
-        )
-        ;
-
-AS
-        :
-        (
-                'A'
-                | 'a'
-        )
-        (
-                'S'
-                | 's'
-        )
-        ;
-
-FROM
-        :
-        (
-                'F'
-                | 'f'
-        )
-        (
-                'R'
-                | 'r'
-        )
-        (
-                'O'
-                | 'o'
-        )
-        (
-                'M'
-                | 'm'
-        )
-        ;
-
-JOIN
-        :
-        (
-                'J'
-                | 'j'
-        )
-        (
-                'O'
-                | 'o'
-        )
-        (
-                'I'
-                | 'i'
-        )
-        (
-                'N'
-                | 'n'
-        )
-        ;
-
-INNER
-        :
-        (
-                'I'
-                | 'i'
-        )
-        (
-                'N'
-                | 'n'
-        )
-        (
-                'N'
-                | 'n'
-        )
-        (
-                'E'
-                | 'e'
-        )
-        (
-                'R'
-                | 'r'
-        )
-        ;
-
-LEFT
-        :
-        (
-                'L'
-                | 'l'
-        )
-        (
-                'E'
-                | 'e'
-        )
-        (
-                'F'
-                | 'f'
-        )
-        (
-                'T'
-                | 't'
-        )
-        ;
-
-OUTER
-        :
-        (
-                'O'
-                | 'o'
-        )
-        (
-                'U'
-                | 'u'
-        )
-        (
-                'T'
-                | 't'
-        )
-        (
-                'E'
-                | 'e'
-        )
-        (
-                'R'
-                | 'r'
-        )
-        ;
-
-ON
-        :
-        (
-                'O'
-                | 'o'
-        )
-        (
-                'N'
-                | 'n'
-        )
-        ;
-
-WHERE
-        :
-        (
-                'W'
-                | 'w'
-        )
-        (
-                'H'
-                | 'h'
-        )
-        (
-                'E'
-                | 'e'
-        )
-        (
-                'R'
-                | 'r'
-        )
-        (
-                'E'
-                | 'e'
-        )
-        ;
-
-OR
-        :
-        (
-                'O'
-                | 'o'
-        )
-        (
-                'R'
-                | 'r'
-        )
-        ;
-
-AND
-        :
-        (
-                'A'
-                | 'a'
-        )
-        (
-                'N'
-                | 'n'
-        )
-        (
-                'D'
-                | 'd'
-        )
-        ;
-
-NOT
-        :
-        (
-                'N'
-                | 'n'
-        )
-        (
-                'O'
-                | 'o'
-        )
-        (
-                'T'
-                | 't'
-        )
-        ;
-
-IN
-        :
-        (
-                'I'
-                | 'i'
-        )
-        (
-                'N'
-                | 'n'
-        )
-        ;
-
-LIKE
-        :
-        (
-                'L'
-                | 'l'
-        )
-        (
-                'I'
-                | 'i'
-        )
-        (
-                'K'
-                | 'k'
-        )
-        (
-                'E'
-                | 'e'
-        )
-        ;
-
-IS
-        :
-        (
-                'I'
-                | 'i'
-        )
-        (
-                'S'
-                | 's'
-        )
-        ;
-
-NULL
-        :
-        (
-                'N'
-                | 'n'
-        )
-        (
-                'U'
-                | 'u'
-        )
-        (
-                'L'
-                | 'l'
-        )
-        (
-                'L'
-                | 'l'
-        )
-        ;
-
-ANY
-        :
-        (
-                'A'
-                | 'a'
-        )
-        (
-                'N'
-                | 'n'
-        )
-        (
-                'Y'
-                | 'y'
-        )
-        ;
-
-CONTAINS
-        :
-        (
-                'C'
-                | 'c'
-        )
-        (
-                'O'
-                | 'o'
-        )
-        (
-                'N'
-                | 'n'
-        )
-        (
-                'T'
-                | 't'
-        )
-        (
-                'A'
-                | 'a'
-        )
-        (
-                'I'
-                | 'i'
-        )
-        (
-                'N'
-                | 'n'
-        )
-        (
-                'S'
-                | 's'
-        )
-        ;
-
-IN_FOLDER
-        :
-        (
-                'I'
-                | 'i'
-        )
-        (
-                'N'
-                | 'n'
-        )
-        '_'
-        (
-                'F'
-                | 'f'
-        )
-        (
-                'O'
-                | 'o'
-        )
-        (
-                'L'
-                | 'l'
-        )
-        (
-                'D'
-                | 'd'
-        )
-        (
-                'E'
-                | 'e'
-        )
-        (
-                'R'
-                | 'r'
-        )
-        ;
-
-IN_TREE
-        :
-        (
-                'I'
-                | 'i'
-        )
-        (
-                'N'
-                | 'n'
-        )
-        '_'
-        (
-                'T'
-                | 't'
-        )
-        (
-                'R'
-                | 'r'
-        )
-        (
-                'E'
-                | 'e'
-        )
-        (
-                'E'
-                | 'e'
-        )
-        ;
-
-ORDER
-        :
-        (
-                'O'
-                | 'o'
-        )
-        (
-                'R'
-                | 'r'
-        )
-        (
-                'D'
-                | 'd'
-        )
-        (
-                'E'
-                | 'e'
-        )
-        (
-                'R'
-                | 'r'
-        )
-        ;
-
-BY
-        :
-        (
-                'B'
-                | 'b'
-        )
-        (
-                'Y'
-                | 'y'
-        )
-        ;
-
-ASC
-        :
-        (
-                'A'
-                | 'a'
-        )
-        (
-                'S'
-                | 's'
-        )
-        (
-                'C'
-                | 'c'
-        )
-        ;
-
-DESC
-        :
-        (
-                'D'
-                | 'd'
-        )
-        (
-                'E'
-                | 'e'
-        )
-        (
-                'S'
-                | 's'
-        )
-        (
-                'C'
-                | 'c'
-        )
-        ;
-
-TIMESTAMP
-        :
-        (
-                'T'
-                | 't'
-        )
-        (
-                'I'
-                | 'i'
-        )
-        (
-                'M'
-                | 'm'
-        )
-        (
-                'E'
-                | 'e'
-        )
-        (
-                'S'
-                | 's'
-        )
-        (
-                'T'
-                | 't'
-        )
-        (
-                'A'
-                | 'a'
-        )
-        (
-                'M'
-                | 'm'
-        )
-        (
-                'P'
-                | 'p'
-        )
-        ;
-
-TRUE
-        :
-        (
-                'T'
-                | 't'
-        )
-        (
-                'R'
-                | 'r'
-        )
-        (
-                'U'
-                | 'u'
-        )
-        (
-                'E'
-                | 'e'
-        )
-        ;
-
-FALSE
-        :
-        (
-                'F'
-                | 'f'
-        )
-        (
-                'A'
-                | 'a'
-        )
-        (
-                'L'
-                | 'l'
-        )
-        (
-                'S'
-                | 's'
-        )
-        (
-                'E'
-                | 'e'
-        )
-        ;
-
-SCORE
-        :
-        (
-                'S'
-                | 's'
-        )
-        (
-                'C'
-                | 'c'
-        )
-        (
-                'O'
-                | 'o'
-        )
-        (
-                'R'
-                | 'r'
-        )
-        (
-                'E'
-                | 'e'
-        )
-        ;
-
-LPAREN
-        :
-        '('
-        ;
-
-RPAREN
-        :
-        ')'
-        ;
-
-STAR
-        :
-        '*'
-        ;
-
-COMMA
-        :
-        ','
-        ;
-
-DOTSTAR
-        :
-        '.*'
-        ;
-
-DOT
-        :
-        '.'
-        ;
-
-DOTDOT
-        :
-        '..'
-        ;
-
-EQUALS
-        :
-        '='
-        ;
-
-TILDA
-        :
-        '~'
-        ;
-
-NOTEQUALS
-        :
-        '<>'
-        ;
-
-GREATERTHAN
-        :
-        '>'
-        ;
-
-LESSTHAN
-        :
-        '<'
-        ;
-
-GREATERTHANOREQUALS
-        :
-        '>='
-        ;
-
-LESSTHANOREQUALS
-        :
-        '<='
-        ;
-
-COLON
-        :
-        ':'
-        ;
-
-DOUBLE_QUOTE
-        :
-        '"'
-        ;
-/*
- * Decimal adapted from the Java spec 
- */
-
-
-DECIMAL_INTEGER_LITERAL
-        :
-        (
-                PLUS
-                | MINUS
-        )?
-        DECIMAL_NUMERAL
-        ;
-/*
- * Floating point adapted from the Java spec 
- */
-
-
-FLOATING_POINT_LITERAL
-        :
-        (
-                PLUS
-                | MINUS
-        )?
-        DIGIT+ DOT DIGIT* EXPONENT?
-        |
-        (
-                PLUS
-                | MINUS
-        )?
-        DOT DIGIT+ EXPONENT?
-        |
-        (
-                PLUS
-                | MINUS
-        )?
-        DIGIT+ EXPONENT
-        ;
-
-/**
- * We should support _x????_ encoding for invalid sql characters 
- */
-ID
-        :
-        (
-                'a'..'z'
-                | 'A'..'Z'
-                | '_'
-        )
-        (
-                'a'..'z'
-                | 'A'..'Z'
-                | '0'..'9'
-                | '_'
-                | ':'
-                | '$'
-                | '#'
-        )*
-        ;
-
-WS
-        :
-        (
-                ' '
-                | '\t'
-                | '\r'
-                | '\n'
-        )+
-        { $channel = HIDDEN; }
-        ;
-
-/**   
- * Fragments for decimal
- */
-fragment
-DECIMAL_NUMERAL
-        :
-        ZERO_DIGIT
-        | NON_ZERO_DIGIT DIGIT*
-        ;
-
-fragment
-DIGIT
-        :
-        ZERO_DIGIT
-        | NON_ZERO_DIGIT
-        ;
-
-fragment
-ZERO_DIGIT
-        :
-        '0'
-        ;
-
-fragment
-NON_ZERO_DIGIT
-        :
-        '1'..'9'
-        ;
-
-fragment
-PLUS
-        :
-        '+'
-        ;
-
-fragment
-MINUS
-        :
-        '-'
-        ;
-
-fragment
-E
-        :
-        (
-                'e'
-                | 'E'
-        )
-        ;
-/*
- * Fragments for floating point
- */
-
-
-fragment
-EXPONENT
-        :
-        E SIGNED_INTEGER
-        ;
-
-fragment
-SIGNED_INTEGER
-        :
-        (
-                PLUS
-                | MINUS
-        )?
-        DIGIT+
-        ;
diff --git a/source/java/org/alfresco/repo/search/impl/parsers/CMIS.tokens b/source/java/org/alfresco/repo/search/impl/parsers/CMIS.tokens
deleted file mode 100644
index a7e83111a3..0000000000
--- a/source/java/org/alfresco/repo/search/impl/parsers/CMIS.tokens
+++ /dev/null
@@ -1,86 +0,0 @@
-QUERY=4
-ALL_COLUMNS=5
-COLUMN=6
-COLUMNS=7
-COLUMN_REF=8
-QUALIFIER=9
-FUNCTION=10
-SOURCE=11
-TABLE=12
-TABLE_REF=13
-PARAMETER=14
-CONJUNCTION=15
-DISJUNCTION=16
-NEGATION=17
-PRED_COMPARISON=18
-PRED_IN=19
-PRED_EXISTS=20
-PRED_LIKE=21
-PRED_FTS=22
-LIST=23
-PRED_CHILD=24
-PRED_DESCENDANT=25
-SORT_SPECIFICATION=26
-NUMERIC_LITERAL=27
-STRING_LITERAL=28
-DATETIME_LITERAL=29
-BOOLEAN_LITERAL=30
-SINGLE_VALUED_PROPERTY=31
-SELECT=32
-STAR=33
-COMMA=34
-AS=35
-DOTSTAR=36
-DOT=37
-LPAREN=38
-RPAREN=39
-FROM=40
-JOIN=41
-INNER=42
-LEFT=43
-OUTER=44
-ON=45
-EQUALS=46
-WHERE=47
-OR=48
-AND=49
-NOT=50
-NOTEQUALS=51
-LESSTHAN=52
-GREATERTHAN=53
-LESSTHANOREQUALS=54
-GREATERTHANOREQUALS=55
-IN=56
-LIKE=57
-IS=58
-NULL=59
-ANY=60
-CONTAINS=61
-IN_FOLDER=62
-IN_TREE=63
-ORDER=64
-BY=65
-ASC=66
-DESC=67
-COLON=68
-QUOTED_STRING=69
-ID=70
-DOUBLE_QUOTE=71
-FLOATING_POINT_LITERAL=72
-DECIMAL_INTEGER_LITERAL=73
-TRUE=74
-FALSE=75
-TIMESTAMP=76
-SCORE=77
-DOTDOT=78
-TILDA=79
-PLUS=80
-MINUS=81
-DECIMAL_NUMERAL=82
-DIGIT=83
-EXPONENT=84
-WS=85
-ZERO_DIGIT=86
-NON_ZERO_DIGIT=87
-E=88
-SIGNED_INTEGER=89
diff --git a/source/java/org/alfresco/repo/search/impl/parsers/CMISLexer.java b/source/java/org/alfresco/repo/search/impl/parsers/CMISLexer.java
deleted file mode 100644
index 5400272539..0000000000
--- a/source/java/org/alfresco/repo/search/impl/parsers/CMISLexer.java
+++ /dev/null
@@ -1,3604 +0,0 @@
-// $ANTLR 3.3 Nov 30, 2010 12:50:56 W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g 2011-04-26 17:09:21
-
-    package org.alfresco.repo.search.impl.parsers;
-    import org.alfresco.cmis.CMISQueryException;
-
-
-import org.antlr.runtime.*;
-import java.util.Stack;
-import java.util.List;
-import java.util.ArrayList;
-
-public class CMISLexer extends Lexer {
-    public static final int EOF=-1;
-    public static final int QUERY=4;
-    public static final int ALL_COLUMNS=5;
-    public static final int COLUMN=6;
-    public static final int COLUMNS=7;
-    public static final int COLUMN_REF=8;
-    public static final int QUALIFIER=9;
-    public static final int FUNCTION=10;
-    public static final int SOURCE=11;
-    public static final int TABLE=12;
-    public static final int TABLE_REF=13;
-    public static final int PARAMETER=14;
-    public static final int CONJUNCTION=15;
-    public static final int DISJUNCTION=16;
-    public static final int NEGATION=17;
-    public static final int PRED_COMPARISON=18;
-    public static final int PRED_IN=19;
-    public static final int PRED_EXISTS=20;
-    public static final int PRED_LIKE=21;
-    public static final int PRED_FTS=22;
-    public static final int LIST=23;
-    public static final int PRED_CHILD=24;
-    public static final int PRED_DESCENDANT=25;
-    public static final int SORT_SPECIFICATION=26;
-    public static final int NUMERIC_LITERAL=27;
-    public static final int STRING_LITERAL=28;
-    public static final int DATETIME_LITERAL=29;
-    public static final int BOOLEAN_LITERAL=30;
-    public static final int SINGLE_VALUED_PROPERTY=31;
-    public static final int SELECT=32;
-    public static final int STAR=33;
-    public static final int COMMA=34;
-    public static final int AS=35;
-    public static final int DOTSTAR=36;
-    public static final int DOT=37;
-    public static final int LPAREN=38;
-    public static final int RPAREN=39;
-    public static final int FROM=40;
-    public static final int JOIN=41;
-    public static final int INNER=42;
-    public static final int LEFT=43;
-    public static final int OUTER=44;
-    public static final int ON=45;
-    public static final int EQUALS=46;
-    public static final int WHERE=47;
-    public static final int OR=48;
-    public static final int AND=49;
-    public static final int NOT=50;
-    public static final int NOTEQUALS=51;
-    public static final int LESSTHAN=52;
-    public static final int GREATERTHAN=53;
-    public static final int LESSTHANOREQUALS=54;
-    public static final int GREATERTHANOREQUALS=55;
-    public static final int IN=56;
-    public static final int LIKE=57;
-    public static final int IS=58;
-    public static final int NULL=59;
-    public static final int ANY=60;
-    public static final int CONTAINS=61;
-    public static final int IN_FOLDER=62;
-    public static final int IN_TREE=63;
-    public static final int ORDER=64;
-    public static final int BY=65;
-    public static final int ASC=66;
-    public static final int DESC=67;
-    public static final int COLON=68;
-    public static final int QUOTED_STRING=69;
-    public static final int ID=70;
-    public static final int DOUBLE_QUOTE=71;
-    public static final int FLOATING_POINT_LITERAL=72;
-    public static final int DECIMAL_INTEGER_LITERAL=73;
-    public static final int TRUE=74;
-    public static final int FALSE=75;
-    public static final int TIMESTAMP=76;
-    public static final int SCORE=77;
-    public static final int DOTDOT=78;
-    public static final int TILDA=79;
-    public static final int PLUS=80;
-    public static final int MINUS=81;
-    public static final int DECIMAL_NUMERAL=82;
-    public static final int DIGIT=83;
-    public static final int EXPONENT=84;
-    public static final int WS=85;
-    public static final int ZERO_DIGIT=86;
-    public static final int NON_ZERO_DIGIT=87;
-    public static final int E=88;
-    public static final int SIGNED_INTEGER=89;
-
-        public Token nextToken() {
-            while (true) 
-            {
-                state.token = null;
-                state.channel = Token.DEFAULT_CHANNEL;
-                state.tokenStartCharIndex = input.index();
-                state.tokenStartCharPositionInLine = input.getCharPositionInLine();
-                state.tokenStartLine = input.getLine();
-                state.text = null;
-                if ( input.LA(1)==CharStream.EOF ) 
-                {
-                    return Token.EOF_TOKEN;
-                }
-                try 
-                {
-                    mTokens();
-                    if ( state.token==null ) 
-                    {
-                        emit();
-                    }
-                    else if ( state.token==Token.SKIP_TOKEN ) 
-                    {
-                        continue;
-                    }
-                    return state.token;
-                }
-                catch (RecognitionException re) 
-                {
-                    throw new CMISQueryException(getErrorString(re), re);
-                }
-            }
-        }
-        
-        public String getErrorString(RecognitionException e)
-        {
-            String hdr = getErrorHeader(e);
-            String msg = getErrorMessage(e, this.getTokenNames());
-            return hdr+" "+msg;
-        }
-
-
-    // delegates
-    // delegators
-
-    public CMISLexer() {;} 
-    public CMISLexer(CharStream input) {
-        this(input, new RecognizerSharedState());
-    }
-    public CMISLexer(CharStream input, RecognizerSharedState state) {
-        super(input,state);
-
-    }
-    public String getGrammarFileName() { return "W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g"; }
-
-    // $ANTLR start "QUOTED_STRING"
-    public final void mQUOTED_STRING() throws RecognitionException {
-        try {
-            int _type = QUOTED_STRING;
-            int _channel = DEFAULT_TOKEN_CHANNEL;
-            // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:853:9: ( '\\'' (~ ( '\\'' | '\\\\' ) | '\\\\' . )* '\\'' )
-            // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:854:9: '\\'' (~ ( '\\'' | '\\\\' ) | '\\\\' . )* '\\''
-            {
-            match('\''); 
-            // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:855:9: (~ ( '\\'' | '\\\\' ) | '\\\\' . )*
-            loop1:
-            do {
-                int alt1=3;
-                int LA1_0 = input.LA(1);
-
-                if ( ((LA1_0>='\u0000' && LA1_0<='&')||(LA1_0>='(' && LA1_0<='[')||(LA1_0>=']' && LA1_0<='\uFFFF')) ) {
-                    alt1=1;
-                }
-                else if ( (LA1_0=='\\') ) {
-                    alt1=2;
-                }
-
-
-                switch (alt1) {
-            	case 1 :
-            	    // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:856:17: ~ ( '\\'' | '\\\\' )
-            	    {
-            	    if ( (input.LA(1)>='\u0000' && input.LA(1)<='&')||(input.LA(1)>='(' && input.LA(1)<='[')||(input.LA(1)>=']' && input.LA(1)<='\uFFFF') ) {
-            	        input.consume();
-
-            	    }
-            	    else {
-            	        MismatchedSetException mse = new MismatchedSetException(null,input);
-            	        recover(mse);
-            	        throw mse;}
-
-
-            	    }
-            	    break;
-            	case 2 :
-            	    // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:857:19: '\\\\' .
-            	    {
-            	    match('\\'); 
-            	    matchAny(); 
-
-            	    }
-            	    break;
-
-            	default :
-            	    break loop1;
-                }
-            } while (true);
-
-            match('\''); 
-
-            }
-
-            state.type = _type;
-            state.channel = _channel;
-        }
-        finally {
-        }
-    }
-    // $ANTLR end "QUOTED_STRING"
-
-    // $ANTLR start "SELECT"
-    public final void mSELECT() throws RecognitionException {
-        try {
-            int _type = SELECT;
-            int _channel = DEFAULT_TOKEN_CHANNEL;
-            // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:863:9: ( ( 'S' | 's' ) ( 'E' | 'e' ) ( 'L' | 'l' ) ( 'E' | 'e' ) ( 'C' | 'c' ) ( 'T' | 't' ) )
-            // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:864:9: ( 'S' | 's' ) ( 'E' | 'e' ) ( 'L' | 'l' ) ( 'E' | 'e' ) ( 'C' | 'c' ) ( 'T' | 't' )
-            {
-            if ( input.LA(1)=='S'||input.LA(1)=='s' ) {
-                input.consume();
-
-            }
-            else {
-                MismatchedSetException mse = new MismatchedSetException(null,input);
-                recover(mse);
-                throw mse;}
-
-            if ( input.LA(1)=='E'||input.LA(1)=='e' ) {
-                input.consume();
-
-            }
-            else {
-                MismatchedSetException mse = new MismatchedSetException(null,input);
-                recover(mse);
-                throw mse;}
-
-            if ( input.LA(1)=='L'||input.LA(1)=='l' ) {
-                input.consume();
-
-            }
-            else {
-                MismatchedSetException mse = new MismatchedSetException(null,input);
-                recover(mse);
-                throw mse;}
-
-            if ( input.LA(1)=='E'||input.LA(1)=='e' ) {
-                input.consume();
-
-            }
-            else {
-                MismatchedSetException mse = new MismatchedSetException(null,input);
-                recover(mse);
-                throw mse;}
-
-            if ( input.LA(1)=='C'||input.LA(1)=='c' ) {
-                input.consume();
-
-            }
-            else {
-                MismatchedSetException mse = new MismatchedSetException(null,input);
-                recover(mse);
-                throw mse;}
-
-            if ( input.LA(1)=='T'||input.LA(1)=='t' ) {
-                input.consume();
-
-            }
-            else {
-                MismatchedSetException mse = new MismatchedSetException(null,input);
-                recover(mse);
-                throw mse;}
-
-
-            }
-
-            state.type = _type;
-            state.channel = _channel;
-        }
-        finally {
-        }
-    }
-    // $ANTLR end "SELECT"
-
-    // $ANTLR start "AS"
-    public final void mAS() throws RecognitionException {
-        try {
-            int _type = AS;
-            int _channel = DEFAULT_TOKEN_CHANNEL;
-            // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:891:9: ( ( 'A' | 'a' ) ( 'S' | 's' ) )
-            // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:892:9: ( 'A' | 'a' ) ( 'S' | 's' )
-            {
-            if ( input.LA(1)=='A'||input.LA(1)=='a' ) {
-                input.consume();
-
-            }
-            else {
-                MismatchedSetException mse = new MismatchedSetException(null,input);
-                recover(mse);
-                throw mse;}
-
-            if ( input.LA(1)=='S'||input.LA(1)=='s' ) {
-                input.consume();
-
-            }
-            else {
-                MismatchedSetException mse = new MismatchedSetException(null,input);
-                recover(mse);
-                throw mse;}
-
-
-            }
-
-            state.type = _type;
-            state.channel = _channel;
-        }
-        finally {
-        }
-    }
-    // $ANTLR end "AS"
-
-    // $ANTLR start "FROM"
-    public final void mFROM() throws RecognitionException {
-        try {
-            int _type = FROM;
-            int _channel = DEFAULT_TOKEN_CHANNEL;
-            // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:903:9: ( ( 'F' | 'f' ) ( 'R' | 'r' ) ( 'O' | 'o' ) ( 'M' | 'm' ) )
-            // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:904:9: ( 'F' | 'f' ) ( 'R' | 'r' ) ( 'O' | 'o' ) ( 'M' | 'm' )
-            {
-            if ( input.LA(1)=='F'||input.LA(1)=='f' ) {
-                input.consume();
-
-            }
-            else {
-                MismatchedSetException mse = new MismatchedSetException(null,input);
-                recover(mse);
-                throw mse;}
-
-            if ( input.LA(1)=='R'||input.LA(1)=='r' ) {
-                input.consume();
-
-            }
-            else {
-                MismatchedSetException mse = new MismatchedSetException(null,input);
-                recover(mse);
-                throw mse;}
-
-            if ( input.LA(1)=='O'||input.LA(1)=='o' ) {
-                input.consume();
-
-            }
-            else {
-                MismatchedSetException mse = new MismatchedSetException(null,input);
-                recover(mse);
-                throw mse;}
-
-            if ( input.LA(1)=='M'||input.LA(1)=='m' ) {
-                input.consume();
-
-            }
-            else {
-                MismatchedSetException mse = new MismatchedSetException(null,input);
-                recover(mse);
-                throw mse;}
-
-
-            }
-
-            state.type = _type;
-            state.channel = _channel;
-        }
-        finally {
-        }
-    }
-    // $ANTLR end "FROM"
-
-    // $ANTLR start "JOIN"
-    public final void mJOIN() throws RecognitionException {
-        try {
-            int _type = JOIN;
-            int _channel = DEFAULT_TOKEN_CHANNEL;
-            // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:923:9: ( ( 'J' | 'j' ) ( 'O' | 'o' ) ( 'I' | 'i' ) ( 'N' | 'n' ) )
-            // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:924:9: ( 'J' | 'j' ) ( 'O' | 'o' ) ( 'I' | 'i' ) ( 'N' | 'n' )
-            {
-            if ( input.LA(1)=='J'||input.LA(1)=='j' ) {
-                input.consume();
-
-            }
-            else {
-                MismatchedSetException mse = new MismatchedSetException(null,input);
-                recover(mse);
-                throw mse;}
-
-            if ( input.LA(1)=='O'||input.LA(1)=='o' ) {
-                input.consume();
-
-            }
-            else {
-                MismatchedSetException mse = new MismatchedSetException(null,input);
-                recover(mse);
-                throw mse;}
-
-            if ( input.LA(1)=='I'||input.LA(1)=='i' ) {
-                input.consume();
-
-            }
-            else {
-                MismatchedSetException mse = new MismatchedSetException(null,input);
-                recover(mse);
-                throw mse;}
-
-            if ( input.LA(1)=='N'||input.LA(1)=='n' ) {
-                input.consume();
-
-            }
-            else {
-                MismatchedSetException mse = new MismatchedSetException(null,input);
-                recover(mse);
-                throw mse;}
-
-
-            }
-
-            state.type = _type;
-            state.channel = _channel;
-        }
-        finally {
-        }
-    }
-    // $ANTLR end "JOIN"
-
-    // $ANTLR start "INNER"
-    public final void mINNER() throws RecognitionException {
-        try {
-            int _type = INNER;
-            int _channel = DEFAULT_TOKEN_CHANNEL;
-            // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:943:9: ( ( 'I' | 'i' ) ( 'N' | 'n' ) ( 'N' | 'n' ) ( 'E' | 'e' ) ( 'R' | 'r' ) )
-            // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:944:9: ( 'I' | 'i' ) ( 'N' | 'n' ) ( 'N' | 'n' ) ( 'E' | 'e' ) ( 'R' | 'r' )
-            {
-            if ( input.LA(1)=='I'||input.LA(1)=='i' ) {
-                input.consume();
-
-            }
-            else {
-                MismatchedSetException mse = new MismatchedSetException(null,input);
-                recover(mse);
-                throw mse;}
-
-            if ( input.LA(1)=='N'||input.LA(1)=='n' ) {
-                input.consume();
-
-            }
-            else {
-                MismatchedSetException mse = new MismatchedSetException(null,input);
-                recover(mse);
-                throw mse;}
-
-            if ( input.LA(1)=='N'||input.LA(1)=='n' ) {
-                input.consume();
-
-            }
-            else {
-                MismatchedSetException mse = new MismatchedSetException(null,input);
-                recover(mse);
-                throw mse;}
-
-            if ( input.LA(1)=='E'||input.LA(1)=='e' ) {
-                input.consume();
-
-            }
-            else {
-                MismatchedSetException mse = new MismatchedSetException(null,input);
-                recover(mse);
-                throw mse;}
-
-            if ( input.LA(1)=='R'||input.LA(1)=='r' ) {
-                input.consume();
-
-            }
-            else {
-                MismatchedSetException mse = new MismatchedSetException(null,input);
-                recover(mse);
-                throw mse;}
-
-
-            }
-
-            state.type = _type;
-            state.channel = _channel;
-        }
-        finally {
-        }
-    }
-    // $ANTLR end "INNER"
-
-    // $ANTLR start "LEFT"
-    public final void mLEFT() throws RecognitionException {
-        try {
-            int _type = LEFT;
-            int _channel = DEFAULT_TOKEN_CHANNEL;
-            // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:967:9: ( ( 'L' | 'l' ) ( 'E' | 'e' ) ( 'F' | 'f' ) ( 'T' | 't' ) )
-            // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:968:9: ( 'L' | 'l' ) ( 'E' | 'e' ) ( 'F' | 'f' ) ( 'T' | 't' )
-            {
-            if ( input.LA(1)=='L'||input.LA(1)=='l' ) {
-                input.consume();
-
-            }
-            else {
-                MismatchedSetException mse = new MismatchedSetException(null,input);
-                recover(mse);
-                throw mse;}
-
-            if ( input.LA(1)=='E'||input.LA(1)=='e' ) {
-                input.consume();
-
-            }
-            else {
-                MismatchedSetException mse = new MismatchedSetException(null,input);
-                recover(mse);
-                throw mse;}
-
-            if ( input.LA(1)=='F'||input.LA(1)=='f' ) {
-                input.consume();
-
-            }
-            else {
-                MismatchedSetException mse = new MismatchedSetException(null,input);
-                recover(mse);
-                throw mse;}
-
-            if ( input.LA(1)=='T'||input.LA(1)=='t' ) {
-                input.consume();
-
-            }
-            else {
-                MismatchedSetException mse = new MismatchedSetException(null,input);
-                recover(mse);
-                throw mse;}
-
-
-            }
-
-            state.type = _type;
-            state.channel = _channel;
-        }
-        finally {
-        }
-    }
-    // $ANTLR end "LEFT"
-
-    // $ANTLR start "OUTER"
-    public final void mOUTER() throws RecognitionException {
-        try {
-            int _type = OUTER;
-            int _channel = DEFAULT_TOKEN_CHANNEL;
-            // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:987:9: ( ( 'O' | 'o' ) ( 'U' | 'u' ) ( 'T' | 't' ) ( 'E' | 'e' ) ( 'R' | 'r' ) )
-            // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:988:9: ( 'O' | 'o' ) ( 'U' | 'u' ) ( 'T' | 't' ) ( 'E' | 'e' ) ( 'R' | 'r' )
-            {
-            if ( input.LA(1)=='O'||input.LA(1)=='o' ) {
-                input.consume();
-
-            }
-            else {
-                MismatchedSetException mse = new MismatchedSetException(null,input);
-                recover(mse);
-                throw mse;}
-
-            if ( input.LA(1)=='U'||input.LA(1)=='u' ) {
-                input.consume();
-
-            }
-            else {
-                MismatchedSetException mse = new MismatchedSetException(null,input);
-                recover(mse);
-                throw mse;}
-
-            if ( input.LA(1)=='T'||input.LA(1)=='t' ) {
-                input.consume();
-
-            }
-            else {
-                MismatchedSetException mse = new MismatchedSetException(null,input);
-                recover(mse);
-                throw mse;}
-
-            if ( input.LA(1)=='E'||input.LA(1)=='e' ) {
-                input.consume();
-
-            }
-            else {
-                MismatchedSetException mse = new MismatchedSetException(null,input);
-                recover(mse);
-                throw mse;}
-
-            if ( input.LA(1)=='R'||input.LA(1)=='r' ) {
-                input.consume();
-
-            }
-            else {
-                MismatchedSetException mse = new MismatchedSetException(null,input);
-                recover(mse);
-                throw mse;}
-
-
-            }
-
-            state.type = _type;
-            state.channel = _channel;
-        }
-        finally {
-        }
-    }
-    // $ANTLR end "OUTER"
-
-    // $ANTLR start "ON"
-    public final void mON() throws RecognitionException {
-        try {
-            int _type = ON;
-            int _channel = DEFAULT_TOKEN_CHANNEL;
-            // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:1011:9: ( ( 'O' | 'o' ) ( 'N' | 'n' ) )
-            // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:1012:9: ( 'O' | 'o' ) ( 'N' | 'n' )
-            {
-            if ( input.LA(1)=='O'||input.LA(1)=='o' ) {
-                input.consume();
-
-            }
-            else {
-                MismatchedSetException mse = new MismatchedSetException(null,input);
-                recover(mse);
-                throw mse;}
-
-            if ( input.LA(1)=='N'||input.LA(1)=='n' ) {
-                input.consume();
-
-            }
-            else {
-                MismatchedSetException mse = new MismatchedSetException(null,input);
-                recover(mse);
-                throw mse;}
-
-
-            }
-
-            state.type = _type;
-            state.channel = _channel;
-        }
-        finally {
-        }
-    }
-    // $ANTLR end "ON"
-
-    // $ANTLR start "WHERE"
-    public final void mWHERE() throws RecognitionException {
-        try {
-            int _type = WHERE;
-            int _channel = DEFAULT_TOKEN_CHANNEL;
-            // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:1023:9: ( ( 'W' | 'w' ) ( 'H' | 'h' ) ( 'E' | 'e' ) ( 'R' | 'r' ) ( 'E' | 'e' ) )
-            // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:1024:9: ( 'W' | 'w' ) ( 'H' | 'h' ) ( 'E' | 'e' ) ( 'R' | 'r' ) ( 'E' | 'e' )
-            {
-            if ( input.LA(1)=='W'||input.LA(1)=='w' ) {
-                input.consume();
-
-            }
-            else {
-                MismatchedSetException mse = new MismatchedSetException(null,input);
-                recover(mse);
-                throw mse;}
-
-            if ( input.LA(1)=='H'||input.LA(1)=='h' ) {
-                input.consume();
-
-            }
-            else {
-                MismatchedSetException mse = new MismatchedSetException(null,input);
-                recover(mse);
-                throw mse;}
-
-            if ( input.LA(1)=='E'||input.LA(1)=='e' ) {
-                input.consume();
-
-            }
-            else {
-                MismatchedSetException mse = new MismatchedSetException(null,input);
-                recover(mse);
-                throw mse;}
-
-            if ( input.LA(1)=='R'||input.LA(1)=='r' ) {
-                input.consume();
-
-            }
-            else {
-                MismatchedSetException mse = new MismatchedSetException(null,input);
-                recover(mse);
-                throw mse;}
-
-            if ( input.LA(1)=='E'||input.LA(1)=='e' ) {
-                input.consume();
-
-            }
-            else {
-                MismatchedSetException mse = new MismatchedSetException(null,input);
-                recover(mse);
-                throw mse;}
-
-
-            }
-
-            state.type = _type;
-            state.channel = _channel;
-        }
-        finally {
-        }
-    }
-    // $ANTLR end "WHERE"
-
-    // $ANTLR start "OR"
-    public final void mOR() throws RecognitionException {
-        try {
-            int _type = OR;
-            int _channel = DEFAULT_TOKEN_CHANNEL;
-            // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:1047:9: ( ( 'O' | 'o' ) ( 'R' | 'r' ) )
-            // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:1048:9: ( 'O' | 'o' ) ( 'R' | 'r' )
-            {
-            if ( input.LA(1)=='O'||input.LA(1)=='o' ) {
-                input.consume();
-
-            }
-            else {
-                MismatchedSetException mse = new MismatchedSetException(null,input);
-                recover(mse);
-                throw mse;}
-
-            if ( input.LA(1)=='R'||input.LA(1)=='r' ) {
-                input.consume();
-
-            }
-            else {
-                MismatchedSetException mse = new MismatchedSetException(null,input);
-                recover(mse);
-                throw mse;}
-
-
-            }
-
-            state.type = _type;
-            state.channel = _channel;
-        }
-        finally {
-        }
-    }
-    // $ANTLR end "OR"
-
-    // $ANTLR start "AND"
-    public final void mAND() throws RecognitionException {
-        try {
-            int _type = AND;
-            int _channel = DEFAULT_TOKEN_CHANNEL;
-            // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:1059:9: ( ( 'A' | 'a' ) ( 'N' | 'n' ) ( 'D' | 'd' ) )
-            // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:1060:9: ( 'A' | 'a' ) ( 'N' | 'n' ) ( 'D' | 'd' )
-            {
-            if ( input.LA(1)=='A'||input.LA(1)=='a' ) {
-                input.consume();
-
-            }
-            else {
-                MismatchedSetException mse = new MismatchedSetException(null,input);
-                recover(mse);
-                throw mse;}
-
-            if ( input.LA(1)=='N'||input.LA(1)=='n' ) {
-                input.consume();
-
-            }
-            else {
-                MismatchedSetException mse = new MismatchedSetException(null,input);
-                recover(mse);
-                throw mse;}
-
-            if ( input.LA(1)=='D'||input.LA(1)=='d' ) {
-                input.consume();
-
-            }
-            else {
-                MismatchedSetException mse = new MismatchedSetException(null,input);
-                recover(mse);
-                throw mse;}
-
-
-            }
-
-            state.type = _type;
-            state.channel = _channel;
-        }
-        finally {
-        }
-    }
-    // $ANTLR end "AND"
-
-    // $ANTLR start "NOT"
-    public final void mNOT() throws RecognitionException {
-        try {
-            int _type = NOT;
-            int _channel = DEFAULT_TOKEN_CHANNEL;
-            // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:1075:9: ( ( 'N' | 'n' ) ( 'O' | 'o' ) ( 'T' | 't' ) )
-            // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:1076:9: ( 'N' | 'n' ) ( 'O' | 'o' ) ( 'T' | 't' )
-            {
-            if ( input.LA(1)=='N'||input.LA(1)=='n' ) {
-                input.consume();
-
-            }
-            else {
-                MismatchedSetException mse = new MismatchedSetException(null,input);
-                recover(mse);
-                throw mse;}
-
-            if ( input.LA(1)=='O'||input.LA(1)=='o' ) {
-                input.consume();
-
-            }
-            else {
-                MismatchedSetException mse = new MismatchedSetException(null,input);
-                recover(mse);
-                throw mse;}
-
-            if ( input.LA(1)=='T'||input.LA(1)=='t' ) {
-                input.consume();
-
-            }
-            else {
-                MismatchedSetException mse = new MismatchedSetException(null,input);
-                recover(mse);
-                throw mse;}
-
-
-            }
-
-            state.type = _type;
-            state.channel = _channel;
-        }
-        finally {
-        }
-    }
-    // $ANTLR end "NOT"
-
-    // $ANTLR start "IN"
-    public final void mIN() throws RecognitionException {
-        try {
-            int _type = IN;
-            int _channel = DEFAULT_TOKEN_CHANNEL;
-            // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:1091:9: ( ( 'I' | 'i' ) ( 'N' | 'n' ) )
-            // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:1092:9: ( 'I' | 'i' ) ( 'N' | 'n' )
-            {
-            if ( input.LA(1)=='I'||input.LA(1)=='i' ) {
-                input.consume();
-
-            }
-            else {
-                MismatchedSetException mse = new MismatchedSetException(null,input);
-                recover(mse);
-                throw mse;}
-
-            if ( input.LA(1)=='N'||input.LA(1)=='n' ) {
-                input.consume();
-
-            }
-            else {
-                MismatchedSetException mse = new MismatchedSetException(null,input);
-                recover(mse);
-                throw mse;}
-
-
-            }
-
-            state.type = _type;
-            state.channel = _channel;
-        }
-        finally {
-        }
-    }
-    // $ANTLR end "IN"
-
-    // $ANTLR start "LIKE"
-    public final void mLIKE() throws RecognitionException {
-        try {
-            int _type = LIKE;
-            int _channel = DEFAULT_TOKEN_CHANNEL;
-            // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:1103:9: ( ( 'L' | 'l' ) ( 'I' | 'i' ) ( 'K' | 'k' ) ( 'E' | 'e' ) )
-            // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:1104:9: ( 'L' | 'l' ) ( 'I' | 'i' ) ( 'K' | 'k' ) ( 'E' | 'e' )
-            {
-            if ( input.LA(1)=='L'||input.LA(1)=='l' ) {
-                input.consume();
-
-            }
-            else {
-                MismatchedSetException mse = new MismatchedSetException(null,input);
-                recover(mse);
-                throw mse;}
-
-            if ( input.LA(1)=='I'||input.LA(1)=='i' ) {
-                input.consume();
-
-            }
-            else {
-                MismatchedSetException mse = new MismatchedSetException(null,input);
-                recover(mse);
-                throw mse;}
-
-            if ( input.LA(1)=='K'||input.LA(1)=='k' ) {
-                input.consume();
-
-            }
-            else {
-                MismatchedSetException mse = new MismatchedSetException(null,input);
-                recover(mse);
-                throw mse;}
-
-            if ( input.LA(1)=='E'||input.LA(1)=='e' ) {
-                input.consume();
-
-            }
-            else {
-                MismatchedSetException mse = new MismatchedSetException(null,input);
-                recover(mse);
-                throw mse;}
-
-
-            }
-
-            state.type = _type;
-            state.channel = _channel;
-        }
-        finally {
-        }
-    }
-    // $ANTLR end "LIKE"
-
-    // $ANTLR start "IS"
-    public final void mIS() throws RecognitionException {
-        try {
-            int _type = IS;
-            int _channel = DEFAULT_TOKEN_CHANNEL;
-            // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:1123:9: ( ( 'I' | 'i' ) ( 'S' | 's' ) )
-            // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:1124:9: ( 'I' | 'i' ) ( 'S' | 's' )
-            {
-            if ( input.LA(1)=='I'||input.LA(1)=='i' ) {
-                input.consume();
-
-            }
-            else {
-                MismatchedSetException mse = new MismatchedSetException(null,input);
-                recover(mse);
-                throw mse;}
-
-            if ( input.LA(1)=='S'||input.LA(1)=='s' ) {
-                input.consume();
-
-            }
-            else {
-                MismatchedSetException mse = new MismatchedSetException(null,input);
-                recover(mse);
-                throw mse;}
-
-
-            }
-
-            state.type = _type;
-            state.channel = _channel;
-        }
-        finally {
-        }
-    }
-    // $ANTLR end "IS"
-
-    // $ANTLR start "NULL"
-    public final void mNULL() throws RecognitionException {
-        try {
-            int _type = NULL;
-            int _channel = DEFAULT_TOKEN_CHANNEL;
-            // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:1135:9: ( ( 'N' | 'n' ) ( 'U' | 'u' ) ( 'L' | 'l' ) ( 'L' | 'l' ) )
-            // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:1136:9: ( 'N' | 'n' ) ( 'U' | 'u' ) ( 'L' | 'l' ) ( 'L' | 'l' )
-            {
-            if ( input.LA(1)=='N'||input.LA(1)=='n' ) {
-                input.consume();
-
-            }
-            else {
-                MismatchedSetException mse = new MismatchedSetException(null,input);
-                recover(mse);
-                throw mse;}
-
-            if ( input.LA(1)=='U'||input.LA(1)=='u' ) {
-                input.consume();
-
-            }
-            else {
-                MismatchedSetException mse = new MismatchedSetException(null,input);
-                recover(mse);
-                throw mse;}
-
-            if ( input.LA(1)=='L'||input.LA(1)=='l' ) {
-                input.consume();
-
-            }
-            else {
-                MismatchedSetException mse = new MismatchedSetException(null,input);
-                recover(mse);
-                throw mse;}
-
-            if ( input.LA(1)=='L'||input.LA(1)=='l' ) {
-                input.consume();
-
-            }
-            else {
-                MismatchedSetException mse = new MismatchedSetException(null,input);
-                recover(mse);
-                throw mse;}
-
-
-            }
-
-            state.type = _type;
-            state.channel = _channel;
-        }
-        finally {
-        }
-    }
-    // $ANTLR end "NULL"
-
-    // $ANTLR start "ANY"
-    public final void mANY() throws RecognitionException {
-        try {
-            int _type = ANY;
-            int _channel = DEFAULT_TOKEN_CHANNEL;
-            // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:1155:9: ( ( 'A' | 'a' ) ( 'N' | 'n' ) ( 'Y' | 'y' ) )
-            // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:1156:9: ( 'A' | 'a' ) ( 'N' | 'n' ) ( 'Y' | 'y' )
-            {
-            if ( input.LA(1)=='A'||input.LA(1)=='a' ) {
-                input.consume();
-
-            }
-            else {
-                MismatchedSetException mse = new MismatchedSetException(null,input);
-                recover(mse);
-                throw mse;}
-
-            if ( input.LA(1)=='N'||input.LA(1)=='n' ) {
-                input.consume();
-
-            }
-            else {
-                MismatchedSetException mse = new MismatchedSetException(null,input);
-                recover(mse);
-                throw mse;}
-
-            if ( input.LA(1)=='Y'||input.LA(1)=='y' ) {
-                input.consume();
-
-            }
-            else {
-                MismatchedSetException mse = new MismatchedSetException(null,input);
-                recover(mse);
-                throw mse;}
-
-
-            }
-
-            state.type = _type;
-            state.channel = _channel;
-        }
-        finally {
-        }
-    }
-    // $ANTLR end "ANY"
-
-    // $ANTLR start "CONTAINS"
-    public final void mCONTAINS() throws RecognitionException {
-        try {
-            int _type = CONTAINS;
-            int _channel = DEFAULT_TOKEN_CHANNEL;
-            // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:1171:9: ( ( 'C' | 'c' ) ( 'O' | 'o' ) ( 'N' | 'n' ) ( 'T' | 't' ) ( 'A' | 'a' ) ( 'I' | 'i' ) ( 'N' | 'n' ) ( 'S' | 's' ) )
-            // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:1172:9: ( 'C' | 'c' ) ( 'O' | 'o' ) ( 'N' | 'n' ) ( 'T' | 't' ) ( 'A' | 'a' ) ( 'I' | 'i' ) ( 'N' | 'n' ) ( 'S' | 's' )
-            {
-            if ( input.LA(1)=='C'||input.LA(1)=='c' ) {
-                input.consume();
-
-            }
-            else {
-                MismatchedSetException mse = new MismatchedSetException(null,input);
-                recover(mse);
-                throw mse;}
-
-            if ( input.LA(1)=='O'||input.LA(1)=='o' ) {
-                input.consume();
-
-            }
-            else {
-                MismatchedSetException mse = new MismatchedSetException(null,input);
-                recover(mse);
-                throw mse;}
-
-            if ( input.LA(1)=='N'||input.LA(1)=='n' ) {
-                input.consume();
-
-            }
-            else {
-                MismatchedSetException mse = new MismatchedSetException(null,input);
-                recover(mse);
-                throw mse;}
-
-            if ( input.LA(1)=='T'||input.LA(1)=='t' ) {
-                input.consume();
-
-            }
-            else {
-                MismatchedSetException mse = new MismatchedSetException(null,input);
-                recover(mse);
-                throw mse;}
-
-            if ( input.LA(1)=='A'||input.LA(1)=='a' ) {
-                input.consume();
-
-            }
-            else {
-                MismatchedSetException mse = new MismatchedSetException(null,input);
-                recover(mse);
-                throw mse;}
-
-            if ( input.LA(1)=='I'||input.LA(1)=='i' ) {
-                input.consume();
-
-            }
-            else {
-                MismatchedSetException mse = new MismatchedSetException(null,input);
-                recover(mse);
-                throw mse;}
-
-            if ( input.LA(1)=='N'||input.LA(1)=='n' ) {
-                input.consume();
-
-            }
-            else {
-                MismatchedSetException mse = new MismatchedSetException(null,input);
-                recover(mse);
-                throw mse;}
-
-            if ( input.LA(1)=='S'||input.LA(1)=='s' ) {
-                input.consume();
-
-            }
-            else {
-                MismatchedSetException mse = new MismatchedSetException(null,input);
-                recover(mse);
-                throw mse;}
-
-
-            }
-
-            state.type = _type;
-            state.channel = _channel;
-        }
-        finally {
-        }
-    }
-    // $ANTLR end "CONTAINS"
-
-    // $ANTLR start "IN_FOLDER"
-    public final void mIN_FOLDER() throws RecognitionException {
-        try {
-            int _type = IN_FOLDER;
-            int _channel = DEFAULT_TOKEN_CHANNEL;
-            // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:1207:9: ( ( 'I' | 'i' ) ( 'N' | 'n' ) '_' ( 'F' | 'f' ) ( 'O' | 'o' ) ( 'L' | 'l' ) ( 'D' | 'd' ) ( 'E' | 'e' ) ( 'R' | 'r' ) )
-            // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:1208:9: ( 'I' | 'i' ) ( 'N' | 'n' ) '_' ( 'F' | 'f' ) ( 'O' | 'o' ) ( 'L' | 'l' ) ( 'D' | 'd' ) ( 'E' | 'e' ) ( 'R' | 'r' )
-            {
-            if ( input.LA(1)=='I'||input.LA(1)=='i' ) {
-                input.consume();
-
-            }
-            else {
-                MismatchedSetException mse = new MismatchedSetException(null,input);
-                recover(mse);
-                throw mse;}
-
-            if ( input.LA(1)=='N'||input.LA(1)=='n' ) {
-                input.consume();
-
-            }
-            else {
-                MismatchedSetException mse = new MismatchedSetException(null,input);
-                recover(mse);
-                throw mse;}
-
-            match('_'); 
-            if ( input.LA(1)=='F'||input.LA(1)=='f' ) {
-                input.consume();
-
-            }
-            else {
-                MismatchedSetException mse = new MismatchedSetException(null,input);
-                recover(mse);
-                throw mse;}
-
-            if ( input.LA(1)=='O'||input.LA(1)=='o' ) {
-                input.consume();
-
-            }
-            else {
-                MismatchedSetException mse = new MismatchedSetException(null,input);
-                recover(mse);
-                throw mse;}
-
-            if ( input.LA(1)=='L'||input.LA(1)=='l' ) {
-                input.consume();
-
-            }
-            else {
-                MismatchedSetException mse = new MismatchedSetException(null,input);
-                recover(mse);
-                throw mse;}
-
-            if ( input.LA(1)=='D'||input.LA(1)=='d' ) {
-                input.consume();
-
-            }
-            else {
-                MismatchedSetException mse = new MismatchedSetException(null,input);
-                recover(mse);
-                throw mse;}
-
-            if ( input.LA(1)=='E'||input.LA(1)=='e' ) {
-                input.consume();
-
-            }
-            else {
-                MismatchedSetException mse = new MismatchedSetException(null,input);
-                recover(mse);
-                throw mse;}
-
-            if ( input.LA(1)=='R'||input.LA(1)=='r' ) {
-                input.consume();
-
-            }
-            else {
-                MismatchedSetException mse = new MismatchedSetException(null,input);
-                recover(mse);
-                throw mse;}
-
-
-            }
-
-            state.type = _type;
-            state.channel = _channel;
-        }
-        finally {
-        }
-    }
-    // $ANTLR end "IN_FOLDER"
-
-    // $ANTLR start "IN_TREE"
-    public final void mIN_TREE() throws RecognitionException {
-        try {
-            int _type = IN_TREE;
-            int _channel = DEFAULT_TOKEN_CHANNEL;
-            // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:1244:9: ( ( 'I' | 'i' ) ( 'N' | 'n' ) '_' ( 'T' | 't' ) ( 'R' | 'r' ) ( 'E' | 'e' ) ( 'E' | 'e' ) )
-            // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:1245:9: ( 'I' | 'i' ) ( 'N' | 'n' ) '_' ( 'T' | 't' ) ( 'R' | 'r' ) ( 'E' | 'e' ) ( 'E' | 'e' )
-            {
-            if ( input.LA(1)=='I'||input.LA(1)=='i' ) {
-                input.consume();
-
-            }
-            else {
-                MismatchedSetException mse = new MismatchedSetException(null,input);
-                recover(mse);
-                throw mse;}
-
-            if ( input.LA(1)=='N'||input.LA(1)=='n' ) {
-                input.consume();
-
-            }
-            else {
-                MismatchedSetException mse = new MismatchedSetException(null,input);
-                recover(mse);
-                throw mse;}
-
-            match('_'); 
-            if ( input.LA(1)=='T'||input.LA(1)=='t' ) {
-                input.consume();
-
-            }
-            else {
-                MismatchedSetException mse = new MismatchedSetException(null,input);
-                recover(mse);
-                throw mse;}
-
-            if ( input.LA(1)=='R'||input.LA(1)=='r' ) {
-                input.consume();
-
-            }
-            else {
-                MismatchedSetException mse = new MismatchedSetException(null,input);
-                recover(mse);
-                throw mse;}
-
-            if ( input.LA(1)=='E'||input.LA(1)=='e' ) {
-                input.consume();
-
-            }
-            else {
-                MismatchedSetException mse = new MismatchedSetException(null,input);
-                recover(mse);
-                throw mse;}
-
-            if ( input.LA(1)=='E'||input.LA(1)=='e' ) {
-                input.consume();
-
-            }
-            else {
-                MismatchedSetException mse = new MismatchedSetException(null,input);
-                recover(mse);
-                throw mse;}
-
-
-            }
-
-            state.type = _type;
-            state.channel = _channel;
-        }
-        finally {
-        }
-    }
-    // $ANTLR end "IN_TREE"
-
-    // $ANTLR start "ORDER"
-    public final void mORDER() throws RecognitionException {
-        try {
-            int _type = ORDER;
-            int _channel = DEFAULT_TOKEN_CHANNEL;
-            // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:1273:9: ( ( 'O' | 'o' ) ( 'R' | 'r' ) ( 'D' | 'd' ) ( 'E' | 'e' ) ( 'R' | 'r' ) )
-            // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:1274:9: ( 'O' | 'o' ) ( 'R' | 'r' ) ( 'D' | 'd' ) ( 'E' | 'e' ) ( 'R' | 'r' )
-            {
-            if ( input.LA(1)=='O'||input.LA(1)=='o' ) {
-                input.consume();
-
-            }
-            else {
-                MismatchedSetException mse = new MismatchedSetException(null,input);
-                recover(mse);
-                throw mse;}
-
-            if ( input.LA(1)=='R'||input.LA(1)=='r' ) {
-                input.consume();
-
-            }
-            else {
-                MismatchedSetException mse = new MismatchedSetException(null,input);
-                recover(mse);
-                throw mse;}
-
-            if ( input.LA(1)=='D'||input.LA(1)=='d' ) {
-                input.consume();
-
-            }
-            else {
-                MismatchedSetException mse = new MismatchedSetException(null,input);
-                recover(mse);
-                throw mse;}
-
-            if ( input.LA(1)=='E'||input.LA(1)=='e' ) {
-                input.consume();
-
-            }
-            else {
-                MismatchedSetException mse = new MismatchedSetException(null,input);
-                recover(mse);
-                throw mse;}
-
-            if ( input.LA(1)=='R'||input.LA(1)=='r' ) {
-                input.consume();
-
-            }
-            else {
-                MismatchedSetException mse = new MismatchedSetException(null,input);
-                recover(mse);
-                throw mse;}
-
-
-            }
-
-            state.type = _type;
-            state.channel = _channel;
-        }
-        finally {
-        }
-    }
-    // $ANTLR end "ORDER"
-
-    // $ANTLR start "BY"
-    public final void mBY() throws RecognitionException {
-        try {
-            int _type = BY;
-            int _channel = DEFAULT_TOKEN_CHANNEL;
-            // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:1297:9: ( ( 'B' | 'b' ) ( 'Y' | 'y' ) )
-            // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:1298:9: ( 'B' | 'b' ) ( 'Y' | 'y' )
-            {
-            if ( input.LA(1)=='B'||input.LA(1)=='b' ) {
-                input.consume();
-
-            }
-            else {
-                MismatchedSetException mse = new MismatchedSetException(null,input);
-                recover(mse);
-                throw mse;}
-
-            if ( input.LA(1)=='Y'||input.LA(1)=='y' ) {
-                input.consume();
-
-            }
-            else {
-                MismatchedSetException mse = new MismatchedSetException(null,input);
-                recover(mse);
-                throw mse;}
-
-
-            }
-
-            state.type = _type;
-            state.channel = _channel;
-        }
-        finally {
-        }
-    }
-    // $ANTLR end "BY"
-
-    // $ANTLR start "ASC"
-    public final void mASC() throws RecognitionException {
-        try {
-            int _type = ASC;
-            int _channel = DEFAULT_TOKEN_CHANNEL;
-            // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:1309:9: ( ( 'A' | 'a' ) ( 'S' | 's' ) ( 'C' | 'c' ) )
-            // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:1310:9: ( 'A' | 'a' ) ( 'S' | 's' ) ( 'C' | 'c' )
-            {
-            if ( input.LA(1)=='A'||input.LA(1)=='a' ) {
-                input.consume();
-
-            }
-            else {
-                MismatchedSetException mse = new MismatchedSetException(null,input);
-                recover(mse);
-                throw mse;}
-
-            if ( input.LA(1)=='S'||input.LA(1)=='s' ) {
-                input.consume();
-
-            }
-            else {
-                MismatchedSetException mse = new MismatchedSetException(null,input);
-                recover(mse);
-                throw mse;}
-
-            if ( input.LA(1)=='C'||input.LA(1)=='c' ) {
-                input.consume();
-
-            }
-            else {
-                MismatchedSetException mse = new MismatchedSetException(null,input);
-                recover(mse);
-                throw mse;}
-
-
-            }
-
-            state.type = _type;
-            state.channel = _channel;
-        }
-        finally {
-        }
-    }
-    // $ANTLR end "ASC"
-
-    // $ANTLR start "DESC"
-    public final void mDESC() throws RecognitionException {
-        try {
-            int _type = DESC;
-            int _channel = DEFAULT_TOKEN_CHANNEL;
-            // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:1325:9: ( ( 'D' | 'd' ) ( 'E' | 'e' ) ( 'S' | 's' ) ( 'C' | 'c' ) )
-            // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:1326:9: ( 'D' | 'd' ) ( 'E' | 'e' ) ( 'S' | 's' ) ( 'C' | 'c' )
-            {
-            if ( input.LA(1)=='D'||input.LA(1)=='d' ) {
-                input.consume();
-
-            }
-            else {
-                MismatchedSetException mse = new MismatchedSetException(null,input);
-                recover(mse);
-                throw mse;}
-
-            if ( input.LA(1)=='E'||input.LA(1)=='e' ) {
-                input.consume();
-
-            }
-            else {
-                MismatchedSetException mse = new MismatchedSetException(null,input);
-                recover(mse);
-                throw mse;}
-
-            if ( input.LA(1)=='S'||input.LA(1)=='s' ) {
-                input.consume();
-
-            }
-            else {
-                MismatchedSetException mse = new MismatchedSetException(null,input);
-                recover(mse);
-                throw mse;}
-
-            if ( input.LA(1)=='C'||input.LA(1)=='c' ) {
-                input.consume();
-
-            }
-            else {
-                MismatchedSetException mse = new MismatchedSetException(null,input);
-                recover(mse);
-                throw mse;}
-
-
-            }
-
-            state.type = _type;
-            state.channel = _channel;
-        }
-        finally {
-        }
-    }
-    // $ANTLR end "DESC"
-
-    // $ANTLR start "TIMESTAMP"
-    public final void mTIMESTAMP() throws RecognitionException {
-        try {
-            int _type = TIMESTAMP;
-            int _channel = DEFAULT_TOKEN_CHANNEL;
-            // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:1345:9: ( ( 'T' | 't' ) ( 'I' | 'i' ) ( 'M' | 'm' ) ( 'E' | 'e' ) ( 'S' | 's' ) ( 'T' | 't' ) ( 'A' | 'a' ) ( 'M' | 'm' ) ( 'P' | 'p' ) )
-            // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:1346:9: ( 'T' | 't' ) ( 'I' | 'i' ) ( 'M' | 'm' ) ( 'E' | 'e' ) ( 'S' | 's' ) ( 'T' | 't' ) ( 'A' | 'a' ) ( 'M' | 'm' ) ( 'P' | 'p' )
-            {
-            if ( input.LA(1)=='T'||input.LA(1)=='t' ) {
-                input.consume();
-
-            }
-            else {
-                MismatchedSetException mse = new MismatchedSetException(null,input);
-                recover(mse);
-                throw mse;}
-
-            if ( input.LA(1)=='I'||input.LA(1)=='i' ) {
-                input.consume();
-
-            }
-            else {
-                MismatchedSetException mse = new MismatchedSetException(null,input);
-                recover(mse);
-                throw mse;}
-
-            if ( input.LA(1)=='M'||input.LA(1)=='m' ) {
-                input.consume();
-
-            }
-            else {
-                MismatchedSetException mse = new MismatchedSetException(null,input);
-                recover(mse);
-                throw mse;}
-
-            if ( input.LA(1)=='E'||input.LA(1)=='e' ) {
-                input.consume();
-
-            }
-            else {
-                MismatchedSetException mse = new MismatchedSetException(null,input);
-                recover(mse);
-                throw mse;}
-
-            if ( input.LA(1)=='S'||input.LA(1)=='s' ) {
-                input.consume();
-
-            }
-            else {
-                MismatchedSetException mse = new MismatchedSetException(null,input);
-                recover(mse);
-                throw mse;}
-
-            if ( input.LA(1)=='T'||input.LA(1)=='t' ) {
-                input.consume();
-
-            }
-            else {
-                MismatchedSetException mse = new MismatchedSetException(null,input);
-                recover(mse);
-                throw mse;}
-
-            if ( input.LA(1)=='A'||input.LA(1)=='a' ) {
-                input.consume();
-
-            }
-            else {
-                MismatchedSetException mse = new MismatchedSetException(null,input);
-                recover(mse);
-                throw mse;}
-
-            if ( input.LA(1)=='M'||input.LA(1)=='m' ) {
-                input.consume();
-
-            }
-            else {
-                MismatchedSetException mse = new MismatchedSetException(null,input);
-                recover(mse);
-                throw mse;}
-
-            if ( input.LA(1)=='P'||input.LA(1)=='p' ) {
-                input.consume();
-
-            }
-            else {
-                MismatchedSetException mse = new MismatchedSetException(null,input);
-                recover(mse);
-                throw mse;}
-
-
-            }
-
-            state.type = _type;
-            state.channel = _channel;
-        }
-        finally {
-        }
-    }
-    // $ANTLR end "TIMESTAMP"
-
-    // $ANTLR start "TRUE"
-    public final void mTRUE() throws RecognitionException {
-        try {
-            int _type = TRUE;
-            int _channel = DEFAULT_TOKEN_CHANNEL;
-            // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:1385:9: ( ( 'T' | 't' ) ( 'R' | 'r' ) ( 'U' | 'u' ) ( 'E' | 'e' ) )
-            // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:1386:9: ( 'T' | 't' ) ( 'R' | 'r' ) ( 'U' | 'u' ) ( 'E' | 'e' )
-            {
-            if ( input.LA(1)=='T'||input.LA(1)=='t' ) {
-                input.consume();
-
-            }
-            else {
-                MismatchedSetException mse = new MismatchedSetException(null,input);
-                recover(mse);
-                throw mse;}
-
-            if ( input.LA(1)=='R'||input.LA(1)=='r' ) {
-                input.consume();
-
-            }
-            else {
-                MismatchedSetException mse = new MismatchedSetException(null,input);
-                recover(mse);
-                throw mse;}
-
-            if ( input.LA(1)=='U'||input.LA(1)=='u' ) {
-                input.consume();
-
-            }
-            else {
-                MismatchedSetException mse = new MismatchedSetException(null,input);
-                recover(mse);
-                throw mse;}
-
-            if ( input.LA(1)=='E'||input.LA(1)=='e' ) {
-                input.consume();
-
-            }
-            else {
-                MismatchedSetException mse = new MismatchedSetException(null,input);
-                recover(mse);
-                throw mse;}
-
-
-            }
-
-            state.type = _type;
-            state.channel = _channel;
-        }
-        finally {
-        }
-    }
-    // $ANTLR end "TRUE"
-
-    // $ANTLR start "FALSE"
-    public final void mFALSE() throws RecognitionException {
-        try {
-            int _type = FALSE;
-            int _channel = DEFAULT_TOKEN_CHANNEL;
-            // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:1405:9: ( ( 'F' | 'f' ) ( 'A' | 'a' ) ( 'L' | 'l' ) ( 'S' | 's' ) ( 'E' | 'e' ) )
-            // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:1406:9: ( 'F' | 'f' ) ( 'A' | 'a' ) ( 'L' | 'l' ) ( 'S' | 's' ) ( 'E' | 'e' )
-            {
-            if ( input.LA(1)=='F'||input.LA(1)=='f' ) {
-                input.consume();
-
-            }
-            else {
-                MismatchedSetException mse = new MismatchedSetException(null,input);
-                recover(mse);
-                throw mse;}
-
-            if ( input.LA(1)=='A'||input.LA(1)=='a' ) {
-                input.consume();
-
-            }
-            else {
-                MismatchedSetException mse = new MismatchedSetException(null,input);
-                recover(mse);
-                throw mse;}
-
-            if ( input.LA(1)=='L'||input.LA(1)=='l' ) {
-                input.consume();
-
-            }
-            else {
-                MismatchedSetException mse = new MismatchedSetException(null,input);
-                recover(mse);
-                throw mse;}
-
-            if ( input.LA(1)=='S'||input.LA(1)=='s' ) {
-                input.consume();
-
-            }
-            else {
-                MismatchedSetException mse = new MismatchedSetException(null,input);
-                recover(mse);
-                throw mse;}
-
-            if ( input.LA(1)=='E'||input.LA(1)=='e' ) {
-                input.consume();
-
-            }
-            else {
-                MismatchedSetException mse = new MismatchedSetException(null,input);
-                recover(mse);
-                throw mse;}
-
-
-            }
-
-            state.type = _type;
-            state.channel = _channel;
-        }
-        finally {
-        }
-    }
-    // $ANTLR end "FALSE"
-
-    // $ANTLR start "SCORE"
-    public final void mSCORE() throws RecognitionException {
-        try {
-            int _type = SCORE;
-            int _channel = DEFAULT_TOKEN_CHANNEL;
-            // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:1429:9: ( ( 'S' | 's' ) ( 'C' | 'c' ) ( 'O' | 'o' ) ( 'R' | 'r' ) ( 'E' | 'e' ) )
-            // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:1430:9: ( 'S' | 's' ) ( 'C' | 'c' ) ( 'O' | 'o' ) ( 'R' | 'r' ) ( 'E' | 'e' )
-            {
-            if ( input.LA(1)=='S'||input.LA(1)=='s' ) {
-                input.consume();
-
-            }
-            else {
-                MismatchedSetException mse = new MismatchedSetException(null,input);
-                recover(mse);
-                throw mse;}
-
-            if ( input.LA(1)=='C'||input.LA(1)=='c' ) {
-                input.consume();
-
-            }
-            else {
-                MismatchedSetException mse = new MismatchedSetException(null,input);
-                recover(mse);
-                throw mse;}
-
-            if ( input.LA(1)=='O'||input.LA(1)=='o' ) {
-                input.consume();
-
-            }
-            else {
-                MismatchedSetException mse = new MismatchedSetException(null,input);
-                recover(mse);
-                throw mse;}
-
-            if ( input.LA(1)=='R'||input.LA(1)=='r' ) {
-                input.consume();
-
-            }
-            else {
-                MismatchedSetException mse = new MismatchedSetException(null,input);
-                recover(mse);
-                throw mse;}
-
-            if ( input.LA(1)=='E'||input.LA(1)=='e' ) {
-                input.consume();
-
-            }
-            else {
-                MismatchedSetException mse = new MismatchedSetException(null,input);
-                recover(mse);
-                throw mse;}
-
-
-            }
-
-            state.type = _type;
-            state.channel = _channel;
-        }
-        finally {
-        }
-    }
-    // $ANTLR end "SCORE"
-
-    // $ANTLR start "LPAREN"
-    public final void mLPAREN() throws RecognitionException {
-        try {
-            int _type = LPAREN;
-            int _channel = DEFAULT_TOKEN_CHANNEL;
-            // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:1453:9: ( '(' )
-            // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:1454:9: '('
-            {
-            match('('); 
-
-            }
-
-            state.type = _type;
-            state.channel = _channel;
-        }
-        finally {
-        }
-    }
-    // $ANTLR end "LPAREN"
-
-    // $ANTLR start "RPAREN"
-    public final void mRPAREN() throws RecognitionException {
-        try {
-            int _type = RPAREN;
-            int _channel = DEFAULT_TOKEN_CHANNEL;
-            // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:1458:9: ( ')' )
-            // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:1459:9: ')'
-            {
-            match(')'); 
-
-            }
-
-            state.type = _type;
-            state.channel = _channel;
-        }
-        finally {
-        }
-    }
-    // $ANTLR end "RPAREN"
-
-    // $ANTLR start "STAR"
-    public final void mSTAR() throws RecognitionException {
-        try {
-            int _type = STAR;
-            int _channel = DEFAULT_TOKEN_CHANNEL;
-            // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:1463:9: ( '*' )
-            // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:1464:9: '*'
-            {
-            match('*'); 
-
-            }
-
-            state.type = _type;
-            state.channel = _channel;
-        }
-        finally {
-        }
-    }
-    // $ANTLR end "STAR"
-
-    // $ANTLR start "COMMA"
-    public final void mCOMMA() throws RecognitionException {
-        try {
-            int _type = COMMA;
-            int _channel = DEFAULT_TOKEN_CHANNEL;
-            // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:1468:9: ( ',' )
-            // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:1469:9: ','
-            {
-            match(','); 
-
-            }
-
-            state.type = _type;
-            state.channel = _channel;
-        }
-        finally {
-        }
-    }
-    // $ANTLR end "COMMA"
-
-    // $ANTLR start "DOTSTAR"
-    public final void mDOTSTAR() throws RecognitionException {
-        try {
-            int _type = DOTSTAR;
-            int _channel = DEFAULT_TOKEN_CHANNEL;
-            // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:1473:9: ( '.*' )
-            // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:1474:9: '.*'
-            {
-            match(".*"); 
-
-
-            }
-
-            state.type = _type;
-            state.channel = _channel;
-        }
-        finally {
-        }
-    }
-    // $ANTLR end "DOTSTAR"
-
-    // $ANTLR start "DOT"
-    public final void mDOT() throws RecognitionException {
-        try {
-            int _type = DOT;
-            int _channel = DEFAULT_TOKEN_CHANNEL;
-            // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:1478:9: ( '.' )
-            // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:1479:9: '.'
-            {
-            match('.'); 
-
-            }
-
-            state.type = _type;
-            state.channel = _channel;
-        }
-        finally {
-        }
-    }
-    // $ANTLR end "DOT"
-
-    // $ANTLR start "DOTDOT"
-    public final void mDOTDOT() throws RecognitionException {
-        try {
-            int _type = DOTDOT;
-            int _channel = DEFAULT_TOKEN_CHANNEL;
-            // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:1483:9: ( '..' )
-            // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:1484:9: '..'
-            {
-            match(".."); 
-
-
-            }
-
-            state.type = _type;
-            state.channel = _channel;
-        }
-        finally {
-        }
-    }
-    // $ANTLR end "DOTDOT"
-
-    // $ANTLR start "EQUALS"
-    public final void mEQUALS() throws RecognitionException {
-        try {
-            int _type = EQUALS;
-            int _channel = DEFAULT_TOKEN_CHANNEL;
-            // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:1488:9: ( '=' )
-            // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:1489:9: '='
-            {
-            match('='); 
-
-            }
-
-            state.type = _type;
-            state.channel = _channel;
-        }
-        finally {
-        }
-    }
-    // $ANTLR end "EQUALS"
-
-    // $ANTLR start "TILDA"
-    public final void mTILDA() throws RecognitionException {
-        try {
-            int _type = TILDA;
-            int _channel = DEFAULT_TOKEN_CHANNEL;
-            // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:1493:9: ( '~' )
-            // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:1494:9: '~'
-            {
-            match('~'); 
-
-            }
-
-            state.type = _type;
-            state.channel = _channel;
-        }
-        finally {
-        }
-    }
-    // $ANTLR end "TILDA"
-
-    // $ANTLR start "NOTEQUALS"
-    public final void mNOTEQUALS() throws RecognitionException {
-        try {
-            int _type = NOTEQUALS;
-            int _channel = DEFAULT_TOKEN_CHANNEL;
-            // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:1498:9: ( '<>' )
-            // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:1499:9: '<>'
-            {
-            match("<>"); 
-
-
-            }
-
-            state.type = _type;
-            state.channel = _channel;
-        }
-        finally {
-        }
-    }
-    // $ANTLR end "NOTEQUALS"
-
-    // $ANTLR start "GREATERTHAN"
-    public final void mGREATERTHAN() throws RecognitionException {
-        try {
-            int _type = GREATERTHAN;
-            int _channel = DEFAULT_TOKEN_CHANNEL;
-            // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:1503:9: ( '>' )
-            // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:1504:9: '>'
-            {
-            match('>'); 
-
-            }
-
-            state.type = _type;
-            state.channel = _channel;
-        }
-        finally {
-        }
-    }
-    // $ANTLR end "GREATERTHAN"
-
-    // $ANTLR start "LESSTHAN"
-    public final void mLESSTHAN() throws RecognitionException {
-        try {
-            int _type = LESSTHAN;
-            int _channel = DEFAULT_TOKEN_CHANNEL;
-            // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:1508:9: ( '<' )
-            // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:1509:9: '<'
-            {
-            match('<'); 
-
-            }
-
-            state.type = _type;
-            state.channel = _channel;
-        }
-        finally {
-        }
-    }
-    // $ANTLR end "LESSTHAN"
-
-    // $ANTLR start "GREATERTHANOREQUALS"
-    public final void mGREATERTHANOREQUALS() throws RecognitionException {
-        try {
-            int _type = GREATERTHANOREQUALS;
-            int _channel = DEFAULT_TOKEN_CHANNEL;
-            // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:1513:9: ( '>=' )
-            // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:1514:9: '>='
-            {
-            match(">="); 
-
-
-            }
-
-            state.type = _type;
-            state.channel = _channel;
-        }
-        finally {
-        }
-    }
-    // $ANTLR end "GREATERTHANOREQUALS"
-
-    // $ANTLR start "LESSTHANOREQUALS"
-    public final void mLESSTHANOREQUALS() throws RecognitionException {
-        try {
-            int _type = LESSTHANOREQUALS;
-            int _channel = DEFAULT_TOKEN_CHANNEL;
-            // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:1518:9: ( '<=' )
-            // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:1519:9: '<='
-            {
-            match("<="); 
-
-
-            }
-
-            state.type = _type;
-            state.channel = _channel;
-        }
-        finally {
-        }
-    }
-    // $ANTLR end "LESSTHANOREQUALS"
-
-    // $ANTLR start "COLON"
-    public final void mCOLON() throws RecognitionException {
-        try {
-            int _type = COLON;
-            int _channel = DEFAULT_TOKEN_CHANNEL;
-            // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:1523:9: ( ':' )
-            // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:1524:9: ':'
-            {
-            match(':'); 
-
-            }
-
-            state.type = _type;
-            state.channel = _channel;
-        }
-        finally {
-        }
-    }
-    // $ANTLR end "COLON"
-
-    // $ANTLR start "DOUBLE_QUOTE"
-    public final void mDOUBLE_QUOTE() throws RecognitionException {
-        try {
-            int _type = DOUBLE_QUOTE;
-            int _channel = DEFAULT_TOKEN_CHANNEL;
-            // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:1528:9: ( '\"' )
-            // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:1529:9: '\"'
-            {
-            match('\"'); 
-
-            }
-
-            state.type = _type;
-            state.channel = _channel;
-        }
-        finally {
-        }
-    }
-    // $ANTLR end "DOUBLE_QUOTE"
-
-    // $ANTLR start "DECIMAL_INTEGER_LITERAL"
-    public final void mDECIMAL_INTEGER_LITERAL() throws RecognitionException {
-        try {
-            int _type = DECIMAL_INTEGER_LITERAL;
-            int _channel = DEFAULT_TOKEN_CHANNEL;
-            // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:1537:9: ( ( PLUS | MINUS )? DECIMAL_NUMERAL )
-            // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:1538:9: ( PLUS | MINUS )? DECIMAL_NUMERAL
-            {
-            // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:1538:9: ( PLUS | MINUS )?
-            int alt2=2;
-            int LA2_0 = input.LA(1);
-
-            if ( (LA2_0=='+'||LA2_0=='-') ) {
-                alt2=1;
-            }
-            switch (alt2) {
-                case 1 :
-                    // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:
-                    {
-                    if ( input.LA(1)=='+'||input.LA(1)=='-' ) {
-                        input.consume();
-
-                    }
-                    else {
-                        MismatchedSetException mse = new MismatchedSetException(null,input);
-                        recover(mse);
-                        throw mse;}
-
-
-                    }
-                    break;
-
-            }
-
-            mDECIMAL_NUMERAL(); 
-
-            }
-
-            state.type = _type;
-            state.channel = _channel;
-        }
-        finally {
-        }
-    }
-    // $ANTLR end "DECIMAL_INTEGER_LITERAL"
-
-    // $ANTLR start "FLOATING_POINT_LITERAL"
-    public final void mFLOATING_POINT_LITERAL() throws RecognitionException {
-        try {
-            int _type = FLOATING_POINT_LITERAL;
-            int _channel = DEFAULT_TOKEN_CHANNEL;
-            // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:1550:9: ( ( PLUS | MINUS )? ( DIGIT )+ DOT ( DIGIT )* ( EXPONENT )? | ( PLUS | MINUS )? DOT ( DIGIT )+ ( EXPONENT )? | ( PLUS | MINUS )? ( DIGIT )+ EXPONENT )
-            int alt12=3;
-            alt12 = dfa12.predict(input);
-            switch (alt12) {
-                case 1 :
-                    // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:1551:9: ( PLUS | MINUS )? ( DIGIT )+ DOT ( DIGIT )* ( EXPONENT )?
-                    {
-                    // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:1551:9: ( PLUS | MINUS )?
-                    int alt3=2;
-                    int LA3_0 = input.LA(1);
-
-                    if ( (LA3_0=='+'||LA3_0=='-') ) {
-                        alt3=1;
-                    }
-                    switch (alt3) {
-                        case 1 :
-                            // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:
-                            {
-                            if ( input.LA(1)=='+'||input.LA(1)=='-' ) {
-                                input.consume();
-
-                            }
-                            else {
-                                MismatchedSetException mse = new MismatchedSetException(null,input);
-                                recover(mse);
-                                throw mse;}
-
-
-                            }
-                            break;
-
-                    }
-
-                    // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:1555:9: ( DIGIT )+
-                    int cnt4=0;
-                    loop4:
-                    do {
-                        int alt4=2;
-                        int LA4_0 = input.LA(1);
-
-                        if ( ((LA4_0>='0' && LA4_0<='9')) ) {
-                            alt4=1;
-                        }
-
-
-                        switch (alt4) {
-                    	case 1 :
-                    	    // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:1555:9: DIGIT
-                    	    {
-                    	    mDIGIT(); 
-
-                    	    }
-                    	    break;
-
-                    	default :
-                    	    if ( cnt4 >= 1 ) break loop4;
-                                EarlyExitException eee =
-                                    new EarlyExitException(4, input);
-                                throw eee;
-                        }
-                        cnt4++;
-                    } while (true);
-
-                    mDOT(); 
-                    // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:1555:20: ( DIGIT )*
-                    loop5:
-                    do {
-                        int alt5=2;
-                        int LA5_0 = input.LA(1);
-
-                        if ( ((LA5_0>='0' && LA5_0<='9')) ) {
-                            alt5=1;
-                        }
-
-
-                        switch (alt5) {
-                    	case 1 :
-                    	    // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:1555:20: DIGIT
-                    	    {
-                    	    mDIGIT(); 
-
-                    	    }
-                    	    break;
-
-                    	default :
-                    	    break loop5;
-                        }
-                    } while (true);
-
-                    // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:1555:27: ( EXPONENT )?
-                    int alt6=2;
-                    int LA6_0 = input.LA(1);
-
-                    if ( (LA6_0=='E'||LA6_0=='e') ) {
-                        alt6=1;
-                    }
-                    switch (alt6) {
-                        case 1 :
-                            // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:1555:27: EXPONENT
-                            {
-                            mEXPONENT(); 
-
-                            }
-                            break;
-
-                    }
-
-
-                    }
-                    break;
-                case 2 :
-                    // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:1557:9: ( PLUS | MINUS )? DOT ( DIGIT )+ ( EXPONENT )?
-                    {
-                    // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:1557:9: ( PLUS | MINUS )?
-                    int alt7=2;
-                    int LA7_0 = input.LA(1);
-
-                    if ( (LA7_0=='+'||LA7_0=='-') ) {
-                        alt7=1;
-                    }
-                    switch (alt7) {
-                        case 1 :
-                            // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:
-                            {
-                            if ( input.LA(1)=='+'||input.LA(1)=='-' ) {
-                                input.consume();
-
-                            }
-                            else {
-                                MismatchedSetException mse = new MismatchedSetException(null,input);
-                                recover(mse);
-                                throw mse;}
-
-
-                            }
-                            break;
-
-                    }
-
-                    mDOT(); 
-                    // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:1561:13: ( DIGIT )+
-                    int cnt8=0;
-                    loop8:
-                    do {
-                        int alt8=2;
-                        int LA8_0 = input.LA(1);
-
-                        if ( ((LA8_0>='0' && LA8_0<='9')) ) {
-                            alt8=1;
-                        }
-
-
-                        switch (alt8) {
-                    	case 1 :
-                    	    // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:1561:13: DIGIT
-                    	    {
-                    	    mDIGIT(); 
-
-                    	    }
-                    	    break;
-
-                    	default :
-                    	    if ( cnt8 >= 1 ) break loop8;
-                                EarlyExitException eee =
-                                    new EarlyExitException(8, input);
-                                throw eee;
-                        }
-                        cnt8++;
-                    } while (true);
-
-                    // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:1561:20: ( EXPONENT )?
-                    int alt9=2;
-                    int LA9_0 = input.LA(1);
-
-                    if ( (LA9_0=='E'||LA9_0=='e') ) {
-                        alt9=1;
-                    }
-                    switch (alt9) {
-                        case 1 :
-                            // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:1561:20: EXPONENT
-                            {
-                            mEXPONENT(); 
-
-                            }
-                            break;
-
-                    }
-
-
-                    }
-                    break;
-                case 3 :
-                    // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:1563:9: ( PLUS | MINUS )? ( DIGIT )+ EXPONENT
-                    {
-                    // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:1563:9: ( PLUS | MINUS )?
-                    int alt10=2;
-                    int LA10_0 = input.LA(1);
-
-                    if ( (LA10_0=='+'||LA10_0=='-') ) {
-                        alt10=1;
-                    }
-                    switch (alt10) {
-                        case 1 :
-                            // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:
-                            {
-                            if ( input.LA(1)=='+'||input.LA(1)=='-' ) {
-                                input.consume();
-
-                            }
-                            else {
-                                MismatchedSetException mse = new MismatchedSetException(null,input);
-                                recover(mse);
-                                throw mse;}
-
-
-                            }
-                            break;
-
-                    }
-
-                    // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:1567:9: ( DIGIT )+
-                    int cnt11=0;
-                    loop11:
-                    do {
-                        int alt11=2;
-                        int LA11_0 = input.LA(1);
-
-                        if ( ((LA11_0>='0' && LA11_0<='9')) ) {
-                            alt11=1;
-                        }
-
-
-                        switch (alt11) {
-                    	case 1 :
-                    	    // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:1567:9: DIGIT
-                    	    {
-                    	    mDIGIT(); 
-
-                    	    }
-                    	    break;
-
-                    	default :
-                    	    if ( cnt11 >= 1 ) break loop11;
-                                EarlyExitException eee =
-                                    new EarlyExitException(11, input);
-                                throw eee;
-                        }
-                        cnt11++;
-                    } while (true);
-
-                    mEXPONENT(); 
-
-                    }
-                    break;
-
-            }
-            state.type = _type;
-            state.channel = _channel;
-        }
-        finally {
-        }
-    }
-    // $ANTLR end "FLOATING_POINT_LITERAL"
-
-    // $ANTLR start "ID"
-    public final void mID() throws RecognitionException {
-        try {
-            int _type = ID;
-            int _channel = DEFAULT_TOKEN_CHANNEL;
-            // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:1574:9: ( ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '0' .. '9' | '_' | ':' | '$' | '#' )* )
-            // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:1575:9: ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '0' .. '9' | '_' | ':' | '$' | '#' )*
-            {
-            if ( (input.LA(1)>='A' && input.LA(1)<='Z')||input.LA(1)=='_'||(input.LA(1)>='a' && input.LA(1)<='z') ) {
-                input.consume();
-
-            }
-            else {
-                MismatchedSetException mse = new MismatchedSetException(null,input);
-                recover(mse);
-                throw mse;}
-
-            // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:1580:9: ( 'a' .. 'z' | 'A' .. 'Z' | '0' .. '9' | '_' | ':' | '$' | '#' )*
-            loop13:
-            do {
-                int alt13=2;
-                int LA13_0 = input.LA(1);
-
-                if ( ((LA13_0>='#' && LA13_0<='$')||(LA13_0>='0' && LA13_0<=':')||(LA13_0>='A' && LA13_0<='Z')||LA13_0=='_'||(LA13_0>='a' && LA13_0<='z')) ) {
-                    alt13=1;
-                }
-
-
-                switch (alt13) {
-            	case 1 :
-            	    // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:
-            	    {
-            	    if ( (input.LA(1)>='#' && input.LA(1)<='$')||(input.LA(1)>='0' && input.LA(1)<=':')||(input.LA(1)>='A' && input.LA(1)<='Z')||input.LA(1)=='_'||(input.LA(1)>='a' && input.LA(1)<='z') ) {
-            	        input.consume();
-
-            	    }
-            	    else {
-            	        MismatchedSetException mse = new MismatchedSetException(null,input);
-            	        recover(mse);
-            	        throw mse;}
-
-
-            	    }
-            	    break;
-
-            	default :
-            	    break loop13;
-                }
-            } while (true);
-
-
-            }
-
-            state.type = _type;
-            state.channel = _channel;
-        }
-        finally {
-        }
-    }
-    // $ANTLR end "ID"
-
-    // $ANTLR start "WS"
-    public final void mWS() throws RecognitionException {
-        try {
-            int _type = WS;
-            int _channel = DEFAULT_TOKEN_CHANNEL;
-            // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:1592:9: ( ( ' ' | '\\t' | '\\r' | '\\n' )+ )
-            // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:1593:9: ( ' ' | '\\t' | '\\r' | '\\n' )+
-            {
-            // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:1593:9: ( ' ' | '\\t' | '\\r' | '\\n' )+
-            int cnt14=0;
-            loop14:
-            do {
-                int alt14=2;
-                int LA14_0 = input.LA(1);
-
-                if ( ((LA14_0>='\t' && LA14_0<='\n')||LA14_0=='\r'||LA14_0==' ') ) {
-                    alt14=1;
-                }
-
-
-                switch (alt14) {
-            	case 1 :
-            	    // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:
-            	    {
-            	    if ( (input.LA(1)>='\t' && input.LA(1)<='\n')||input.LA(1)=='\r'||input.LA(1)==' ' ) {
-            	        input.consume();
-
-            	    }
-            	    else {
-            	        MismatchedSetException mse = new MismatchedSetException(null,input);
-            	        recover(mse);
-            	        throw mse;}
-
-
-            	    }
-            	    break;
-
-            	default :
-            	    if ( cnt14 >= 1 ) break loop14;
-                        EarlyExitException eee =
-                            new EarlyExitException(14, input);
-                        throw eee;
-                }
-                cnt14++;
-            } while (true);
-
-             _channel = HIDDEN; 
-
-            }
-
-            state.type = _type;
-            state.channel = _channel;
-        }
-        finally {
-        }
-    }
-    // $ANTLR end "WS"
-
-    // $ANTLR start "DECIMAL_NUMERAL"
-    public final void mDECIMAL_NUMERAL() throws RecognitionException {
-        try {
-            // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:1607:9: ( ZERO_DIGIT | NON_ZERO_DIGIT ( DIGIT )* )
-            int alt16=2;
-            int LA16_0 = input.LA(1);
-
-            if ( (LA16_0=='0') ) {
-                alt16=1;
-            }
-            else if ( ((LA16_0>='1' && LA16_0<='9')) ) {
-                alt16=2;
-            }
-            else {
-                NoViableAltException nvae =
-                    new NoViableAltException("", 16, 0, input);
-
-                throw nvae;
-            }
-            switch (alt16) {
-                case 1 :
-                    // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:1608:9: ZERO_DIGIT
-                    {
-                    mZERO_DIGIT(); 
-
-                    }
-                    break;
-                case 2 :
-                    // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:1609:11: NON_ZERO_DIGIT ( DIGIT )*
-                    {
-                    mNON_ZERO_DIGIT(); 
-                    // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:1609:26: ( DIGIT )*
-                    loop15:
-                    do {
-                        int alt15=2;
-                        int LA15_0 = input.LA(1);
-
-                        if ( ((LA15_0>='0' && LA15_0<='9')) ) {
-                            alt15=1;
-                        }
-
-
-                        switch (alt15) {
-                    	case 1 :
-                    	    // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:1609:26: DIGIT
-                    	    {
-                    	    mDIGIT(); 
-
-                    	    }
-                    	    break;
-
-                    	default :
-                    	    break loop15;
-                        }
-                    } while (true);
-
-
-                    }
-                    break;
-
-            }
-        }
-        finally {
-        }
-    }
-    // $ANTLR end "DECIMAL_NUMERAL"
-
-    // $ANTLR start "DIGIT"
-    public final void mDIGIT() throws RecognitionException {
-        try {
-            // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:1614:9: ( ZERO_DIGIT | NON_ZERO_DIGIT )
-            // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:
-            {
-            if ( (input.LA(1)>='0' && input.LA(1)<='9') ) {
-                input.consume();
-
-            }
-            else {
-                MismatchedSetException mse = new MismatchedSetException(null,input);
-                recover(mse);
-                throw mse;}
-
-
-            }
-
-        }
-        finally {
-        }
-    }
-    // $ANTLR end "DIGIT"
-
-    // $ANTLR start "ZERO_DIGIT"
-    public final void mZERO_DIGIT() throws RecognitionException {
-        try {
-            // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:1621:9: ( '0' )
-            // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:1622:9: '0'
-            {
-            match('0'); 
-
-            }
-
-        }
-        finally {
-        }
-    }
-    // $ANTLR end "ZERO_DIGIT"
-
-    // $ANTLR start "NON_ZERO_DIGIT"
-    public final void mNON_ZERO_DIGIT() throws RecognitionException {
-        try {
-            // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:1627:9: ( '1' .. '9' )
-            // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:1628:9: '1' .. '9'
-            {
-            matchRange('1','9'); 
-
-            }
-
-        }
-        finally {
-        }
-    }
-    // $ANTLR end "NON_ZERO_DIGIT"
-
-    // $ANTLR start "PLUS"
-    public final void mPLUS() throws RecognitionException {
-        try {
-            // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:1633:9: ( '+' )
-            // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:1634:9: '+'
-            {
-            match('+'); 
-
-            }
-
-        }
-        finally {
-        }
-    }
-    // $ANTLR end "PLUS"
-
-    // $ANTLR start "MINUS"
-    public final void mMINUS() throws RecognitionException {
-        try {
-            // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:1639:9: ( '-' )
-            // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:1640:9: '-'
-            {
-            match('-'); 
-
-            }
-
-        }
-        finally {
-        }
-    }
-    // $ANTLR end "MINUS"
-
-    // $ANTLR start "E"
-    public final void mE() throws RecognitionException {
-        try {
-            // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:1645:9: ( ( 'e' | 'E' ) )
-            // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:1646:9: ( 'e' | 'E' )
-            {
-            if ( input.LA(1)=='E'||input.LA(1)=='e' ) {
-                input.consume();
-
-            }
-            else {
-                MismatchedSetException mse = new MismatchedSetException(null,input);
-                recover(mse);
-                throw mse;}
-
-
-            }
-
-        }
-        finally {
-        }
-    }
-    // $ANTLR end "E"
-
-    // $ANTLR start "EXPONENT"
-    public final void mEXPONENT() throws RecognitionException {
-        try {
-            // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:1658:9: ( E SIGNED_INTEGER )
-            // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:1659:9: E SIGNED_INTEGER
-            {
-            mE(); 
-            mSIGNED_INTEGER(); 
-
-            }
-
-        }
-        finally {
-        }
-    }
-    // $ANTLR end "EXPONENT"
-
-    // $ANTLR start "SIGNED_INTEGER"
-    public final void mSIGNED_INTEGER() throws RecognitionException {
-        try {
-            // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:1664:9: ( ( PLUS | MINUS )? ( DIGIT )+ )
-            // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:1665:9: ( PLUS | MINUS )? ( DIGIT )+
-            {
-            // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:1665:9: ( PLUS | MINUS )?
-            int alt17=2;
-            int LA17_0 = input.LA(1);
-
-            if ( (LA17_0=='+'||LA17_0=='-') ) {
-                alt17=1;
-            }
-            switch (alt17) {
-                case 1 :
-                    // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:
-                    {
-                    if ( input.LA(1)=='+'||input.LA(1)=='-' ) {
-                        input.consume();
-
-                    }
-                    else {
-                        MismatchedSetException mse = new MismatchedSetException(null,input);
-                        recover(mse);
-                        throw mse;}
-
-
-                    }
-                    break;
-
-            }
-
-            // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:1669:9: ( DIGIT )+
-            int cnt18=0;
-            loop18:
-            do {
-                int alt18=2;
-                int LA18_0 = input.LA(1);
-
-                if ( ((LA18_0>='0' && LA18_0<='9')) ) {
-                    alt18=1;
-                }
-
-
-                switch (alt18) {
-            	case 1 :
-            	    // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:1669:9: DIGIT
-            	    {
-            	    mDIGIT(); 
-
-            	    }
-            	    break;
-
-            	default :
-            	    if ( cnt18 >= 1 ) break loop18;
-                        EarlyExitException eee =
-                            new EarlyExitException(18, input);
-                        throw eee;
-                }
-                cnt18++;
-            } while (true);
-
-
-            }
-
-        }
-        finally {
-        }
-    }
-    // $ANTLR end "SIGNED_INTEGER"
-
-    public void mTokens() throws RecognitionException {
-        // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:1:8: ( QUOTED_STRING | SELECT | AS | FROM | JOIN | INNER | LEFT | OUTER | ON | WHERE | OR | AND | NOT | IN | LIKE | IS | NULL | ANY | CONTAINS | IN_FOLDER | IN_TREE | ORDER | BY | ASC | DESC | TIMESTAMP | TRUE | FALSE | SCORE | LPAREN | RPAREN | STAR | COMMA | DOTSTAR | DOT | DOTDOT | EQUALS | TILDA | NOTEQUALS | GREATERTHAN | LESSTHAN | GREATERTHANOREQUALS | LESSTHANOREQUALS | COLON | DOUBLE_QUOTE | DECIMAL_INTEGER_LITERAL | FLOATING_POINT_LITERAL | ID | WS )
-        int alt19=49;
-        alt19 = dfa19.predict(input);
-        switch (alt19) {
-            case 1 :
-                // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:1:10: QUOTED_STRING
-                {
-                mQUOTED_STRING(); 
-
-                }
-                break;
-            case 2 :
-                // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:1:24: SELECT
-                {
-                mSELECT(); 
-
-                }
-                break;
-            case 3 :
-                // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:1:31: AS
-                {
-                mAS(); 
-
-                }
-                break;
-            case 4 :
-                // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:1:34: FROM
-                {
-                mFROM(); 
-
-                }
-                break;
-            case 5 :
-                // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:1:39: JOIN
-                {
-                mJOIN(); 
-
-                }
-                break;
-            case 6 :
-                // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:1:44: INNER
-                {
-                mINNER(); 
-
-                }
-                break;
-            case 7 :
-                // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:1:50: LEFT
-                {
-                mLEFT(); 
-
-                }
-                break;
-            case 8 :
-                // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:1:55: OUTER
-                {
-                mOUTER(); 
-
-                }
-                break;
-            case 9 :
-                // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:1:61: ON
-                {
-                mON(); 
-
-                }
-                break;
-            case 10 :
-                // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:1:64: WHERE
-                {
-                mWHERE(); 
-
-                }
-                break;
-            case 11 :
-                // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:1:70: OR
-                {
-                mOR(); 
-
-                }
-                break;
-            case 12 :
-                // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:1:73: AND
-                {
-                mAND(); 
-
-                }
-                break;
-            case 13 :
-                // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:1:77: NOT
-                {
-                mNOT(); 
-
-                }
-                break;
-            case 14 :
-                // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:1:81: IN
-                {
-                mIN(); 
-
-                }
-                break;
-            case 15 :
-                // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:1:84: LIKE
-                {
-                mLIKE(); 
-
-                }
-                break;
-            case 16 :
-                // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:1:89: IS
-                {
-                mIS(); 
-
-                }
-                break;
-            case 17 :
-                // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:1:92: NULL
-                {
-                mNULL(); 
-
-                }
-                break;
-            case 18 :
-                // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:1:97: ANY
-                {
-                mANY(); 
-
-                }
-                break;
-            case 19 :
-                // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:1:101: CONTAINS
-                {
-                mCONTAINS(); 
-
-                }
-                break;
-            case 20 :
-                // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:1:110: IN_FOLDER
-                {
-                mIN_FOLDER(); 
-
-                }
-                break;
-            case 21 :
-                // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:1:120: IN_TREE
-                {
-                mIN_TREE(); 
-
-                }
-                break;
-            case 22 :
-                // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:1:128: ORDER
-                {
-                mORDER(); 
-
-                }
-                break;
-            case 23 :
-                // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:1:134: BY
-                {
-                mBY(); 
-
-                }
-                break;
-            case 24 :
-                // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:1:137: ASC
-                {
-                mASC(); 
-
-                }
-                break;
-            case 25 :
-                // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:1:141: DESC
-                {
-                mDESC(); 
-
-                }
-                break;
-            case 26 :
-                // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:1:146: TIMESTAMP
-                {
-                mTIMESTAMP(); 
-
-                }
-                break;
-            case 27 :
-                // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:1:156: TRUE
-                {
-                mTRUE(); 
-
-                }
-                break;
-            case 28 :
-                // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:1:161: FALSE
-                {
-                mFALSE(); 
-
-                }
-                break;
-            case 29 :
-                // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:1:167: SCORE
-                {
-                mSCORE(); 
-
-                }
-                break;
-            case 30 :
-                // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:1:173: LPAREN
-                {
-                mLPAREN(); 
-
-                }
-                break;
-            case 31 :
-                // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:1:180: RPAREN
-                {
-                mRPAREN(); 
-
-                }
-                break;
-            case 32 :
-                // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:1:187: STAR
-                {
-                mSTAR(); 
-
-                }
-                break;
-            case 33 :
-                // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:1:192: COMMA
-                {
-                mCOMMA(); 
-
-                }
-                break;
-            case 34 :
-                // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:1:198: DOTSTAR
-                {
-                mDOTSTAR(); 
-
-                }
-                break;
-            case 35 :
-                // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:1:206: DOT
-                {
-                mDOT(); 
-
-                }
-                break;
-            case 36 :
-                // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:1:210: DOTDOT
-                {
-                mDOTDOT(); 
-
-                }
-                break;
-            case 37 :
-                // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:1:217: EQUALS
-                {
-                mEQUALS(); 
-
-                }
-                break;
-            case 38 :
-                // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:1:224: TILDA
-                {
-                mTILDA(); 
-
-                }
-                break;
-            case 39 :
-                // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:1:230: NOTEQUALS
-                {
-                mNOTEQUALS(); 
-
-                }
-                break;
-            case 40 :
-                // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:1:240: GREATERTHAN
-                {
-                mGREATERTHAN(); 
-
-                }
-                break;
-            case 41 :
-                // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:1:252: LESSTHAN
-                {
-                mLESSTHAN(); 
-
-                }
-                break;
-            case 42 :
-                // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:1:261: GREATERTHANOREQUALS
-                {
-                mGREATERTHANOREQUALS(); 
-
-                }
-                break;
-            case 43 :
-                // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:1:281: LESSTHANOREQUALS
-                {
-                mLESSTHANOREQUALS(); 
-
-                }
-                break;
-            case 44 :
-                // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:1:298: COLON
-                {
-                mCOLON(); 
-
-                }
-                break;
-            case 45 :
-                // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:1:304: DOUBLE_QUOTE
-                {
-                mDOUBLE_QUOTE(); 
-
-                }
-                break;
-            case 46 :
-                // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:1:317: DECIMAL_INTEGER_LITERAL
-                {
-                mDECIMAL_INTEGER_LITERAL(); 
-
-                }
-                break;
-            case 47 :
-                // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:1:341: FLOATING_POINT_LITERAL
-                {
-                mFLOATING_POINT_LITERAL(); 
-
-                }
-                break;
-            case 48 :
-                // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:1:364: ID
-                {
-                mID(); 
-
-                }
-                break;
-            case 49 :
-                // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:1:367: WS
-                {
-                mWS(); 
-
-                }
-                break;
-
-        }
-
-    }
-
-
-    protected DFA12 dfa12 = new DFA12(this);
-    protected DFA19 dfa19 = new DFA19(this);
-    static final String DFA12_eotS =
-        "\6\uffff";
-    static final String DFA12_eofS =
-        "\6\uffff";
-    static final String DFA12_minS =
-        "\1\53\2\56\3\uffff";
-    static final String DFA12_maxS =
-        "\2\71\1\145\3\uffff";
-    static final String DFA12_acceptS =
-        "\3\uffff\1\2\1\1\1\3";
-    static final String DFA12_specialS =
-        "\6\uffff}>";
-    static final String[] DFA12_transitionS = {
-            "\1\1\1\uffff\1\1\1\3\1\uffff\12\2",
-            "\1\3\1\uffff\12\2",
-            "\1\4\1\uffff\12\2\13\uffff\1\5\37\uffff\1\5",
-            "",
-            "",
-            ""
-    };
-
-    static final short[] DFA12_eot = DFA.unpackEncodedString(DFA12_eotS);
-    static final short[] DFA12_eof = DFA.unpackEncodedString(DFA12_eofS);
-    static final char[] DFA12_min = DFA.unpackEncodedStringToUnsignedChars(DFA12_minS);
-    static final char[] DFA12_max = DFA.unpackEncodedStringToUnsignedChars(DFA12_maxS);
-    static final short[] DFA12_accept = DFA.unpackEncodedString(DFA12_acceptS);
-    static final short[] DFA12_special = DFA.unpackEncodedString(DFA12_specialS);
-    static final short[][] DFA12_transition;
-
-    static {
-        int numStates = DFA12_transitionS.length;
-        DFA12_transition = new short[numStates][];
-        for (int i=0; i<numStates; i++) {
-            DFA12_transition[i] = DFA.unpackEncodedString(DFA12_transitionS[i]);
-        }
-    }
-
-    class DFA12 extends DFA {
-
-        public DFA12(BaseRecognizer recognizer) {
-            this.recognizer = recognizer;
-            this.decisionNumber = 12;
-            this.eot = DFA12_eot;
-            this.eof = DFA12_eof;
-            this.min = DFA12_min;
-            this.max = DFA12_max;
-            this.accept = DFA12_accept;
-            this.special = DFA12_special;
-            this.transition = DFA12_transition;
-        }
-        public String getDescription() {
-            return "1549:1: FLOATING_POINT_LITERAL : ( ( PLUS | MINUS )? ( DIGIT )+ DOT ( DIGIT )* ( EXPONENT )? | ( PLUS | MINUS )? DOT ( DIGIT )+ ( EXPONENT )? | ( PLUS | MINUS )? ( DIGIT )+ EXPONENT );";
-        }
-    }
-    static final String DFA19_eotS =
-        "\2\uffff\15\42\4\uffff\1\71\2\uffff\1\75\1\77\3\uffff\2\101\2\uffff"+
-        "\2\42\2\uffff\1\111\4\42\1\121\1\122\3\42\1\126\1\130\4\42\1\135"+
-        "\3\42\16\uffff\1\101\2\42\1\143\1\uffff\1\144\1\145\5\42\2\uffff"+
-        "\3\42\1\uffff\1\42\1\uffff\1\42\1\161\2\42\1\uffff\5\42\3\uffff"+
-        "\1\171\1\42\1\173\3\42\1\177\1\u0080\3\42\1\uffff\1\u0084\1\42\1"+
-        "\u0086\1\42\1\u0088\1\42\1\u008a\1\uffff\1\u008b\1\uffff\1\u008c"+
-        "\2\42\2\uffff\1\u008f\1\u0090\1\u0091\1\uffff\1\42\1\uffff\1\42"+
-        "\1\uffff\1\u0094\3\uffff\2\42\3\uffff\2\42\1\uffff\1\42\1\u009a"+
-        "\3\42\1\uffff\1\u009e\1\42\1\u00a0\1\uffff\1\u00a1\2\uffff";
-    static final String DFA19_eofS =
-        "\u00a2\uffff";
-    static final String DFA19_minS =
-        "\1\11\1\uffff\15\43\4\uffff\1\52\2\uffff\2\75\2\uffff\3\56\2\uffff"+
-        "\2\43\2\uffff\24\43\16\uffff\1\56\3\43\1\uffff\7\43\2\uffff\3\43"+
-        "\1\uffff\1\43\1\uffff\4\43\1\uffff\5\43\3\uffff\13\43\1\uffff\7"+
-        "\43\1\uffff\1\43\1\uffff\3\43\2\uffff\3\43\1\uffff\1\43\1\uffff"+
-        "\1\43\1\uffff\1\43\3\uffff\2\43\3\uffff\2\43\1\uffff\5\43\1\uffff"+
-        "\3\43\1\uffff\1\43\2\uffff";
-    static final String DFA19_maxS =
-        "\1\176\1\uffff\15\172\4\uffff\1\71\2\uffff\1\76\1\75\2\uffff\1"+
-        "\71\2\145\2\uffff\2\172\2\uffff\24\172\16\uffff\1\145\3\172\1\uffff"+
-        "\7\172\2\uffff\3\172\1\uffff\1\172\1\uffff\4\172\1\uffff\5\172\3"+
-        "\uffff\13\172\1\uffff\7\172\1\uffff\1\172\1\uffff\3\172\2\uffff"+
-        "\3\172\1\uffff\1\172\1\uffff\1\172\1\uffff\1\172\3\uffff\2\172\3"+
-        "\uffff\2\172\1\uffff\5\172\1\uffff\3\172\1\uffff\1\172\2\uffff";
-    static final String DFA19_acceptS =
-        "\1\uffff\1\1\15\uffff\1\36\1\37\1\40\1\41\1\uffff\1\45\1\46\2\uffff"+
-        "\1\54\1\55\3\uffff\1\60\1\61\2\uffff\2\60\24\uffff\1\42\1\44\1\43"+
-        "\1\57\1\47\1\53\1\51\1\52\1\50\1\57\1\56\3\57\4\uffff\1\3\7\uffff"+
-        "\1\16\1\20\3\uffff\1\11\1\uffff\1\13\4\uffff\1\27\5\uffff\1\30\1"+
-        "\14\1\22\13\uffff\1\15\7\uffff\1\4\1\uffff\1\5\3\uffff\1\7\1\17"+
-        "\3\uffff\1\21\1\uffff\1\31\1\uffff\1\33\1\uffff\1\35\1\34\1\6\2"+
-        "\uffff\1\10\1\26\1\12\2\uffff\1\2\5\uffff\1\25\3\uffff\1\23\1\uffff"+
-        "\1\24\1\32";
-    static final String DFA19_specialS =
-        "\u00a2\uffff}>";
-    static final String[] DFA19_transitionS = {
-            "\2\36\2\uffff\1\36\22\uffff\1\36\1\uffff\1\31\4\uffff\1\1\1"+
-            "\17\1\20\1\21\1\32\1\22\1\32\1\23\1\uffff\1\33\11\34\1\30\1"+
-            "\uffff\1\26\1\24\1\27\2\uffff\1\3\1\14\1\13\1\15\1\35\1\4\2"+
-            "\35\1\6\1\5\1\35\1\7\1\35\1\12\1\10\3\35\1\2\1\16\2\35\1\11"+
-            "\3\35\4\uffff\1\35\1\uffff\1\3\1\14\1\13\1\15\1\35\1\4\2\35"+
-            "\1\6\1\5\1\35\1\7\1\35\1\12\1\10\3\35\1\2\1\16\2\35\1\11\3\35"+
-            "\3\uffff\1\25",
-            "",
-            "\2\41\13\uffff\13\41\6\uffff\2\41\1\40\1\41\1\37\25\41\4\uffff"+
-            "\1\41\1\uffff\2\41\1\40\1\41\1\37\25\41",
-            "\2\41\13\uffff\13\41\6\uffff\15\41\1\44\4\41\1\43\7\41\4\uffff"+
-            "\1\41\1\uffff\15\41\1\44\4\41\1\43\7\41",
-            "\2\41\13\uffff\13\41\6\uffff\1\46\20\41\1\45\10\41\4\uffff"+
-            "\1\41\1\uffff\1\46\20\41\1\45\10\41",
-            "\2\41\13\uffff\13\41\6\uffff\16\41\1\47\13\41\4\uffff\1\41"+
-            "\1\uffff\16\41\1\47\13\41",
-            "\2\41\13\uffff\13\41\6\uffff\15\41\1\50\4\41\1\51\7\41\4\uffff"+
-            "\1\41\1\uffff\15\41\1\50\4\41\1\51\7\41",
-            "\2\41\13\uffff\13\41\6\uffff\4\41\1\52\3\41\1\53\21\41\4\uffff"+
-            "\1\41\1\uffff\4\41\1\52\3\41\1\53\21\41",
-            "\2\41\13\uffff\13\41\6\uffff\15\41\1\55\3\41\1\56\2\41\1\54"+
-            "\5\41\4\uffff\1\41\1\uffff\15\41\1\55\3\41\1\56\2\41\1\54\5"+
-            "\41",
-            "\2\41\13\uffff\13\41\6\uffff\7\41\1\57\22\41\4\uffff\1\41"+
-            "\1\uffff\7\41\1\57\22\41",
-            "\2\41\13\uffff\13\41\6\uffff\16\41\1\60\5\41\1\61\5\41\4\uffff"+
-            "\1\41\1\uffff\16\41\1\60\5\41\1\61\5\41",
-            "\2\41\13\uffff\13\41\6\uffff\16\41\1\62\13\41\4\uffff\1\41"+
-            "\1\uffff\16\41\1\62\13\41",
-            "\2\41\13\uffff\13\41\6\uffff\30\41\1\63\1\41\4\uffff\1\41"+
-            "\1\uffff\30\41\1\63\1\41",
-            "\2\41\13\uffff\13\41\6\uffff\4\41\1\64\25\41\4\uffff\1\41"+
-            "\1\uffff\4\41\1\64\25\41",
-            "\2\41\13\uffff\13\41\6\uffff\10\41\1\65\10\41\1\66\10\41\4"+
-            "\uffff\1\41\1\uffff\10\41\1\65\10\41\1\66\10\41",
-            "",
-            "",
-            "",
-            "",
-            "\1\67\3\uffff\1\70\1\uffff\12\72",
-            "",
-            "",
-            "\1\74\1\73",
-            "\1\76",
-            "",
-            "",
-            "\1\100\1\uffff\1\33\11\34",
-            "\1\102\1\uffff\12\103\13\uffff\1\104\37\uffff\1\104",
-            "\1\102\1\uffff\12\105\13\uffff\1\104\37\uffff\1\104",
-            "",
-            "",
-            "\2\41\13\uffff\13\41\6\uffff\13\41\1\106\16\41\4\uffff\1\41"+
-            "\1\uffff\13\41\1\106\16\41",
-            "\2\41\13\uffff\13\41\6\uffff\16\41\1\107\13\41\4\uffff\1\41"+
-            "\1\uffff\16\41\1\107\13\41",
-            "",
-            "",
-            "\2\41\13\uffff\13\41\6\uffff\2\41\1\110\27\41\4\uffff\1\41"+
-            "\1\uffff\2\41\1\110\27\41",
-            "\2\41\13\uffff\13\41\6\uffff\3\41\1\112\24\41\1\113\1\41\4"+
-            "\uffff\1\41\1\uffff\3\41\1\112\24\41\1\113\1\41",
-            "\2\41\13\uffff\13\41\6\uffff\16\41\1\114\13\41\4\uffff\1\41"+
-            "\1\uffff\16\41\1\114\13\41",
-            "\2\41\13\uffff\13\41\6\uffff\13\41\1\115\16\41\4\uffff\1\41"+
-            "\1\uffff\13\41\1\115\16\41",
-            "\2\41\13\uffff\13\41\6\uffff\10\41\1\116\21\41\4\uffff\1\41"+
-            "\1\uffff\10\41\1\116\21\41",
-            "\2\41\13\uffff\13\41\6\uffff\15\41\1\117\14\41\4\uffff\1\120"+
-            "\1\uffff\15\41\1\117\14\41",
-            "\2\41\13\uffff\13\41\6\uffff\32\41\4\uffff\1\41\1\uffff\32"+
-            "\41",
-            "\2\41\13\uffff\13\41\6\uffff\5\41\1\123\24\41\4\uffff\1\41"+
-            "\1\uffff\5\41\1\123\24\41",
-            "\2\41\13\uffff\13\41\6\uffff\12\41\1\124\17\41\4\uffff\1\41"+
-            "\1\uffff\12\41\1\124\17\41",
-            "\2\41\13\uffff\13\41\6\uffff\23\41\1\125\6\41\4\uffff\1\41"+
-            "\1\uffff\23\41\1\125\6\41",
-            "\2\41\13\uffff\13\41\6\uffff\32\41\4\uffff\1\41\1\uffff\32"+
-            "\41",
-            "\2\41\13\uffff\13\41\6\uffff\3\41\1\127\26\41\4\uffff\1\41"+
-            "\1\uffff\3\41\1\127\26\41",
-            "\2\41\13\uffff\13\41\6\uffff\4\41\1\131\25\41\4\uffff\1\41"+
-            "\1\uffff\4\41\1\131\25\41",
-            "\2\41\13\uffff\13\41\6\uffff\23\41\1\132\6\41\4\uffff\1\41"+
-            "\1\uffff\23\41\1\132\6\41",
-            "\2\41\13\uffff\13\41\6\uffff\13\41\1\133\16\41\4\uffff\1\41"+
-            "\1\uffff\13\41\1\133\16\41",
-            "\2\41\13\uffff\13\41\6\uffff\15\41\1\134\14\41\4\uffff\1\41"+
-            "\1\uffff\15\41\1\134\14\41",
-            "\2\41\13\uffff\13\41\6\uffff\32\41\4\uffff\1\41\1\uffff\32"+
-            "\41",
-            "\2\41\13\uffff\13\41\6\uffff\22\41\1\136\7\41\4\uffff\1\41"+
-            "\1\uffff\22\41\1\136\7\41",
-            "\2\41\13\uffff\13\41\6\uffff\14\41\1\137\15\41\4\uffff\1\41"+
-            "\1\uffff\14\41\1\137\15\41",
-            "\2\41\13\uffff\13\41\6\uffff\24\41\1\140\5\41\4\uffff\1\41"+
-            "\1\uffff\24\41\1\140\5\41",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "\1\102\1\uffff\12\105\13\uffff\1\104\37\uffff\1\104",
-            "\2\41\13\uffff\13\41\6\uffff\4\41\1\141\25\41\4\uffff\1\41"+
-            "\1\uffff\4\41\1\141\25\41",
-            "\2\41\13\uffff\13\41\6\uffff\21\41\1\142\10\41\4\uffff\1\41"+
-            "\1\uffff\21\41\1\142\10\41",
-            "\2\41\13\uffff\13\41\6\uffff\32\41\4\uffff\1\41\1\uffff\32"+
-            "\41",
-            "",
-            "\2\41\13\uffff\13\41\6\uffff\32\41\4\uffff\1\41\1\uffff\32"+
-            "\41",
-            "\2\41\13\uffff\13\41\6\uffff\32\41\4\uffff\1\41\1\uffff\32"+
-            "\41",
-            "\2\41\13\uffff\13\41\6\uffff\14\41\1\146\15\41\4\uffff\1\41"+
-            "\1\uffff\14\41\1\146\15\41",
-            "\2\41\13\uffff\13\41\6\uffff\22\41\1\147\7\41\4\uffff\1\41"+
-            "\1\uffff\22\41\1\147\7\41",
-            "\2\41\13\uffff\13\41\6\uffff\15\41\1\150\14\41\4\uffff\1\41"+
-            "\1\uffff\15\41\1\150\14\41",
-            "\2\41\13\uffff\13\41\6\uffff\4\41\1\151\25\41\4\uffff\1\41"+
-            "\1\uffff\4\41\1\151\25\41",
-            "\2\41\13\uffff\13\41\6\uffff\5\41\1\152\15\41\1\153\6\41\4"+
-            "\uffff\1\41\1\uffff\5\41\1\152\15\41\1\153\6\41",
-            "",
-            "",
-            "\2\41\13\uffff\13\41\6\uffff\23\41\1\154\6\41\4\uffff\1\41"+
-            "\1\uffff\23\41\1\154\6\41",
-            "\2\41\13\uffff\13\41\6\uffff\4\41\1\155\25\41\4\uffff\1\41"+
-            "\1\uffff\4\41\1\155\25\41",
-            "\2\41\13\uffff\13\41\6\uffff\4\41\1\156\25\41\4\uffff\1\41"+
-            "\1\uffff\4\41\1\156\25\41",
-            "",
-            "\2\41\13\uffff\13\41\6\uffff\4\41\1\157\25\41\4\uffff\1\41"+
-            "\1\uffff\4\41\1\157\25\41",
-            "",
-            "\2\41\13\uffff\13\41\6\uffff\21\41\1\160\10\41\4\uffff\1\41"+
-            "\1\uffff\21\41\1\160\10\41",
-            "\2\41\13\uffff\13\41\6\uffff\32\41\4\uffff\1\41\1\uffff\32"+
-            "\41",
-            "\2\41\13\uffff\13\41\6\uffff\13\41\1\162\16\41\4\uffff\1\41"+
-            "\1\uffff\13\41\1\162\16\41",
-            "\2\41\13\uffff\13\41\6\uffff\23\41\1\163\6\41\4\uffff\1\41"+
-            "\1\uffff\23\41\1\163\6\41",
-            "",
-            "\2\41\13\uffff\13\41\6\uffff\2\41\1\164\27\41\4\uffff\1\41"+
-            "\1\uffff\2\41\1\164\27\41",
-            "\2\41\13\uffff\13\41\6\uffff\4\41\1\165\25\41\4\uffff\1\41"+
-            "\1\uffff\4\41\1\165\25\41",
-            "\2\41\13\uffff\13\41\6\uffff\4\41\1\166\25\41\4\uffff\1\41"+
-            "\1\uffff\4\41\1\166\25\41",
-            "\2\41\13\uffff\13\41\6\uffff\2\41\1\167\27\41\4\uffff\1\41"+
-            "\1\uffff\2\41\1\167\27\41",
-            "\2\41\13\uffff\13\41\6\uffff\4\41\1\170\25\41\4\uffff\1\41"+
-            "\1\uffff\4\41\1\170\25\41",
-            "",
-            "",
-            "",
-            "\2\41\13\uffff\13\41\6\uffff\32\41\4\uffff\1\41\1\uffff\32"+
-            "\41",
-            "\2\41\13\uffff\13\41\6\uffff\4\41\1\172\25\41\4\uffff\1\41"+
-            "\1\uffff\4\41\1\172\25\41",
-            "\2\41\13\uffff\13\41\6\uffff\32\41\4\uffff\1\41\1\uffff\32"+
-            "\41",
-            "\2\41\13\uffff\13\41\6\uffff\21\41\1\174\10\41\4\uffff\1\41"+
-            "\1\uffff\21\41\1\174\10\41",
-            "\2\41\13\uffff\13\41\6\uffff\16\41\1\175\13\41\4\uffff\1\41"+
-            "\1\uffff\16\41\1\175\13\41",
-            "\2\41\13\uffff\13\41\6\uffff\21\41\1\176\10\41\4\uffff\1\41"+
-            "\1\uffff\21\41\1\176\10\41",
-            "\2\41\13\uffff\13\41\6\uffff\32\41\4\uffff\1\41\1\uffff\32"+
-            "\41",
-            "\2\41\13\uffff\13\41\6\uffff\32\41\4\uffff\1\41\1\uffff\32"+
-            "\41",
-            "\2\41\13\uffff\13\41\6\uffff\21\41\1\u0081\10\41\4\uffff\1"+
-            "\41\1\uffff\21\41\1\u0081\10\41",
-            "\2\41\13\uffff\13\41\6\uffff\21\41\1\u0082\10\41\4\uffff\1"+
-            "\41\1\uffff\21\41\1\u0082\10\41",
-            "\2\41\13\uffff\13\41\6\uffff\4\41\1\u0083\25\41\4\uffff\1"+
-            "\41\1\uffff\4\41\1\u0083\25\41",
-            "",
-            "\2\41\13\uffff\13\41\6\uffff\32\41\4\uffff\1\41\1\uffff\32"+
-            "\41",
-            "\2\41\13\uffff\13\41\6\uffff\1\u0085\31\41\4\uffff\1\41\1"+
-            "\uffff\1\u0085\31\41",
-            "\2\41\13\uffff\13\41\6\uffff\32\41\4\uffff\1\41\1\uffff\32"+
-            "\41",
-            "\2\41\13\uffff\13\41\6\uffff\22\41\1\u0087\7\41\4\uffff\1"+
-            "\41\1\uffff\22\41\1\u0087\7\41",
-            "\2\41\13\uffff\13\41\6\uffff\32\41\4\uffff\1\41\1\uffff\32"+
-            "\41",
-            "\2\41\13\uffff\13\41\6\uffff\23\41\1\u0089\6\41\4\uffff\1"+
-            "\41\1\uffff\23\41\1\u0089\6\41",
-            "\2\41\13\uffff\13\41\6\uffff\32\41\4\uffff\1\41\1\uffff\32"+
-            "\41",
-            "",
-            "\2\41\13\uffff\13\41\6\uffff\32\41\4\uffff\1\41\1\uffff\32"+
-            "\41",
-            "",
-            "\2\41\13\uffff\13\41\6\uffff\32\41\4\uffff\1\41\1\uffff\32"+
-            "\41",
-            "\2\41\13\uffff\13\41\6\uffff\13\41\1\u008d\16\41\4\uffff\1"+
-            "\41\1\uffff\13\41\1\u008d\16\41",
-            "\2\41\13\uffff\13\41\6\uffff\4\41\1\u008e\25\41\4\uffff\1"+
-            "\41\1\uffff\4\41\1\u008e\25\41",
-            "",
-            "",
-            "\2\41\13\uffff\13\41\6\uffff\32\41\4\uffff\1\41\1\uffff\32"+
-            "\41",
-            "\2\41\13\uffff\13\41\6\uffff\32\41\4\uffff\1\41\1\uffff\32"+
-            "\41",
-            "\2\41\13\uffff\13\41\6\uffff\32\41\4\uffff\1\41\1\uffff\32"+
-            "\41",
-            "",
-            "\2\41\13\uffff\13\41\6\uffff\10\41\1\u0092\21\41\4\uffff\1"+
-            "\41\1\uffff\10\41\1\u0092\21\41",
-            "",
-            "\2\41\13\uffff\13\41\6\uffff\23\41\1\u0093\6\41\4\uffff\1"+
-            "\41\1\uffff\23\41\1\u0093\6\41",
-            "",
-            "\2\41\13\uffff\13\41\6\uffff\32\41\4\uffff\1\41\1\uffff\32"+
-            "\41",
-            "",
-            "",
-            "",
-            "\2\41\13\uffff\13\41\6\uffff\3\41\1\u0095\26\41\4\uffff\1"+
-            "\41\1\uffff\3\41\1\u0095\26\41",
-            "\2\41\13\uffff\13\41\6\uffff\4\41\1\u0096\25\41\4\uffff\1"+
-            "\41\1\uffff\4\41\1\u0096\25\41",
-            "",
-            "",
-            "",
-            "\2\41\13\uffff\13\41\6\uffff\15\41\1\u0097\14\41\4\uffff\1"+
-            "\41\1\uffff\15\41\1\u0097\14\41",
-            "\2\41\13\uffff\13\41\6\uffff\1\u0098\31\41\4\uffff\1\41\1"+
-            "\uffff\1\u0098\31\41",
-            "",
-            "\2\41\13\uffff\13\41\6\uffff\4\41\1\u0099\25\41\4\uffff\1"+
-            "\41\1\uffff\4\41\1\u0099\25\41",
-            "\2\41\13\uffff\13\41\6\uffff\32\41\4\uffff\1\41\1\uffff\32"+
-            "\41",
-            "\2\41\13\uffff\13\41\6\uffff\22\41\1\u009b\7\41\4\uffff\1"+
-            "\41\1\uffff\22\41\1\u009b\7\41",
-            "\2\41\13\uffff\13\41\6\uffff\14\41\1\u009c\15\41\4\uffff\1"+
-            "\41\1\uffff\14\41\1\u009c\15\41",
-            "\2\41\13\uffff\13\41\6\uffff\21\41\1\u009d\10\41\4\uffff\1"+
-            "\41\1\uffff\21\41\1\u009d\10\41",
-            "",
-            "\2\41\13\uffff\13\41\6\uffff\32\41\4\uffff\1\41\1\uffff\32"+
-            "\41",
-            "\2\41\13\uffff\13\41\6\uffff\17\41\1\u009f\12\41\4\uffff\1"+
-            "\41\1\uffff\17\41\1\u009f\12\41",
-            "\2\41\13\uffff\13\41\6\uffff\32\41\4\uffff\1\41\1\uffff\32"+
-            "\41",
-            "",
-            "\2\41\13\uffff\13\41\6\uffff\32\41\4\uffff\1\41\1\uffff\32"+
-            "\41",
-            "",
-            ""
-    };
-
-    static final short[] DFA19_eot = DFA.unpackEncodedString(DFA19_eotS);
-    static final short[] DFA19_eof = DFA.unpackEncodedString(DFA19_eofS);
-    static final char[] DFA19_min = DFA.unpackEncodedStringToUnsignedChars(DFA19_minS);
-    static final char[] DFA19_max = DFA.unpackEncodedStringToUnsignedChars(DFA19_maxS);
-    static final short[] DFA19_accept = DFA.unpackEncodedString(DFA19_acceptS);
-    static final short[] DFA19_special = DFA.unpackEncodedString(DFA19_specialS);
-    static final short[][] DFA19_transition;
-
-    static {
-        int numStates = DFA19_transitionS.length;
-        DFA19_transition = new short[numStates][];
-        for (int i=0; i<numStates; i++) {
-            DFA19_transition[i] = DFA.unpackEncodedString(DFA19_transitionS[i]);
-        }
-    }
-
-    class DFA19 extends DFA {
-
-        public DFA19(BaseRecognizer recognizer) {
-            this.recognizer = recognizer;
-            this.decisionNumber = 19;
-            this.eot = DFA19_eot;
-            this.eof = DFA19_eof;
-            this.min = DFA19_min;
-            this.max = DFA19_max;
-            this.accept = DFA19_accept;
-            this.special = DFA19_special;
-            this.transition = DFA19_transition;
-        }
-        public String getDescription() {
-            return "1:1: Tokens : ( QUOTED_STRING | SELECT | AS | FROM | JOIN | INNER | LEFT | OUTER | ON | WHERE | OR | AND | NOT | IN | LIKE | IS | NULL | ANY | CONTAINS | IN_FOLDER | IN_TREE | ORDER | BY | ASC | DESC | TIMESTAMP | TRUE | FALSE | SCORE | LPAREN | RPAREN | STAR | COMMA | DOTSTAR | DOT | DOTDOT | EQUALS | TILDA | NOTEQUALS | GREATERTHAN | LESSTHAN | GREATERTHANOREQUALS | LESSTHANOREQUALS | COLON | DOUBLE_QUOTE | DECIMAL_INTEGER_LITERAL | FLOATING_POINT_LITERAL | ID | WS );";
-        }
-    }
- 
-
-}
\ No newline at end of file
diff --git a/source/java/org/alfresco/repo/search/impl/parsers/CMISParser.java b/source/java/org/alfresco/repo/search/impl/parsers/CMISParser.java
deleted file mode 100644
index 674e60ca02..0000000000
--- a/source/java/org/alfresco/repo/search/impl/parsers/CMISParser.java
+++ /dev/null
@@ -1,16620 +0,0 @@
-// $ANTLR 3.3 Nov 30, 2010 12:50:56 W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g 2011-04-26 17:09:20
-
-    package org.alfresco.repo.search.impl.parsers;
-    import org.alfresco.cmis.CMISQueryException;
-
-
-import org.antlr.runtime.*;
-import java.util.Stack;
-import java.util.List;
-import java.util.ArrayList;
-import java.util.Map;
-import java.util.HashMap;
-
-import org.antlr.runtime.tree.*;
-
-public class CMISParser extends Parser {
-    public static final String[] tokenNames = new String[] {
-        "<invalid>", "<EOR>", "<DOWN>", "<UP>", "QUERY", "ALL_COLUMNS", "COLUMN", "COLUMNS", "COLUMN_REF", "QUALIFIER", "FUNCTION", "SOURCE", "TABLE", "TABLE_REF", "PARAMETER", "CONJUNCTION", "DISJUNCTION", "NEGATION", "PRED_COMPARISON", "PRED_IN", "PRED_EXISTS", "PRED_LIKE", "PRED_FTS", "LIST", "PRED_CHILD", "PRED_DESCENDANT", "SORT_SPECIFICATION", "NUMERIC_LITERAL", "STRING_LITERAL", "DATETIME_LITERAL", "BOOLEAN_LITERAL", "SINGLE_VALUED_PROPERTY", "SELECT", "STAR", "COMMA", "AS", "DOTSTAR", "DOT", "LPAREN", "RPAREN", "FROM", "JOIN", "INNER", "LEFT", "OUTER", "ON", "EQUALS", "WHERE", "OR", "AND", "NOT", "NOTEQUALS", "LESSTHAN", "GREATERTHAN", "LESSTHANOREQUALS", "GREATERTHANOREQUALS", "IN", "LIKE", "IS", "NULL", "ANY", "CONTAINS", "IN_FOLDER", "IN_TREE", "ORDER", "BY", "ASC", "DESC", "COLON", "QUOTED_STRING", "ID", "DOUBLE_QUOTE", "FLOATING_POINT_LITERAL", "DECIMAL_INTEGER_LITERAL", "TRUE", "FALSE", "TIMESTAMP", "SCORE", "DOTDOT", "TILDA", "PLUS", "MINUS", "DECIMAL_NUMERAL", "DIGIT", "EXPONENT", "WS", "ZERO_DIGIT", "NON_ZERO_DIGIT", "E", "SIGNED_INTEGER"
-    };
-    public static final int EOF=-1;
-    public static final int QUERY=4;
-    public static final int ALL_COLUMNS=5;
-    public static final int COLUMN=6;
-    public static final int COLUMNS=7;
-    public static final int COLUMN_REF=8;
-    public static final int QUALIFIER=9;
-    public static final int FUNCTION=10;
-    public static final int SOURCE=11;
-    public static final int TABLE=12;
-    public static final int TABLE_REF=13;
-    public static final int PARAMETER=14;
-    public static final int CONJUNCTION=15;
-    public static final int DISJUNCTION=16;
-    public static final int NEGATION=17;
-    public static final int PRED_COMPARISON=18;
-    public static final int PRED_IN=19;
-    public static final int PRED_EXISTS=20;
-    public static final int PRED_LIKE=21;
-    public static final int PRED_FTS=22;
-    public static final int LIST=23;
-    public static final int PRED_CHILD=24;
-    public static final int PRED_DESCENDANT=25;
-    public static final int SORT_SPECIFICATION=26;
-    public static final int NUMERIC_LITERAL=27;
-    public static final int STRING_LITERAL=28;
-    public static final int DATETIME_LITERAL=29;
-    public static final int BOOLEAN_LITERAL=30;
-    public static final int SINGLE_VALUED_PROPERTY=31;
-    public static final int SELECT=32;
-    public static final int STAR=33;
-    public static final int COMMA=34;
-    public static final int AS=35;
-    public static final int DOTSTAR=36;
-    public static final int DOT=37;
-    public static final int LPAREN=38;
-    public static final int RPAREN=39;
-    public static final int FROM=40;
-    public static final int JOIN=41;
-    public static final int INNER=42;
-    public static final int LEFT=43;
-    public static final int OUTER=44;
-    public static final int ON=45;
-    public static final int EQUALS=46;
-    public static final int WHERE=47;
-    public static final int OR=48;
-    public static final int AND=49;
-    public static final int NOT=50;
-    public static final int NOTEQUALS=51;
-    public static final int LESSTHAN=52;
-    public static final int GREATERTHAN=53;
-    public static final int LESSTHANOREQUALS=54;
-    public static final int GREATERTHANOREQUALS=55;
-    public static final int IN=56;
-    public static final int LIKE=57;
-    public static final int IS=58;
-    public static final int NULL=59;
-    public static final int ANY=60;
-    public static final int CONTAINS=61;
-    public static final int IN_FOLDER=62;
-    public static final int IN_TREE=63;
-    public static final int ORDER=64;
-    public static final int BY=65;
-    public static final int ASC=66;
-    public static final int DESC=67;
-    public static final int COLON=68;
-    public static final int QUOTED_STRING=69;
-    public static final int ID=70;
-    public static final int DOUBLE_QUOTE=71;
-    public static final int FLOATING_POINT_LITERAL=72;
-    public static final int DECIMAL_INTEGER_LITERAL=73;
-    public static final int TRUE=74;
-    public static final int FALSE=75;
-    public static final int TIMESTAMP=76;
-    public static final int SCORE=77;
-    public static final int DOTDOT=78;
-    public static final int TILDA=79;
-    public static final int PLUS=80;
-    public static final int MINUS=81;
-    public static final int DECIMAL_NUMERAL=82;
-    public static final int DIGIT=83;
-    public static final int EXPONENT=84;
-    public static final int WS=85;
-    public static final int ZERO_DIGIT=86;
-    public static final int NON_ZERO_DIGIT=87;
-    public static final int E=88;
-    public static final int SIGNED_INTEGER=89;
-
-    // delegates
-    // delegators
-
-
-        public CMISParser(TokenStream input) {
-            this(input, new RecognizerSharedState());
-        }
-        public CMISParser(TokenStream input, RecognizerSharedState state) {
-            super(input, state);
-             
-        }
-        
-    protected TreeAdaptor adaptor = new CommonTreeAdaptor();
-
-    public void setTreeAdaptor(TreeAdaptor adaptor) {
-        this.adaptor = adaptor;
-    }
-    public TreeAdaptor getTreeAdaptor() {
-        return adaptor;
-    }
-
-    public String[] getTokenNames() { return CMISParser.tokenNames; }
-    public String getGrammarFileName() { return "W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g"; }
-
-
-        private Stack<String> paraphrases = new Stack<String>();
-        
-        private boolean strict = false;
-
-        /**
-         * CMIS strict
-         */
-        public boolean strict()
-        {
-            return strict;
-        }
-    	
-        public void setStrict(boolean strict)
-        {
-            this.strict = strict;
-        }
-            
-        protected Object recoverFromMismatchedToken(IntStream input, int ttype, BitSet follow) throws RecognitionException
-        {
-            throw new MismatchedTokenException(ttype, input);
-        }
-    	
-        public Object recoverFromMismatchedSet(IntStream input, RecognitionException e, BitSet follow) throws RecognitionException
-        {
-            throw e;
-        }
-    	
-        public String getErrorMessage(RecognitionException e, String[] tokenNames) 
-        {
-            List stack = getRuleInvocationStack(e, this.getClass().getName());
-            String msg = e.getMessage();
-            if ( e instanceof UnwantedTokenException ) 
-    	    {
-                UnwantedTokenException ute = (UnwantedTokenException)e;
-                String tokenName="<unknown>";
-                if ( ute.expecting== Token.EOF ) 
-                {
-                    tokenName = "EOF";
-                }
-                else 
-                {
-                    tokenName = tokenNames[ute.expecting];
-                }
-                msg = "extraneous input " + getTokenErrorDisplay(ute.getUnexpectedToken())
-                    + " expecting "+tokenName;
-            }
-            else if ( e instanceof MissingTokenException ) 
-            {
-                MissingTokenException mte = (MissingTokenException)e;
-                String tokenName="<unknown>";
-                if ( mte.expecting== Token.EOF ) 
-                {
-                    tokenName = "EOF";
-                }
-                else 
-                {
-                    tokenName = tokenNames[mte.expecting];
-                }
-                msg = "missing " + tokenName+" at " + getTokenErrorDisplay(e.token)
-                    + "  (" + getLongTokenErrorDisplay(e.token) +")";
-            }
-            else if ( e instanceof MismatchedTokenException ) 
-            {
-                MismatchedTokenException mte = (MismatchedTokenException)e;
-                String tokenName="<unknown>";
-                if ( mte.expecting== Token.EOF ) 
-                {
-                    tokenName = "EOF";
-                }
-                else
-                {
-                    tokenName = tokenNames[mte.expecting];
-                }
-                msg = "mismatched input " + getTokenErrorDisplay(e.token)
-                    + " expecting " + tokenName +"  (" + getLongTokenErrorDisplay(e.token) + ")";
-            }
-            else if ( e instanceof MismatchedTreeNodeException ) 
-            {
-                MismatchedTreeNodeException mtne = (MismatchedTreeNodeException)e;
-                String tokenName="<unknown>";
-                if ( mtne.expecting==Token.EOF )  
-                {
-                    tokenName = "EOF";
-                }
-                else 
-                {
-                    tokenName = tokenNames[mtne.expecting];
-                }
-                msg = "mismatched tree node: " + mtne.node + " expecting " + tokenName;
-            }
-            else if ( e instanceof NoViableAltException ) 
-            {
-                NoViableAltException nvae = (NoViableAltException)e;
-                msg = "no viable alternative at input " + getTokenErrorDisplay(e.token)
-                    + "\n\t (decision=" + nvae.decisionNumber
-                    + " state " + nvae.stateNumber + ")" 
-                    + " decision=<<" + nvae.grammarDecisionDescription + ">>";
-            }
-            else if ( e instanceof EarlyExitException ) 
-            {
-                //EarlyExitException eee = (EarlyExitException)e;
-                // for development, can add "(decision="+eee.decisionNumber+")"
-                msg = "required (...)+ loop did not match anything at input " + getTokenErrorDisplay(e.token);
-            }
-    	    else if ( e instanceof MismatchedSetException ) 
-    	    {
-    	        MismatchedSetException mse = (MismatchedSetException)e;
-    	        msg = "mismatched input " + getTokenErrorDisplay(e.token)
-                    + " expecting set " + mse.expecting;
-            }
-            else if ( e instanceof MismatchedNotSetException ) 
-            {
-                MismatchedNotSetException mse = (MismatchedNotSetException)e;
-                msg = "mismatched input " + getTokenErrorDisplay(e.token)
-                    + " expecting set " + mse.expecting;
-            }
-            else if ( e instanceof FailedPredicateException ) 
-            {
-                FailedPredicateException fpe = (FailedPredicateException)e;
-                msg = "rule " + fpe.ruleName + " failed predicate: {" + fpe.predicateText + "}?";
-            }
-    		
-            if(paraphrases.size() > 0)
-            {
-                String paraphrase = (String)paraphrases.peek();
-                msg = msg+" "+paraphrase;
-            }
-            return msg +"\n\t"+stack;
-        }
-    	
-        public String getLongTokenErrorDisplay(Token t)
-        {
-            return t.toString();
-        }
-        
-
-        public String getErrorString(RecognitionException e)
-        {
-            String hdr = getErrorHeader(e);
-            String msg = getErrorMessage(e, this.getTokenNames());
-            return hdr+" "+msg;
-        }
-
-
-    public static class query_return extends ParserRuleReturnScope {
-        Object tree;
-        public Object getTree() { return tree; }
-    };
-
-    // $ANTLR start "query"
-    // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:279:1: query : SELECT selectList fromClause ( whereClause )? ( orderByClause )? EOF -> ^( QUERY selectList fromClause ( whereClause )? ( orderByClause )? ) ;
-    public final CMISParser.query_return query() throws RecognitionException {
-        CMISParser.query_return retval = new CMISParser.query_return();
-        retval.start = input.LT(1);
-
-        Object root_0 = null;
-
-        Token SELECT1=null;
-        Token EOF6=null;
-        CMISParser.selectList_return selectList2 = null;
-
-        CMISParser.fromClause_return fromClause3 = null;
-
-        CMISParser.whereClause_return whereClause4 = null;
-
-        CMISParser.orderByClause_return orderByClause5 = null;
-
-
-        Object SELECT1_tree=null;
-        Object EOF6_tree=null;
-        RewriteRuleTokenStream stream_EOF=new RewriteRuleTokenStream(adaptor,"token EOF");
-        RewriteRuleTokenStream stream_SELECT=new RewriteRuleTokenStream(adaptor,"token SELECT");
-        RewriteRuleSubtreeStream stream_whereClause=new RewriteRuleSubtreeStream(adaptor,"rule whereClause");
-        RewriteRuleSubtreeStream stream_orderByClause=new RewriteRuleSubtreeStream(adaptor,"rule orderByClause");
-        RewriteRuleSubtreeStream stream_selectList=new RewriteRuleSubtreeStream(adaptor,"rule selectList");
-        RewriteRuleSubtreeStream stream_fromClause=new RewriteRuleSubtreeStream(adaptor,"rule fromClause");
-
-            paraphrases.push("in query"); 
-
-        try {
-            // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:294:9: ( SELECT selectList fromClause ( whereClause )? ( orderByClause )? EOF -> ^( QUERY selectList fromClause ( whereClause )? ( orderByClause )? ) )
-            // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:295:9: SELECT selectList fromClause ( whereClause )? ( orderByClause )? EOF
-            {
-            SELECT1=(Token)match(input,SELECT,FOLLOW_SELECT_in_query415); if (state.failed) return retval; 
-            if ( state.backtracking==0 ) stream_SELECT.add(SELECT1);
-
-            pushFollow(FOLLOW_selectList_in_query417);
-            selectList2=selectList();
-
-            state._fsp--;
-            if (state.failed) return retval;
-            if ( state.backtracking==0 ) stream_selectList.add(selectList2.getTree());
-            pushFollow(FOLLOW_fromClause_in_query419);
-            fromClause3=fromClause();
-
-            state._fsp--;
-            if (state.failed) return retval;
-            if ( state.backtracking==0 ) stream_fromClause.add(fromClause3.getTree());
-            // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:295:38: ( whereClause )?
-            int alt1=2;
-            int LA1_0 = input.LA(1);
-
-            if ( (LA1_0==WHERE) ) {
-                alt1=1;
-            }
-            switch (alt1) {
-                case 1 :
-                    // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:295:38: whereClause
-                    {
-                    pushFollow(FOLLOW_whereClause_in_query421);
-                    whereClause4=whereClause();
-
-                    state._fsp--;
-                    if (state.failed) return retval;
-                    if ( state.backtracking==0 ) stream_whereClause.add(whereClause4.getTree());
-
-                    }
-                    break;
-
-            }
-
-            // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:295:51: ( orderByClause )?
-            int alt2=2;
-            int LA2_0 = input.LA(1);
-
-            if ( (LA2_0==ORDER) ) {
-                alt2=1;
-            }
-            switch (alt2) {
-                case 1 :
-                    // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:295:51: orderByClause
-                    {
-                    pushFollow(FOLLOW_orderByClause_in_query424);
-                    orderByClause5=orderByClause();
-
-                    state._fsp--;
-                    if (state.failed) return retval;
-                    if ( state.backtracking==0 ) stream_orderByClause.add(orderByClause5.getTree());
-
-                    }
-                    break;
-
-            }
-
-            EOF6=(Token)match(input,EOF,FOLLOW_EOF_in_query427); if (state.failed) return retval; 
-            if ( state.backtracking==0 ) stream_EOF.add(EOF6);
-
-
-
-            // AST REWRITE
-            // elements: selectList, orderByClause, fromClause, whereClause
-            // token labels: 
-            // rule labels: retval
-            // token list labels: 
-            // rule list labels: 
-            // wildcard labels: 
-            if ( state.backtracking==0 ) {
-            retval.tree = root_0;
-            RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"rule retval",retval!=null?retval.tree:null);
-
-            root_0 = (Object)adaptor.nil();
-            // 296:17: -> ^( QUERY selectList fromClause ( whereClause )? ( orderByClause )? )
-            {
-                // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:297:25: ^( QUERY selectList fromClause ( whereClause )? ( orderByClause )? )
-                {
-                Object root_1 = (Object)adaptor.nil();
-                root_1 = (Object)adaptor.becomeRoot((Object)adaptor.create(QUERY, "QUERY"), root_1);
-
-                adaptor.addChild(root_1, stream_selectList.nextTree());
-                adaptor.addChild(root_1, stream_fromClause.nextTree());
-                // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:297:55: ( whereClause )?
-                if ( stream_whereClause.hasNext() ) {
-                    adaptor.addChild(root_1, stream_whereClause.nextTree());
-
-                }
-                stream_whereClause.reset();
-                // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:297:68: ( orderByClause )?
-                if ( stream_orderByClause.hasNext() ) {
-                    adaptor.addChild(root_1, stream_orderByClause.nextTree());
-
-                }
-                stream_orderByClause.reset();
-
-                adaptor.addChild(root_0, root_1);
-                }
-
-            }
-
-            retval.tree = root_0;}
-            }
-
-            retval.stop = input.LT(-1);
-
-            if ( state.backtracking==0 ) {
-
-            retval.tree = (Object)adaptor.rulePostProcessing(root_0);
-            adaptor.setTokenBoundaries(retval.tree, retval.start, retval.stop);
-            }
-            if ( state.backtracking==0 ) {
-
-                  paraphrases.pop(); 
-
-            }
-        }
-
-            catch(RecognitionException e)
-            {
-                throw new CMISQueryException(getErrorString(e), e);
-            }
-        finally {
-        }
-        return retval;
-    }
-    // $ANTLR end "query"
-
-    public static class selectList_return extends ParserRuleReturnScope {
-        Object tree;
-        public Object getTree() { return tree; }
-    };
-
-    // $ANTLR start "selectList"
-    // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:300:1: selectList : ( STAR -> ^( ALL_COLUMNS ) | selectSubList ( COMMA selectSubList )* -> ^( COLUMNS ( selectSubList )+ ) );
-    public final CMISParser.selectList_return selectList() throws RecognitionException {
-        CMISParser.selectList_return retval = new CMISParser.selectList_return();
-        retval.start = input.LT(1);
-
-        Object root_0 = null;
-
-        Token STAR7=null;
-        Token COMMA9=null;
-        CMISParser.selectSubList_return selectSubList8 = null;
-
-        CMISParser.selectSubList_return selectSubList10 = null;
-
-
-        Object STAR7_tree=null;
-        Object COMMA9_tree=null;
-        RewriteRuleTokenStream stream_STAR=new RewriteRuleTokenStream(adaptor,"token STAR");
-        RewriteRuleTokenStream stream_COMMA=new RewriteRuleTokenStream(adaptor,"token COMMA");
-        RewriteRuleSubtreeStream stream_selectSubList=new RewriteRuleSubtreeStream(adaptor,"rule selectSubList");
-
-            paraphrases.push("in select list"); 
-
-        try {
-            // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:309:9: ( STAR -> ^( ALL_COLUMNS ) | selectSubList ( COMMA selectSubList )* -> ^( COLUMNS ( selectSubList )+ ) )
-            int alt4=2;
-            alt4 = dfa4.predict(input);
-            switch (alt4) {
-                case 1 :
-                    // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:310:9: STAR
-                    {
-                    STAR7=(Token)match(input,STAR,FOLLOW_STAR_in_selectList526); if (state.failed) return retval; 
-                    if ( state.backtracking==0 ) stream_STAR.add(STAR7);
-
-
-
-                    // AST REWRITE
-                    // elements: 
-                    // token labels: 
-                    // rule labels: retval
-                    // token list labels: 
-                    // rule list labels: 
-                    // wildcard labels: 
-                    if ( state.backtracking==0 ) {
-                    retval.tree = root_0;
-                    RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"rule retval",retval!=null?retval.tree:null);
-
-                    root_0 = (Object)adaptor.nil();
-                    // 311:17: -> ^( ALL_COLUMNS )
-                    {
-                        // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:312:25: ^( ALL_COLUMNS )
-                        {
-                        Object root_1 = (Object)adaptor.nil();
-                        root_1 = (Object)adaptor.becomeRoot((Object)adaptor.create(ALL_COLUMNS, "ALL_COLUMNS"), root_1);
-
-                        adaptor.addChild(root_0, root_1);
-                        }
-
-                    }
-
-                    retval.tree = root_0;}
-                    }
-                    break;
-                case 2 :
-                    // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:313:11: selectSubList ( COMMA selectSubList )*
-                    {
-                    pushFollow(FOLLOW_selectSubList_in_selectList584);
-                    selectSubList8=selectSubList();
-
-                    state._fsp--;
-                    if (state.failed) return retval;
-                    if ( state.backtracking==0 ) stream_selectSubList.add(selectSubList8.getTree());
-                    // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:313:25: ( COMMA selectSubList )*
-                    loop3:
-                    do {
-                        int alt3=2;
-                        int LA3_0 = input.LA(1);
-
-                        if ( (LA3_0==COMMA) ) {
-                            alt3=1;
-                        }
-
-
-                        switch (alt3) {
-                    	case 1 :
-                    	    // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:313:26: COMMA selectSubList
-                    	    {
-                    	    COMMA9=(Token)match(input,COMMA,FOLLOW_COMMA_in_selectList587); if (state.failed) return retval; 
-                    	    if ( state.backtracking==0 ) stream_COMMA.add(COMMA9);
-
-                    	    pushFollow(FOLLOW_selectSubList_in_selectList589);
-                    	    selectSubList10=selectSubList();
-
-                    	    state._fsp--;
-                    	    if (state.failed) return retval;
-                    	    if ( state.backtracking==0 ) stream_selectSubList.add(selectSubList10.getTree());
-
-                    	    }
-                    	    break;
-
-                    	default :
-                    	    break loop3;
-                        }
-                    } while (true);
-
-
-
-                    // AST REWRITE
-                    // elements: selectSubList
-                    // token labels: 
-                    // rule labels: retval
-                    // token list labels: 
-                    // rule list labels: 
-                    // wildcard labels: 
-                    if ( state.backtracking==0 ) {
-                    retval.tree = root_0;
-                    RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"rule retval",retval!=null?retval.tree:null);
-
-                    root_0 = (Object)adaptor.nil();
-                    // 314:17: -> ^( COLUMNS ( selectSubList )+ )
-                    {
-                        // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:315:25: ^( COLUMNS ( selectSubList )+ )
-                        {
-                        Object root_1 = (Object)adaptor.nil();
-                        root_1 = (Object)adaptor.becomeRoot((Object)adaptor.create(COLUMNS, "COLUMNS"), root_1);
-
-                        if ( !(stream_selectSubList.hasNext()) ) {
-                            throw new RewriteEarlyExitException();
-                        }
-                        while ( stream_selectSubList.hasNext() ) {
-                            adaptor.addChild(root_1, stream_selectSubList.nextTree());
-
-                        }
-                        stream_selectSubList.reset();
-
-                        adaptor.addChild(root_0, root_1);
-                        }
-
-                    }
-
-                    retval.tree = root_0;}
-                    }
-                    break;
-
-            }
-            retval.stop = input.LT(-1);
-
-            if ( state.backtracking==0 ) {
-
-            retval.tree = (Object)adaptor.rulePostProcessing(root_0);
-            adaptor.setTokenBoundaries(retval.tree, retval.start, retval.stop);
-            }
-            if ( state.backtracking==0 ) {
-
-                  paraphrases.pop(); 
-
-            }
-        }
-
-            catch(RecognitionException e)
-            {
-                throw new CMISQueryException(getErrorString(e), e);
-            }
-        finally {
-        }
-        return retval;
-    }
-    // $ANTLR end "selectList"
-
-    public static class selectSubList_return extends ParserRuleReturnScope {
-        Object tree;
-        public Object getTree() { return tree; }
-    };
-
-    // $ANTLR start "selectSubList"
-    // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:318:1: selectSubList : ( valueExpression ( ( AS )? columnName )? -> ^( COLUMN valueExpression ( columnName )? ) | qualifier DOTSTAR -> ^( ALL_COLUMNS qualifier ) );
-    public final CMISParser.selectSubList_return selectSubList() throws RecognitionException {
-        CMISParser.selectSubList_return retval = new CMISParser.selectSubList_return();
-        retval.start = input.LT(1);
-
-        Object root_0 = null;
-
-        Token AS12=null;
-        Token DOTSTAR15=null;
-        CMISParser.valueExpression_return valueExpression11 = null;
-
-        CMISParser.columnName_return columnName13 = null;
-
-        CMISParser.qualifier_return qualifier14 = null;
-
-
-        Object AS12_tree=null;
-        Object DOTSTAR15_tree=null;
-        RewriteRuleTokenStream stream_AS=new RewriteRuleTokenStream(adaptor,"token AS");
-        RewriteRuleTokenStream stream_DOTSTAR=new RewriteRuleTokenStream(adaptor,"token DOTSTAR");
-        RewriteRuleSubtreeStream stream_valueExpression=new RewriteRuleSubtreeStream(adaptor,"rule valueExpression");
-        RewriteRuleSubtreeStream stream_columnName=new RewriteRuleSubtreeStream(adaptor,"rule columnName");
-        RewriteRuleSubtreeStream stream_qualifier=new RewriteRuleSubtreeStream(adaptor,"rule qualifier");
-        try {
-            // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:319:9: ( valueExpression ( ( AS )? columnName )? -> ^( COLUMN valueExpression ( columnName )? ) | qualifier DOTSTAR -> ^( ALL_COLUMNS qualifier ) )
-            int alt7=2;
-            alt7 = dfa7.predict(input);
-            switch (alt7) {
-                case 1 :
-                    // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:320:9: valueExpression ( ( AS )? columnName )?
-                    {
-                    pushFollow(FOLLOW_valueExpression_in_selectSubList673);
-                    valueExpression11=valueExpression();
-
-                    state._fsp--;
-                    if (state.failed) return retval;
-                    if ( state.backtracking==0 ) stream_valueExpression.add(valueExpression11.getTree());
-                    // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:320:25: ( ( AS )? columnName )?
-                    int alt6=2;
-                    int LA6_0 = input.LA(1);
-
-                    if ( (LA6_0==AS) ) {
-                        alt6=1;
-                    }
-                    else if ( (LA6_0==ID) ) {
-                        alt6=1;
-                    }
-                    else if ( (LA6_0==DOUBLE_QUOTE) && ((strict == false))) {
-                        alt6=1;
-                    }
-                    switch (alt6) {
-                        case 1 :
-                            // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:320:26: ( AS )? columnName
-                            {
-                            // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:320:26: ( AS )?
-                            int alt5=2;
-                            int LA5_0 = input.LA(1);
-
-                            if ( (LA5_0==AS) ) {
-                                alt5=1;
-                            }
-                            switch (alt5) {
-                                case 1 :
-                                    // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:320:26: AS
-                                    {
-                                    AS12=(Token)match(input,AS,FOLLOW_AS_in_selectSubList676); if (state.failed) return retval; 
-                                    if ( state.backtracking==0 ) stream_AS.add(AS12);
-
-
-                                    }
-                                    break;
-
-                            }
-
-                            pushFollow(FOLLOW_columnName_in_selectSubList679);
-                            columnName13=columnName();
-
-                            state._fsp--;
-                            if (state.failed) return retval;
-                            if ( state.backtracking==0 ) stream_columnName.add(columnName13.getTree());
-
-                            }
-                            break;
-
-                    }
-
-
-
-                    // AST REWRITE
-                    // elements: valueExpression, columnName
-                    // token labels: 
-                    // rule labels: retval
-                    // token list labels: 
-                    // rule list labels: 
-                    // wildcard labels: 
-                    if ( state.backtracking==0 ) {
-                    retval.tree = root_0;
-                    RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"rule retval",retval!=null?retval.tree:null);
-
-                    root_0 = (Object)adaptor.nil();
-                    // 321:17: -> ^( COLUMN valueExpression ( columnName )? )
-                    {
-                        // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:322:25: ^( COLUMN valueExpression ( columnName )? )
-                        {
-                        Object root_1 = (Object)adaptor.nil();
-                        root_1 = (Object)adaptor.becomeRoot((Object)adaptor.create(COLUMN, "COLUMN"), root_1);
-
-                        adaptor.addChild(root_1, stream_valueExpression.nextTree());
-                        // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:322:50: ( columnName )?
-                        if ( stream_columnName.hasNext() ) {
-                            adaptor.addChild(root_1, stream_columnName.nextTree());
-
-                        }
-                        stream_columnName.reset();
-
-                        adaptor.addChild(root_0, root_1);
-                        }
-
-                    }
-
-                    retval.tree = root_0;}
-                    }
-                    break;
-                case 2 :
-                    // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:323:11: qualifier DOTSTAR
-                    {
-                    pushFollow(FOLLOW_qualifier_in_selectSubList744);
-                    qualifier14=qualifier();
-
-                    state._fsp--;
-                    if (state.failed) return retval;
-                    if ( state.backtracking==0 ) stream_qualifier.add(qualifier14.getTree());
-                    DOTSTAR15=(Token)match(input,DOTSTAR,FOLLOW_DOTSTAR_in_selectSubList746); if (state.failed) return retval; 
-                    if ( state.backtracking==0 ) stream_DOTSTAR.add(DOTSTAR15);
-
-
-
-                    // AST REWRITE
-                    // elements: qualifier
-                    // token labels: 
-                    // rule labels: retval
-                    // token list labels: 
-                    // rule list labels: 
-                    // wildcard labels: 
-                    if ( state.backtracking==0 ) {
-                    retval.tree = root_0;
-                    RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"rule retval",retval!=null?retval.tree:null);
-
-                    root_0 = (Object)adaptor.nil();
-                    // 324:17: -> ^( ALL_COLUMNS qualifier )
-                    {
-                        // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:325:25: ^( ALL_COLUMNS qualifier )
-                        {
-                        Object root_1 = (Object)adaptor.nil();
-                        root_1 = (Object)adaptor.becomeRoot((Object)adaptor.create(ALL_COLUMNS, "ALL_COLUMNS"), root_1);
-
-                        adaptor.addChild(root_1, stream_qualifier.nextTree());
-
-                        adaptor.addChild(root_0, root_1);
-                        }
-
-                    }
-
-                    retval.tree = root_0;}
-                    }
-                    break;
-
-            }
-            retval.stop = input.LT(-1);
-
-            if ( state.backtracking==0 ) {
-
-            retval.tree = (Object)adaptor.rulePostProcessing(root_0);
-            adaptor.setTokenBoundaries(retval.tree, retval.start, retval.stop);
-            }
-        }
-
-            catch(RecognitionException e)
-            {
-                throw new CMISQueryException(getErrorString(e), e);
-            }
-        finally {
-        }
-        return retval;
-    }
-    // $ANTLR end "selectSubList"
-
-    public static class valueExpression_return extends ParserRuleReturnScope {
-        Object tree;
-        public Object getTree() { return tree; }
-    };
-
-    // $ANTLR start "valueExpression"
-    // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:328:1: valueExpression : ( columnReference -> columnReference | valueFunction -> valueFunction );
-    public final CMISParser.valueExpression_return valueExpression() throws RecognitionException {
-        CMISParser.valueExpression_return retval = new CMISParser.valueExpression_return();
-        retval.start = input.LT(1);
-
-        Object root_0 = null;
-
-        CMISParser.columnReference_return columnReference16 = null;
-
-        CMISParser.valueFunction_return valueFunction17 = null;
-
-
-        RewriteRuleSubtreeStream stream_valueFunction=new RewriteRuleSubtreeStream(adaptor,"rule valueFunction");
-        RewriteRuleSubtreeStream stream_columnReference=new RewriteRuleSubtreeStream(adaptor,"rule columnReference");
-
-            paraphrases.push("in value expression"); 
-
-        try {
-            // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:337:9: ( columnReference -> columnReference | valueFunction -> valueFunction )
-            int alt8=2;
-            alt8 = dfa8.predict(input);
-            switch (alt8) {
-                case 1 :
-                    // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:338:9: columnReference
-                    {
-                    pushFollow(FOLLOW_columnReference_in_valueExpression837);
-                    columnReference16=columnReference();
-
-                    state._fsp--;
-                    if (state.failed) return retval;
-                    if ( state.backtracking==0 ) stream_columnReference.add(columnReference16.getTree());
-
-
-                    // AST REWRITE
-                    // elements: columnReference
-                    // token labels: 
-                    // rule labels: retval
-                    // token list labels: 
-                    // rule list labels: 
-                    // wildcard labels: 
-                    if ( state.backtracking==0 ) {
-                    retval.tree = root_0;
-                    RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"rule retval",retval!=null?retval.tree:null);
-
-                    root_0 = (Object)adaptor.nil();
-                    // 339:17: -> columnReference
-                    {
-                        adaptor.addChild(root_0, stream_columnReference.nextTree());
-
-                    }
-
-                    retval.tree = root_0;}
-                    }
-                    break;
-                case 2 :
-                    // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:340:11: valueFunction
-                    {
-                    pushFollow(FOLLOW_valueFunction_in_valueExpression869);
-                    valueFunction17=valueFunction();
-
-                    state._fsp--;
-                    if (state.failed) return retval;
-                    if ( state.backtracking==0 ) stream_valueFunction.add(valueFunction17.getTree());
-
-
-                    // AST REWRITE
-                    // elements: valueFunction
-                    // token labels: 
-                    // rule labels: retval
-                    // token list labels: 
-                    // rule list labels: 
-                    // wildcard labels: 
-                    if ( state.backtracking==0 ) {
-                    retval.tree = root_0;
-                    RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"rule retval",retval!=null?retval.tree:null);
-
-                    root_0 = (Object)adaptor.nil();
-                    // 341:17: -> valueFunction
-                    {
-                        adaptor.addChild(root_0, stream_valueFunction.nextTree());
-
-                    }
-
-                    retval.tree = root_0;}
-                    }
-                    break;
-
-            }
-            retval.stop = input.LT(-1);
-
-            if ( state.backtracking==0 ) {
-
-            retval.tree = (Object)adaptor.rulePostProcessing(root_0);
-            adaptor.setTokenBoundaries(retval.tree, retval.start, retval.stop);
-            }
-            if ( state.backtracking==0 ) {
-
-                  paraphrases.pop(); 
-
-            }
-        }
-
-            catch(RecognitionException e)
-            {
-                throw new CMISQueryException(getErrorString(e), e);
-            }
-        finally {
-        }
-        return retval;
-    }
-    // $ANTLR end "valueExpression"
-
-    public static class columnReference_return extends ParserRuleReturnScope {
-        Object tree;
-        public Object getTree() { return tree; }
-    };
-
-    // $ANTLR start "columnReference"
-    // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:344:1: columnReference : ( qualifier DOT )? columnName -> ^( COLUMN_REF columnName ( qualifier )? ) ;
-    public final CMISParser.columnReference_return columnReference() throws RecognitionException {
-        CMISParser.columnReference_return retval = new CMISParser.columnReference_return();
-        retval.start = input.LT(1);
-
-        Object root_0 = null;
-
-        Token DOT19=null;
-        CMISParser.qualifier_return qualifier18 = null;
-
-        CMISParser.columnName_return columnName20 = null;
-
-
-        Object DOT19_tree=null;
-        RewriteRuleTokenStream stream_DOT=new RewriteRuleTokenStream(adaptor,"token DOT");
-        RewriteRuleSubtreeStream stream_columnName=new RewriteRuleSubtreeStream(adaptor,"rule columnName");
-        RewriteRuleSubtreeStream stream_qualifier=new RewriteRuleSubtreeStream(adaptor,"rule qualifier");
-
-            paraphrases.push("in column reference"); 
-
-        try {
-            // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:353:9: ( ( qualifier DOT )? columnName -> ^( COLUMN_REF columnName ( qualifier )? ) )
-            // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:354:9: ( qualifier DOT )? columnName
-            {
-            // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:354:9: ( qualifier DOT )?
-            int alt9=2;
-            alt9 = dfa9.predict(input);
-            switch (alt9) {
-                case 1 :
-                    // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:354:10: qualifier DOT
-                    {
-                    pushFollow(FOLLOW_qualifier_in_columnReference933);
-                    qualifier18=qualifier();
-
-                    state._fsp--;
-                    if (state.failed) return retval;
-                    if ( state.backtracking==0 ) stream_qualifier.add(qualifier18.getTree());
-                    DOT19=(Token)match(input,DOT,FOLLOW_DOT_in_columnReference935); if (state.failed) return retval; 
-                    if ( state.backtracking==0 ) stream_DOT.add(DOT19);
-
-
-                    }
-                    break;
-
-            }
-
-            pushFollow(FOLLOW_columnName_in_columnReference939);
-            columnName20=columnName();
-
-            state._fsp--;
-            if (state.failed) return retval;
-            if ( state.backtracking==0 ) stream_columnName.add(columnName20.getTree());
-
-
-            // AST REWRITE
-            // elements: qualifier, columnName
-            // token labels: 
-            // rule labels: retval
-            // token list labels: 
-            // rule list labels: 
-            // wildcard labels: 
-            if ( state.backtracking==0 ) {
-            retval.tree = root_0;
-            RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"rule retval",retval!=null?retval.tree:null);
-
-            root_0 = (Object)adaptor.nil();
-            // 355:17: -> ^( COLUMN_REF columnName ( qualifier )? )
-            {
-                // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:356:25: ^( COLUMN_REF columnName ( qualifier )? )
-                {
-                Object root_1 = (Object)adaptor.nil();
-                root_1 = (Object)adaptor.becomeRoot((Object)adaptor.create(COLUMN_REF, "COLUMN_REF"), root_1);
-
-                adaptor.addChild(root_1, stream_columnName.nextTree());
-                // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:356:49: ( qualifier )?
-                if ( stream_qualifier.hasNext() ) {
-                    adaptor.addChild(root_1, stream_qualifier.nextTree());
-
-                }
-                stream_qualifier.reset();
-
-                adaptor.addChild(root_0, root_1);
-                }
-
-            }
-
-            retval.tree = root_0;}
-            }
-
-            retval.stop = input.LT(-1);
-
-            if ( state.backtracking==0 ) {
-
-            retval.tree = (Object)adaptor.rulePostProcessing(root_0);
-            adaptor.setTokenBoundaries(retval.tree, retval.start, retval.stop);
-            }
-            if ( state.backtracking==0 ) {
-
-                  paraphrases.pop(); 
-
-            }
-        }
-
-            catch(RecognitionException e)
-            {
-                throw new CMISQueryException(getErrorString(e), e);
-            }
-        finally {
-        }
-        return retval;
-    }
-    // $ANTLR end "columnReference"
-
-    public static class valueFunction_return extends ParserRuleReturnScope {
-        Object tree;
-        public Object getTree() { return tree; }
-    };
-
-    // $ANTLR start "valueFunction"
-    // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:359:1: valueFunction : (cmisFunctionName= cmisFunction LPAREN ( functionArgument )* RPAREN -> ^( FUNCTION $cmisFunctionName LPAREN ( functionArgument )* RPAREN ) | {...}? =>functionName= keyWordOrId LPAREN ( functionArgument )* RPAREN -> ^( FUNCTION $functionName LPAREN ( functionArgument )* RPAREN ) );
-    public final CMISParser.valueFunction_return valueFunction() throws RecognitionException {
-        CMISParser.valueFunction_return retval = new CMISParser.valueFunction_return();
-        retval.start = input.LT(1);
-
-        Object root_0 = null;
-
-        Token LPAREN21=null;
-        Token RPAREN23=null;
-        Token LPAREN24=null;
-        Token RPAREN26=null;
-        CMISParser.cmisFunction_return cmisFunctionName = null;
-
-        CMISParser.keyWordOrId_return functionName = null;
-
-        CMISParser.functionArgument_return functionArgument22 = null;
-
-        CMISParser.functionArgument_return functionArgument25 = null;
-
-
-        Object LPAREN21_tree=null;
-        Object RPAREN23_tree=null;
-        Object LPAREN24_tree=null;
-        Object RPAREN26_tree=null;
-        RewriteRuleTokenStream stream_RPAREN=new RewriteRuleTokenStream(adaptor,"token RPAREN");
-        RewriteRuleTokenStream stream_LPAREN=new RewriteRuleTokenStream(adaptor,"token LPAREN");
-        RewriteRuleSubtreeStream stream_cmisFunction=new RewriteRuleSubtreeStream(adaptor,"rule cmisFunction");
-        RewriteRuleSubtreeStream stream_keyWordOrId=new RewriteRuleSubtreeStream(adaptor,"rule keyWordOrId");
-        RewriteRuleSubtreeStream stream_functionArgument=new RewriteRuleSubtreeStream(adaptor,"rule functionArgument");
-
-            paraphrases.push("in function"); 
-
-        try {
-            // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:368:9: (cmisFunctionName= cmisFunction LPAREN ( functionArgument )* RPAREN -> ^( FUNCTION $cmisFunctionName LPAREN ( functionArgument )* RPAREN ) | {...}? =>functionName= keyWordOrId LPAREN ( functionArgument )* RPAREN -> ^( FUNCTION $functionName LPAREN ( functionArgument )* RPAREN ) )
-            int alt12=2;
-            alt12 = dfa12.predict(input);
-            switch (alt12) {
-                case 1 :
-                    // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:369:9: cmisFunctionName= cmisFunction LPAREN ( functionArgument )* RPAREN
-                    {
-                    pushFollow(FOLLOW_cmisFunction_in_valueFunction1035);
-                    cmisFunctionName=cmisFunction();
-
-                    state._fsp--;
-                    if (state.failed) return retval;
-                    if ( state.backtracking==0 ) stream_cmisFunction.add(cmisFunctionName.getTree());
-                    LPAREN21=(Token)match(input,LPAREN,FOLLOW_LPAREN_in_valueFunction1037); if (state.failed) return retval; 
-                    if ( state.backtracking==0 ) stream_LPAREN.add(LPAREN21);
-
-                    // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:369:46: ( functionArgument )*
-                    loop10:
-                    do {
-                        int alt10=2;
-                        alt10 = dfa10.predict(input);
-                        switch (alt10) {
-                    	case 1 :
-                    	    // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:369:46: functionArgument
-                    	    {
-                    	    pushFollow(FOLLOW_functionArgument_in_valueFunction1039);
-                    	    functionArgument22=functionArgument();
-
-                    	    state._fsp--;
-                    	    if (state.failed) return retval;
-                    	    if ( state.backtracking==0 ) stream_functionArgument.add(functionArgument22.getTree());
-
-                    	    }
-                    	    break;
-
-                    	default :
-                    	    break loop10;
-                        }
-                    } while (true);
-
-                    RPAREN23=(Token)match(input,RPAREN,FOLLOW_RPAREN_in_valueFunction1042); if (state.failed) return retval; 
-                    if ( state.backtracking==0 ) stream_RPAREN.add(RPAREN23);
-
-
-
-                    // AST REWRITE
-                    // elements: cmisFunctionName, LPAREN, functionArgument, RPAREN
-                    // token labels: 
-                    // rule labels: retval, cmisFunctionName
-                    // token list labels: 
-                    // rule list labels: 
-                    // wildcard labels: 
-                    if ( state.backtracking==0 ) {
-                    retval.tree = root_0;
-                    RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"rule retval",retval!=null?retval.tree:null);
-                    RewriteRuleSubtreeStream stream_cmisFunctionName=new RewriteRuleSubtreeStream(adaptor,"rule cmisFunctionName",cmisFunctionName!=null?cmisFunctionName.tree:null);
-
-                    root_0 = (Object)adaptor.nil();
-                    // 370:17: -> ^( FUNCTION $cmisFunctionName LPAREN ( functionArgument )* RPAREN )
-                    {
-                        // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:371:25: ^( FUNCTION $cmisFunctionName LPAREN ( functionArgument )* RPAREN )
-                        {
-                        Object root_1 = (Object)adaptor.nil();
-                        root_1 = (Object)adaptor.becomeRoot((Object)adaptor.create(FUNCTION, "FUNCTION"), root_1);
-
-                        adaptor.addChild(root_1, stream_cmisFunctionName.nextTree());
-                        adaptor.addChild(root_1, stream_LPAREN.nextNode());
-                        // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:371:61: ( functionArgument )*
-                        while ( stream_functionArgument.hasNext() ) {
-                            adaptor.addChild(root_1, stream_functionArgument.nextTree());
-
-                        }
-                        stream_functionArgument.reset();
-                        adaptor.addChild(root_1, stream_RPAREN.nextNode());
-
-                        adaptor.addChild(root_0, root_1);
-                        }
-
-                    }
-
-                    retval.tree = root_0;}
-                    }
-                    break;
-                case 2 :
-                    // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:372:11: {...}? =>functionName= keyWordOrId LPAREN ( functionArgument )* RPAREN
-                    {
-                    if ( !((strict == false)) ) {
-                        if (state.backtracking>0) {state.failed=true; return retval;}
-                        throw new FailedPredicateException(input, "valueFunction", "strict == false");
-                    }
-                    pushFollow(FOLLOW_keyWordOrId_in_valueFunction1115);
-                    functionName=keyWordOrId();
-
-                    state._fsp--;
-                    if (state.failed) return retval;
-                    if ( state.backtracking==0 ) stream_keyWordOrId.add(functionName.getTree());
-                    LPAREN24=(Token)match(input,LPAREN,FOLLOW_LPAREN_in_valueFunction1117); if (state.failed) return retval; 
-                    if ( state.backtracking==0 ) stream_LPAREN.add(LPAREN24);
-
-                    // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:372:64: ( functionArgument )*
-                    loop11:
-                    do {
-                        int alt11=2;
-                        alt11 = dfa11.predict(input);
-                        switch (alt11) {
-                    	case 1 :
-                    	    // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:372:64: functionArgument
-                    	    {
-                    	    pushFollow(FOLLOW_functionArgument_in_valueFunction1119);
-                    	    functionArgument25=functionArgument();
-
-                    	    state._fsp--;
-                    	    if (state.failed) return retval;
-                    	    if ( state.backtracking==0 ) stream_functionArgument.add(functionArgument25.getTree());
-
-                    	    }
-                    	    break;
-
-                    	default :
-                    	    break loop11;
-                        }
-                    } while (true);
-
-                    RPAREN26=(Token)match(input,RPAREN,FOLLOW_RPAREN_in_valueFunction1122); if (state.failed) return retval; 
-                    if ( state.backtracking==0 ) stream_RPAREN.add(RPAREN26);
-
-
-
-                    // AST REWRITE
-                    // elements: LPAREN, functionName, RPAREN, functionArgument
-                    // token labels: 
-                    // rule labels: retval, functionName
-                    // token list labels: 
-                    // rule list labels: 
-                    // wildcard labels: 
-                    if ( state.backtracking==0 ) {
-                    retval.tree = root_0;
-                    RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"rule retval",retval!=null?retval.tree:null);
-                    RewriteRuleSubtreeStream stream_functionName=new RewriteRuleSubtreeStream(adaptor,"rule functionName",functionName!=null?functionName.tree:null);
-
-                    root_0 = (Object)adaptor.nil();
-                    // 373:17: -> ^( FUNCTION $functionName LPAREN ( functionArgument )* RPAREN )
-                    {
-                        // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:374:25: ^( FUNCTION $functionName LPAREN ( functionArgument )* RPAREN )
-                        {
-                        Object root_1 = (Object)adaptor.nil();
-                        root_1 = (Object)adaptor.becomeRoot((Object)adaptor.create(FUNCTION, "FUNCTION"), root_1);
-
-                        adaptor.addChild(root_1, stream_functionName.nextTree());
-                        adaptor.addChild(root_1, stream_LPAREN.nextNode());
-                        // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:374:57: ( functionArgument )*
-                        while ( stream_functionArgument.hasNext() ) {
-                            adaptor.addChild(root_1, stream_functionArgument.nextTree());
-
-                        }
-                        stream_functionArgument.reset();
-                        adaptor.addChild(root_1, stream_RPAREN.nextNode());
-
-                        adaptor.addChild(root_0, root_1);
-                        }
-
-                    }
-
-                    retval.tree = root_0;}
-                    }
-                    break;
-
-            }
-            retval.stop = input.LT(-1);
-
-            if ( state.backtracking==0 ) {
-
-            retval.tree = (Object)adaptor.rulePostProcessing(root_0);
-            adaptor.setTokenBoundaries(retval.tree, retval.start, retval.stop);
-            }
-            if ( state.backtracking==0 ) {
-
-                  paraphrases.pop(); 
-
-            }
-        }
-
-            catch(RecognitionException e)
-            {
-                throw new CMISQueryException(getErrorString(e), e);
-            }
-        finally {
-        }
-        return retval;
-    }
-    // $ANTLR end "valueFunction"
-
-    public static class functionArgument_return extends ParserRuleReturnScope {
-        Object tree;
-        public Object getTree() { return tree; }
-    };
-
-    // $ANTLR start "functionArgument"
-    // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:377:1: functionArgument : ( qualifier DOT columnName -> ^( COLUMN_REF columnName qualifier ) | identifier | literalOrParameterName );
-    public final CMISParser.functionArgument_return functionArgument() throws RecognitionException {
-        CMISParser.functionArgument_return retval = new CMISParser.functionArgument_return();
-        retval.start = input.LT(1);
-
-        Object root_0 = null;
-
-        Token DOT28=null;
-        CMISParser.qualifier_return qualifier27 = null;
-
-        CMISParser.columnName_return columnName29 = null;
-
-        CMISParser.identifier_return identifier30 = null;
-
-        CMISParser.literalOrParameterName_return literalOrParameterName31 = null;
-
-
-        Object DOT28_tree=null;
-        RewriteRuleTokenStream stream_DOT=new RewriteRuleTokenStream(adaptor,"token DOT");
-        RewriteRuleSubtreeStream stream_columnName=new RewriteRuleSubtreeStream(adaptor,"rule columnName");
-        RewriteRuleSubtreeStream stream_qualifier=new RewriteRuleSubtreeStream(adaptor,"rule qualifier");
-        try {
-            // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:378:9: ( qualifier DOT columnName -> ^( COLUMN_REF columnName qualifier ) | identifier | literalOrParameterName )
-            int alt13=3;
-            alt13 = dfa13.predict(input);
-            switch (alt13) {
-                case 1 :
-                    // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:379:9: qualifier DOT columnName
-                    {
-                    pushFollow(FOLLOW_qualifier_in_functionArgument1211);
-                    qualifier27=qualifier();
-
-                    state._fsp--;
-                    if (state.failed) return retval;
-                    if ( state.backtracking==0 ) stream_qualifier.add(qualifier27.getTree());
-                    DOT28=(Token)match(input,DOT,FOLLOW_DOT_in_functionArgument1213); if (state.failed) return retval; 
-                    if ( state.backtracking==0 ) stream_DOT.add(DOT28);
-
-                    pushFollow(FOLLOW_columnName_in_functionArgument1215);
-                    columnName29=columnName();
-
-                    state._fsp--;
-                    if (state.failed) return retval;
-                    if ( state.backtracking==0 ) stream_columnName.add(columnName29.getTree());
-
-
-                    // AST REWRITE
-                    // elements: qualifier, columnName
-                    // token labels: 
-                    // rule labels: retval
-                    // token list labels: 
-                    // rule list labels: 
-                    // wildcard labels: 
-                    if ( state.backtracking==0 ) {
-                    retval.tree = root_0;
-                    RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"rule retval",retval!=null?retval.tree:null);
-
-                    root_0 = (Object)adaptor.nil();
-                    // 380:17: -> ^( COLUMN_REF columnName qualifier )
-                    {
-                        // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:381:25: ^( COLUMN_REF columnName qualifier )
-                        {
-                        Object root_1 = (Object)adaptor.nil();
-                        root_1 = (Object)adaptor.becomeRoot((Object)adaptor.create(COLUMN_REF, "COLUMN_REF"), root_1);
-
-                        adaptor.addChild(root_1, stream_columnName.nextTree());
-                        adaptor.addChild(root_1, stream_qualifier.nextTree());
-
-                        adaptor.addChild(root_0, root_1);
-                        }
-
-                    }
-
-                    retval.tree = root_0;}
-                    }
-                    break;
-                case 2 :
-                    // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:382:11: identifier
-                    {
-                    root_0 = (Object)adaptor.nil();
-
-                    pushFollow(FOLLOW_identifier_in_functionArgument1277);
-                    identifier30=identifier();
-
-                    state._fsp--;
-                    if (state.failed) return retval;
-                    if ( state.backtracking==0 ) adaptor.addChild(root_0, identifier30.getTree());
-
-                    }
-                    break;
-                case 3 :
-                    // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:383:11: literalOrParameterName
-                    {
-                    root_0 = (Object)adaptor.nil();
-
-                    pushFollow(FOLLOW_literalOrParameterName_in_functionArgument1289);
-                    literalOrParameterName31=literalOrParameterName();
-
-                    state._fsp--;
-                    if (state.failed) return retval;
-                    if ( state.backtracking==0 ) adaptor.addChild(root_0, literalOrParameterName31.getTree());
-
-                    }
-                    break;
-
-            }
-            retval.stop = input.LT(-1);
-
-            if ( state.backtracking==0 ) {
-
-            retval.tree = (Object)adaptor.rulePostProcessing(root_0);
-            adaptor.setTokenBoundaries(retval.tree, retval.start, retval.stop);
-            }
-        }
-
-            catch(RecognitionException e)
-            {
-                throw new CMISQueryException(getErrorString(e), e);
-            }
-        finally {
-        }
-        return retval;
-    }
-    // $ANTLR end "functionArgument"
-
-    public static class qualifier_return extends ParserRuleReturnScope {
-        Object tree;
-        public Object getTree() { return tree; }
-    };
-
-    // $ANTLR start "qualifier"
-    // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:386:1: qualifier : ( ( tableName )=> tableName -> tableName | correlationName -> correlationName );
-    public final CMISParser.qualifier_return qualifier() throws RecognitionException {
-        CMISParser.qualifier_return retval = new CMISParser.qualifier_return();
-        retval.start = input.LT(1);
-
-        Object root_0 = null;
-
-        CMISParser.tableName_return tableName32 = null;
-
-        CMISParser.correlationName_return correlationName33 = null;
-
-
-        RewriteRuleSubtreeStream stream_correlationName=new RewriteRuleSubtreeStream(adaptor,"rule correlationName");
-        RewriteRuleSubtreeStream stream_tableName=new RewriteRuleSubtreeStream(adaptor,"rule tableName");
-        try {
-            // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:387:9: ( ( tableName )=> tableName -> tableName | correlationName -> correlationName )
-            int alt14=2;
-            alt14 = dfa14.predict(input);
-            switch (alt14) {
-                case 1 :
-                    // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:388:9: ( tableName )=> tableName
-                    {
-                    pushFollow(FOLLOW_tableName_in_qualifier1328);
-                    tableName32=tableName();
-
-                    state._fsp--;
-                    if (state.failed) return retval;
-                    if ( state.backtracking==0 ) stream_tableName.add(tableName32.getTree());
-
-
-                    // AST REWRITE
-                    // elements: tableName
-                    // token labels: 
-                    // rule labels: retval
-                    // token list labels: 
-                    // rule list labels: 
-                    // wildcard labels: 
-                    if ( state.backtracking==0 ) {
-                    retval.tree = root_0;
-                    RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"rule retval",retval!=null?retval.tree:null);
-
-                    root_0 = (Object)adaptor.nil();
-                    // 389:17: -> tableName
-                    {
-                        adaptor.addChild(root_0, stream_tableName.nextTree());
-
-                    }
-
-                    retval.tree = root_0;}
-                    }
-                    break;
-                case 2 :
-                    // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:390:11: correlationName
-                    {
-                    pushFollow(FOLLOW_correlationName_in_qualifier1360);
-                    correlationName33=correlationName();
-
-                    state._fsp--;
-                    if (state.failed) return retval;
-                    if ( state.backtracking==0 ) stream_correlationName.add(correlationName33.getTree());
-
-
-                    // AST REWRITE
-                    // elements: correlationName
-                    // token labels: 
-                    // rule labels: retval
-                    // token list labels: 
-                    // rule list labels: 
-                    // wildcard labels: 
-                    if ( state.backtracking==0 ) {
-                    retval.tree = root_0;
-                    RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"rule retval",retval!=null?retval.tree:null);
-
-                    root_0 = (Object)adaptor.nil();
-                    // 391:17: -> correlationName
-                    {
-                        adaptor.addChild(root_0, stream_correlationName.nextTree());
-
-                    }
-
-                    retval.tree = root_0;}
-                    }
-                    break;
-
-            }
-            retval.stop = input.LT(-1);
-
-            if ( state.backtracking==0 ) {
-
-            retval.tree = (Object)adaptor.rulePostProcessing(root_0);
-            adaptor.setTokenBoundaries(retval.tree, retval.start, retval.stop);
-            }
-        }
-
-            catch(RecognitionException e)
-            {
-                throw new CMISQueryException(getErrorString(e), e);
-            }
-        finally {
-        }
-        return retval;
-    }
-    // $ANTLR end "qualifier"
-
-    public static class fromClause_return extends ParserRuleReturnScope {
-        Object tree;
-        public Object getTree() { return tree; }
-    };
-
-    // $ANTLR start "fromClause"
-    // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:394:1: fromClause : FROM tableReference -> tableReference ;
-    public final CMISParser.fromClause_return fromClause() throws RecognitionException {
-        CMISParser.fromClause_return retval = new CMISParser.fromClause_return();
-        retval.start = input.LT(1);
-
-        Object root_0 = null;
-
-        Token FROM34=null;
-        CMISParser.tableReference_return tableReference35 = null;
-
-
-        Object FROM34_tree=null;
-        RewriteRuleTokenStream stream_FROM=new RewriteRuleTokenStream(adaptor,"token FROM");
-        RewriteRuleSubtreeStream stream_tableReference=new RewriteRuleSubtreeStream(adaptor,"rule tableReference");
-
-            paraphrases.push("in fromClause"); 
-
-        try {
-            // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:403:9: ( FROM tableReference -> tableReference )
-            // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:404:9: FROM tableReference
-            {
-            FROM34=(Token)match(input,FROM,FOLLOW_FROM_in_fromClause1423); if (state.failed) return retval; 
-            if ( state.backtracking==0 ) stream_FROM.add(FROM34);
-
-            pushFollow(FOLLOW_tableReference_in_fromClause1425);
-            tableReference35=tableReference();
-
-            state._fsp--;
-            if (state.failed) return retval;
-            if ( state.backtracking==0 ) stream_tableReference.add(tableReference35.getTree());
-
-
-            // AST REWRITE
-            // elements: tableReference
-            // token labels: 
-            // rule labels: retval
-            // token list labels: 
-            // rule list labels: 
-            // wildcard labels: 
-            if ( state.backtracking==0 ) {
-            retval.tree = root_0;
-            RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"rule retval",retval!=null?retval.tree:null);
-
-            root_0 = (Object)adaptor.nil();
-            // 405:17: -> tableReference
-            {
-                adaptor.addChild(root_0, stream_tableReference.nextTree());
-
-            }
-
-            retval.tree = root_0;}
-            }
-
-            retval.stop = input.LT(-1);
-
-            if ( state.backtracking==0 ) {
-
-            retval.tree = (Object)adaptor.rulePostProcessing(root_0);
-            adaptor.setTokenBoundaries(retval.tree, retval.start, retval.stop);
-            }
-            if ( state.backtracking==0 ) {
-
-                  paraphrases.pop(); 
-
-            }
-        }
-
-            catch(RecognitionException e)
-            {
-                throw new CMISQueryException(getErrorString(e), e);
-            }
-        finally {
-        }
-        return retval;
-    }
-    // $ANTLR end "fromClause"
-
-    public static class tableReference_return extends ParserRuleReturnScope {
-        Object tree;
-        public Object getTree() { return tree; }
-    };
-
-    // $ANTLR start "tableReference"
-    // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:408:1: tableReference : singleTable ( joinedTable )* -> ^( SOURCE singleTable ( joinedTable )* ) ;
-    public final CMISParser.tableReference_return tableReference() throws RecognitionException {
-        CMISParser.tableReference_return retval = new CMISParser.tableReference_return();
-        retval.start = input.LT(1);
-
-        Object root_0 = null;
-
-        CMISParser.singleTable_return singleTable36 = null;
-
-        CMISParser.joinedTable_return joinedTable37 = null;
-
-
-        RewriteRuleSubtreeStream stream_singleTable=new RewriteRuleSubtreeStream(adaptor,"rule singleTable");
-        RewriteRuleSubtreeStream stream_joinedTable=new RewriteRuleSubtreeStream(adaptor,"rule joinedTable");
-
-            paraphrases.push("in tableReference"); 
-
-        try {
-            // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:417:9: ( singleTable ( joinedTable )* -> ^( SOURCE singleTable ( joinedTable )* ) )
-            // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:418:9: singleTable ( joinedTable )*
-            {
-            pushFollow(FOLLOW_singleTable_in_tableReference1488);
-            singleTable36=singleTable();
-
-            state._fsp--;
-            if (state.failed) return retval;
-            if ( state.backtracking==0 ) stream_singleTable.add(singleTable36.getTree());
-            // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:418:21: ( joinedTable )*
-            loop15:
-            do {
-                int alt15=2;
-                int LA15_0 = input.LA(1);
-
-                if ( ((LA15_0>=JOIN && LA15_0<=LEFT)) ) {
-                    alt15=1;
-                }
-
-
-                switch (alt15) {
-            	case 1 :
-            	    // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:418:21: joinedTable
-            	    {
-            	    pushFollow(FOLLOW_joinedTable_in_tableReference1490);
-            	    joinedTable37=joinedTable();
-
-            	    state._fsp--;
-            	    if (state.failed) return retval;
-            	    if ( state.backtracking==0 ) stream_joinedTable.add(joinedTable37.getTree());
-
-            	    }
-            	    break;
-
-            	default :
-            	    break loop15;
-                }
-            } while (true);
-
-
-
-            // AST REWRITE
-            // elements: singleTable, joinedTable
-            // token labels: 
-            // rule labels: retval
-            // token list labels: 
-            // rule list labels: 
-            // wildcard labels: 
-            if ( state.backtracking==0 ) {
-            retval.tree = root_0;
-            RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"rule retval",retval!=null?retval.tree:null);
-
-            root_0 = (Object)adaptor.nil();
-            // 419:17: -> ^( SOURCE singleTable ( joinedTable )* )
-            {
-                // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:420:25: ^( SOURCE singleTable ( joinedTable )* )
-                {
-                Object root_1 = (Object)adaptor.nil();
-                root_1 = (Object)adaptor.becomeRoot((Object)adaptor.create(SOURCE, "SOURCE"), root_1);
-
-                adaptor.addChild(root_1, stream_singleTable.nextTree());
-                // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:420:46: ( joinedTable )*
-                while ( stream_joinedTable.hasNext() ) {
-                    adaptor.addChild(root_1, stream_joinedTable.nextTree());
-
-                }
-                stream_joinedTable.reset();
-
-                adaptor.addChild(root_0, root_1);
-                }
-
-            }
-
-            retval.tree = root_0;}
-            }
-
-            retval.stop = input.LT(-1);
-
-            if ( state.backtracking==0 ) {
-
-            retval.tree = (Object)adaptor.rulePostProcessing(root_0);
-            adaptor.setTokenBoundaries(retval.tree, retval.start, retval.stop);
-            }
-            if ( state.backtracking==0 ) {
-
-                  paraphrases.pop(); 
-
-            }
-        }
-
-            catch(RecognitionException e)
-            {
-                throw new CMISQueryException(getErrorString(e), e);
-            }
-        finally {
-        }
-        return retval;
-    }
-    // $ANTLR end "tableReference"
-
-    public static class singleTable_return extends ParserRuleReturnScope {
-        Object tree;
-        public Object getTree() { return tree; }
-    };
-
-    // $ANTLR start "singleTable"
-    // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:427:1: singleTable : ( simpleTable -> simpleTable | complexTable -> ^( TABLE complexTable ) );
-    public final CMISParser.singleTable_return singleTable() throws RecognitionException {
-        CMISParser.singleTable_return retval = new CMISParser.singleTable_return();
-        retval.start = input.LT(1);
-
-        Object root_0 = null;
-
-        CMISParser.simpleTable_return simpleTable38 = null;
-
-        CMISParser.complexTable_return complexTable39 = null;
-
-
-        RewriteRuleSubtreeStream stream_simpleTable=new RewriteRuleSubtreeStream(adaptor,"rule simpleTable");
-        RewriteRuleSubtreeStream stream_complexTable=new RewriteRuleSubtreeStream(adaptor,"rule complexTable");
-
-            paraphrases.push("in singleTable"); 
-
-        try {
-            // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:436:9: ( simpleTable -> simpleTable | complexTable -> ^( TABLE complexTable ) )
-            int alt16=2;
-            int LA16_0 = input.LA(1);
-
-            if ( (LA16_0==ID) ) {
-                alt16=1;
-            }
-            else if ( (LA16_0==DOUBLE_QUOTE) && ((strict == false))) {
-                alt16=1;
-            }
-            else if ( (LA16_0==LPAREN) ) {
-                alt16=2;
-            }
-            else {
-                if (state.backtracking>0) {state.failed=true; return retval;}
-                NoViableAltException nvae =
-                    new NoViableAltException("", 16, 0, input);
-
-                throw nvae;
-            }
-            switch (alt16) {
-                case 1 :
-                    // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:437:9: simpleTable
-                    {
-                    pushFollow(FOLLOW_simpleTable_in_singleTable1588);
-                    simpleTable38=simpleTable();
-
-                    state._fsp--;
-                    if (state.failed) return retval;
-                    if ( state.backtracking==0 ) stream_simpleTable.add(simpleTable38.getTree());
-
-
-                    // AST REWRITE
-                    // elements: simpleTable
-                    // token labels: 
-                    // rule labels: retval
-                    // token list labels: 
-                    // rule list labels: 
-                    // wildcard labels: 
-                    if ( state.backtracking==0 ) {
-                    retval.tree = root_0;
-                    RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"rule retval",retval!=null?retval.tree:null);
-
-                    root_0 = (Object)adaptor.nil();
-                    // 438:17: -> simpleTable
-                    {
-                        adaptor.addChild(root_0, stream_simpleTable.nextTree());
-
-                    }
-
-                    retval.tree = root_0;}
-                    }
-                    break;
-                case 2 :
-                    // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:439:11: complexTable
-                    {
-                    pushFollow(FOLLOW_complexTable_in_singleTable1620);
-                    complexTable39=complexTable();
-
-                    state._fsp--;
-                    if (state.failed) return retval;
-                    if ( state.backtracking==0 ) stream_complexTable.add(complexTable39.getTree());
-
-
-                    // AST REWRITE
-                    // elements: complexTable
-                    // token labels: 
-                    // rule labels: retval
-                    // token list labels: 
-                    // rule list labels: 
-                    // wildcard labels: 
-                    if ( state.backtracking==0 ) {
-                    retval.tree = root_0;
-                    RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"rule retval",retval!=null?retval.tree:null);
-
-                    root_0 = (Object)adaptor.nil();
-                    // 440:17: -> ^( TABLE complexTable )
-                    {
-                        // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:441:25: ^( TABLE complexTable )
-                        {
-                        Object root_1 = (Object)adaptor.nil();
-                        root_1 = (Object)adaptor.becomeRoot((Object)adaptor.create(TABLE, "TABLE"), root_1);
-
-                        adaptor.addChild(root_1, stream_complexTable.nextTree());
-
-                        adaptor.addChild(root_0, root_1);
-                        }
-
-                    }
-
-                    retval.tree = root_0;}
-                    }
-                    break;
-
-            }
-            retval.stop = input.LT(-1);
-
-            if ( state.backtracking==0 ) {
-
-            retval.tree = (Object)adaptor.rulePostProcessing(root_0);
-            adaptor.setTokenBoundaries(retval.tree, retval.start, retval.stop);
-            }
-            if ( state.backtracking==0 ) {
-
-                  paraphrases.pop(); 
-
-            }
-        }
-
-            catch(RecognitionException e)
-            {
-                throw new CMISQueryException(getErrorString(e), e);
-            }
-        finally {
-        }
-        return retval;
-    }
-    // $ANTLR end "singleTable"
-
-    public static class simpleTable_return extends ParserRuleReturnScope {
-        Object tree;
-        public Object getTree() { return tree; }
-    };
-
-    // $ANTLR start "simpleTable"
-    // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:444:1: simpleTable : tableName ( ( AS )? correlationName )? -> ^( TABLE_REF tableName ( correlationName )? ) ;
-    public final CMISParser.simpleTable_return simpleTable() throws RecognitionException {
-        CMISParser.simpleTable_return retval = new CMISParser.simpleTable_return();
-        retval.start = input.LT(1);
-
-        Object root_0 = null;
-
-        Token AS41=null;
-        CMISParser.tableName_return tableName40 = null;
-
-        CMISParser.correlationName_return correlationName42 = null;
-
-
-        Object AS41_tree=null;
-        RewriteRuleTokenStream stream_AS=new RewriteRuleTokenStream(adaptor,"token AS");
-        RewriteRuleSubtreeStream stream_correlationName=new RewriteRuleSubtreeStream(adaptor,"rule correlationName");
-        RewriteRuleSubtreeStream stream_tableName=new RewriteRuleSubtreeStream(adaptor,"rule tableName");
-
-            paraphrases.push("in simpleTable"); 
-
-        try {
-            // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:453:9: ( tableName ( ( AS )? correlationName )? -> ^( TABLE_REF tableName ( correlationName )? ) )
-            // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:454:9: tableName ( ( AS )? correlationName )?
-            {
-            pushFollow(FOLLOW_tableName_in_simpleTable1711);
-            tableName40=tableName();
-
-            state._fsp--;
-            if (state.failed) return retval;
-            if ( state.backtracking==0 ) stream_tableName.add(tableName40.getTree());
-            // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:454:19: ( ( AS )? correlationName )?
-            int alt18=2;
-            alt18 = dfa18.predict(input);
-            switch (alt18) {
-                case 1 :
-                    // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:454:20: ( AS )? correlationName
-                    {
-                    // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:454:20: ( AS )?
-                    int alt17=2;
-                    int LA17_0 = input.LA(1);
-
-                    if ( (LA17_0==AS) ) {
-                        alt17=1;
-                    }
-                    switch (alt17) {
-                        case 1 :
-                            // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:454:20: AS
-                            {
-                            AS41=(Token)match(input,AS,FOLLOW_AS_in_simpleTable1714); if (state.failed) return retval; 
-                            if ( state.backtracking==0 ) stream_AS.add(AS41);
-
-
-                            }
-                            break;
-
-                    }
-
-                    pushFollow(FOLLOW_correlationName_in_simpleTable1717);
-                    correlationName42=correlationName();
-
-                    state._fsp--;
-                    if (state.failed) return retval;
-                    if ( state.backtracking==0 ) stream_correlationName.add(correlationName42.getTree());
-
-                    }
-                    break;
-
-            }
-
-
-
-            // AST REWRITE
-            // elements: tableName, correlationName
-            // token labels: 
-            // rule labels: retval
-            // token list labels: 
-            // rule list labels: 
-            // wildcard labels: 
-            if ( state.backtracking==0 ) {
-            retval.tree = root_0;
-            RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"rule retval",retval!=null?retval.tree:null);
-
-            root_0 = (Object)adaptor.nil();
-            // 455:17: -> ^( TABLE_REF tableName ( correlationName )? )
-            {
-                // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:456:25: ^( TABLE_REF tableName ( correlationName )? )
-                {
-                Object root_1 = (Object)adaptor.nil();
-                root_1 = (Object)adaptor.becomeRoot((Object)adaptor.create(TABLE_REF, "TABLE_REF"), root_1);
-
-                adaptor.addChild(root_1, stream_tableName.nextTree());
-                // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:456:47: ( correlationName )?
-                if ( stream_correlationName.hasNext() ) {
-                    adaptor.addChild(root_1, stream_correlationName.nextTree());
-
-                }
-                stream_correlationName.reset();
-
-                adaptor.addChild(root_0, root_1);
-                }
-
-            }
-
-            retval.tree = root_0;}
-            }
-
-            retval.stop = input.LT(-1);
-
-            if ( state.backtracking==0 ) {
-
-            retval.tree = (Object)adaptor.rulePostProcessing(root_0);
-            adaptor.setTokenBoundaries(retval.tree, retval.start, retval.stop);
-            }
-            if ( state.backtracking==0 ) {
-
-                  paraphrases.pop(); 
-
-            }
-        }
-
-            catch(RecognitionException e)
-            {
-                throw new CMISQueryException(getErrorString(e), e);
-            }
-        finally {
-        }
-        return retval;
-    }
-    // $ANTLR end "simpleTable"
-
-    public static class joinedTable_return extends ParserRuleReturnScope {
-        Object tree;
-        public Object getTree() { return tree; }
-    };
-
-    // $ANTLR start "joinedTable"
-    // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:459:1: joinedTable : ( joinType )? JOIN tableReference joinSpecification -> ^( JOIN tableReference ( joinType )? joinSpecification ) ;
-    public final CMISParser.joinedTable_return joinedTable() throws RecognitionException {
-        CMISParser.joinedTable_return retval = new CMISParser.joinedTable_return();
-        retval.start = input.LT(1);
-
-        Object root_0 = null;
-
-        Token JOIN44=null;
-        CMISParser.joinType_return joinType43 = null;
-
-        CMISParser.tableReference_return tableReference45 = null;
-
-        CMISParser.joinSpecification_return joinSpecification46 = null;
-
-
-        Object JOIN44_tree=null;
-        RewriteRuleTokenStream stream_JOIN=new RewriteRuleTokenStream(adaptor,"token JOIN");
-        RewriteRuleSubtreeStream stream_tableReference=new RewriteRuleSubtreeStream(adaptor,"rule tableReference");
-        RewriteRuleSubtreeStream stream_joinType=new RewriteRuleSubtreeStream(adaptor,"rule joinType");
-        RewriteRuleSubtreeStream stream_joinSpecification=new RewriteRuleSubtreeStream(adaptor,"rule joinSpecification");
-
-            paraphrases.push("in joinedTable"); 
-
-        try {
-            // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:468:9: ( ( joinType )? JOIN tableReference joinSpecification -> ^( JOIN tableReference ( joinType )? joinSpecification ) )
-            // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:469:9: ( joinType )? JOIN tableReference joinSpecification
-            {
-            // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:469:9: ( joinType )?
-            int alt19=2;
-            int LA19_0 = input.LA(1);
-
-            if ( ((LA19_0>=INNER && LA19_0<=LEFT)) ) {
-                alt19=1;
-            }
-            switch (alt19) {
-                case 1 :
-                    // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:469:9: joinType
-                    {
-                    pushFollow(FOLLOW_joinType_in_joinedTable1813);
-                    joinType43=joinType();
-
-                    state._fsp--;
-                    if (state.failed) return retval;
-                    if ( state.backtracking==0 ) stream_joinType.add(joinType43.getTree());
-
-                    }
-                    break;
-
-            }
-
-            JOIN44=(Token)match(input,JOIN,FOLLOW_JOIN_in_joinedTable1816); if (state.failed) return retval; 
-            if ( state.backtracking==0 ) stream_JOIN.add(JOIN44);
-
-            pushFollow(FOLLOW_tableReference_in_joinedTable1818);
-            tableReference45=tableReference();
-
-            state._fsp--;
-            if (state.failed) return retval;
-            if ( state.backtracking==0 ) stream_tableReference.add(tableReference45.getTree());
-            pushFollow(FOLLOW_joinSpecification_in_joinedTable1820);
-            joinSpecification46=joinSpecification();
-
-            state._fsp--;
-            if (state.failed) return retval;
-            if ( state.backtracking==0 ) stream_joinSpecification.add(joinSpecification46.getTree());
-
-
-            // AST REWRITE
-            // elements: JOIN, joinSpecification, tableReference, joinType
-            // token labels: 
-            // rule labels: retval
-            // token list labels: 
-            // rule list labels: 
-            // wildcard labels: 
-            if ( state.backtracking==0 ) {
-            retval.tree = root_0;
-            RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"rule retval",retval!=null?retval.tree:null);
-
-            root_0 = (Object)adaptor.nil();
-            // 470:17: -> ^( JOIN tableReference ( joinType )? joinSpecification )
-            {
-                // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:471:25: ^( JOIN tableReference ( joinType )? joinSpecification )
-                {
-                Object root_1 = (Object)adaptor.nil();
-                root_1 = (Object)adaptor.becomeRoot(stream_JOIN.nextNode(), root_1);
-
-                adaptor.addChild(root_1, stream_tableReference.nextTree());
-                // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:471:47: ( joinType )?
-                if ( stream_joinType.hasNext() ) {
-                    adaptor.addChild(root_1, stream_joinType.nextTree());
-
-                }
-                stream_joinType.reset();
-                adaptor.addChild(root_1, stream_joinSpecification.nextTree());
-
-                adaptor.addChild(root_0, root_1);
-                }
-
-            }
-
-            retval.tree = root_0;}
-            }
-
-            retval.stop = input.LT(-1);
-
-            if ( state.backtracking==0 ) {
-
-            retval.tree = (Object)adaptor.rulePostProcessing(root_0);
-            adaptor.setTokenBoundaries(retval.tree, retval.start, retval.stop);
-            }
-            if ( state.backtracking==0 ) {
-
-                  paraphrases.pop(); 
-
-            }
-        }
-
-            catch(RecognitionException e)
-            {
-                throw new CMISQueryException(getErrorString(e), e);
-            }
-        finally {
-        }
-        return retval;
-    }
-    // $ANTLR end "joinedTable"
-
-    public static class complexTable_return extends ParserRuleReturnScope {
-        Object tree;
-        public Object getTree() { return tree; }
-    };
-
-    // $ANTLR start "complexTable"
-    // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:474:1: complexTable : ( ( LPAREN singleTable ( joinedTable )+ RPAREN )=> LPAREN singleTable ( joinedTable )+ RPAREN -> ^( SOURCE singleTable ( joinedTable )+ ) | LPAREN complexTable RPAREN -> complexTable );
-    public final CMISParser.complexTable_return complexTable() throws RecognitionException {
-        CMISParser.complexTable_return retval = new CMISParser.complexTable_return();
-        retval.start = input.LT(1);
-
-        Object root_0 = null;
-
-        Token LPAREN47=null;
-        Token RPAREN50=null;
-        Token LPAREN51=null;
-        Token RPAREN53=null;
-        CMISParser.singleTable_return singleTable48 = null;
-
-        CMISParser.joinedTable_return joinedTable49 = null;
-
-        CMISParser.complexTable_return complexTable52 = null;
-
-
-        Object LPAREN47_tree=null;
-        Object RPAREN50_tree=null;
-        Object LPAREN51_tree=null;
-        Object RPAREN53_tree=null;
-        RewriteRuleTokenStream stream_RPAREN=new RewriteRuleTokenStream(adaptor,"token RPAREN");
-        RewriteRuleTokenStream stream_LPAREN=new RewriteRuleTokenStream(adaptor,"token LPAREN");
-        RewriteRuleSubtreeStream stream_singleTable=new RewriteRuleSubtreeStream(adaptor,"rule singleTable");
-        RewriteRuleSubtreeStream stream_joinedTable=new RewriteRuleSubtreeStream(adaptor,"rule joinedTable");
-        RewriteRuleSubtreeStream stream_complexTable=new RewriteRuleSubtreeStream(adaptor,"rule complexTable");
-
-            paraphrases.push("in complexTable"); 
-
-        try {
-            // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:483:9: ( ( LPAREN singleTable ( joinedTable )+ RPAREN )=> LPAREN singleTable ( joinedTable )+ RPAREN -> ^( SOURCE singleTable ( joinedTable )+ ) | LPAREN complexTable RPAREN -> complexTable )
-            int alt21=2;
-            int LA21_0 = input.LA(1);
-
-            if ( (LA21_0==LPAREN) ) {
-                int LA21_1 = input.LA(2);
-
-                if ( (synpred2_CMIS()) ) {
-                    alt21=1;
-                }
-                else if ( (true) ) {
-                    alt21=2;
-                }
-                else {
-                    if (state.backtracking>0) {state.failed=true; return retval;}
-                    NoViableAltException nvae =
-                        new NoViableAltException("", 21, 1, input);
-
-                    throw nvae;
-                }
-            }
-            else {
-                if (state.backtracking>0) {state.failed=true; return retval;}
-                NoViableAltException nvae =
-                    new NoViableAltException("", 21, 0, input);
-
-                throw nvae;
-            }
-            switch (alt21) {
-                case 1 :
-                    // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:484:9: ( LPAREN singleTable ( joinedTable )+ RPAREN )=> LPAREN singleTable ( joinedTable )+ RPAREN
-                    {
-                    LPAREN47=(Token)match(input,LPAREN,FOLLOW_LPAREN_in_complexTable1929); if (state.failed) return retval; 
-                    if ( state.backtracking==0 ) stream_LPAREN.add(LPAREN47);
-
-                    pushFollow(FOLLOW_singleTable_in_complexTable1931);
-                    singleTable48=singleTable();
-
-                    state._fsp--;
-                    if (state.failed) return retval;
-                    if ( state.backtracking==0 ) stream_singleTable.add(singleTable48.getTree());
-                    // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:484:72: ( joinedTable )+
-                    int cnt20=0;
-                    loop20:
-                    do {
-                        int alt20=2;
-                        int LA20_0 = input.LA(1);
-
-                        if ( ((LA20_0>=JOIN && LA20_0<=LEFT)) ) {
-                            alt20=1;
-                        }
-
-
-                        switch (alt20) {
-                    	case 1 :
-                    	    // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:484:72: joinedTable
-                    	    {
-                    	    pushFollow(FOLLOW_joinedTable_in_complexTable1933);
-                    	    joinedTable49=joinedTable();
-
-                    	    state._fsp--;
-                    	    if (state.failed) return retval;
-                    	    if ( state.backtracking==0 ) stream_joinedTable.add(joinedTable49.getTree());
-
-                    	    }
-                    	    break;
-
-                    	default :
-                    	    if ( cnt20 >= 1 ) break loop20;
-                    	    if (state.backtracking>0) {state.failed=true; return retval;}
-                                EarlyExitException eee =
-                                    new EarlyExitException(20, input);
-                                throw eee;
-                        }
-                        cnt20++;
-                    } while (true);
-
-                    RPAREN50=(Token)match(input,RPAREN,FOLLOW_RPAREN_in_complexTable1936); if (state.failed) return retval; 
-                    if ( state.backtracking==0 ) stream_RPAREN.add(RPAREN50);
-
-
-
-                    // AST REWRITE
-                    // elements: joinedTable, singleTable
-                    // token labels: 
-                    // rule labels: retval
-                    // token list labels: 
-                    // rule list labels: 
-                    // wildcard labels: 
-                    if ( state.backtracking==0 ) {
-                    retval.tree = root_0;
-                    RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"rule retval",retval!=null?retval.tree:null);
-
-                    root_0 = (Object)adaptor.nil();
-                    // 485:17: -> ^( SOURCE singleTable ( joinedTable )+ )
-                    {
-                        // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:486:25: ^( SOURCE singleTable ( joinedTable )+ )
-                        {
-                        Object root_1 = (Object)adaptor.nil();
-                        root_1 = (Object)adaptor.becomeRoot((Object)adaptor.create(SOURCE, "SOURCE"), root_1);
-
-                        adaptor.addChild(root_1, stream_singleTable.nextTree());
-                        if ( !(stream_joinedTable.hasNext()) ) {
-                            throw new RewriteEarlyExitException();
-                        }
-                        while ( stream_joinedTable.hasNext() ) {
-                            adaptor.addChild(root_1, stream_joinedTable.nextTree());
-
-                        }
-                        stream_joinedTable.reset();
-
-                        adaptor.addChild(root_0, root_1);
-                        }
-
-                    }
-
-                    retval.tree = root_0;}
-                    }
-                    break;
-                case 2 :
-                    // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:487:11: LPAREN complexTable RPAREN
-                    {
-                    LPAREN51=(Token)match(input,LPAREN,FOLLOW_LPAREN_in_complexTable1999); if (state.failed) return retval; 
-                    if ( state.backtracking==0 ) stream_LPAREN.add(LPAREN51);
-
-                    pushFollow(FOLLOW_complexTable_in_complexTable2001);
-                    complexTable52=complexTable();
-
-                    state._fsp--;
-                    if (state.failed) return retval;
-                    if ( state.backtracking==0 ) stream_complexTable.add(complexTable52.getTree());
-                    RPAREN53=(Token)match(input,RPAREN,FOLLOW_RPAREN_in_complexTable2003); if (state.failed) return retval; 
-                    if ( state.backtracking==0 ) stream_RPAREN.add(RPAREN53);
-
-
-
-                    // AST REWRITE
-                    // elements: complexTable
-                    // token labels: 
-                    // rule labels: retval
-                    // token list labels: 
-                    // rule list labels: 
-                    // wildcard labels: 
-                    if ( state.backtracking==0 ) {
-                    retval.tree = root_0;
-                    RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"rule retval",retval!=null?retval.tree:null);
-
-                    root_0 = (Object)adaptor.nil();
-                    // 488:17: -> complexTable
-                    {
-                        adaptor.addChild(root_0, stream_complexTable.nextTree());
-
-                    }
-
-                    retval.tree = root_0;}
-                    }
-                    break;
-
-            }
-            retval.stop = input.LT(-1);
-
-            if ( state.backtracking==0 ) {
-
-            retval.tree = (Object)adaptor.rulePostProcessing(root_0);
-            adaptor.setTokenBoundaries(retval.tree, retval.start, retval.stop);
-            }
-            if ( state.backtracking==0 ) {
-
-                  paraphrases.pop(); 
-
-            }
-        }
-
-            catch(RecognitionException e)
-            {
-                throw new CMISQueryException(getErrorString(e), e);
-            }
-        finally {
-        }
-        return retval;
-    }
-    // $ANTLR end "complexTable"
-
-    public static class joinType_return extends ParserRuleReturnScope {
-        Object tree;
-        public Object getTree() { return tree; }
-    };
-
-    // $ANTLR start "joinType"
-    // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:491:1: joinType : ( INNER -> INNER | LEFT ( OUTER )? -> LEFT );
-    public final CMISParser.joinType_return joinType() throws RecognitionException {
-        CMISParser.joinType_return retval = new CMISParser.joinType_return();
-        retval.start = input.LT(1);
-
-        Object root_0 = null;
-
-        Token INNER54=null;
-        Token LEFT55=null;
-        Token OUTER56=null;
-
-        Object INNER54_tree=null;
-        Object LEFT55_tree=null;
-        Object OUTER56_tree=null;
-        RewriteRuleTokenStream stream_OUTER=new RewriteRuleTokenStream(adaptor,"token OUTER");
-        RewriteRuleTokenStream stream_INNER=new RewriteRuleTokenStream(adaptor,"token INNER");
-        RewriteRuleTokenStream stream_LEFT=new RewriteRuleTokenStream(adaptor,"token LEFT");
-
-        try {
-            // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:492:9: ( INNER -> INNER | LEFT ( OUTER )? -> LEFT )
-            int alt23=2;
-            int LA23_0 = input.LA(1);
-
-            if ( (LA23_0==INNER) ) {
-                alt23=1;
-            }
-            else if ( (LA23_0==LEFT) ) {
-                alt23=2;
-            }
-            else {
-                if (state.backtracking>0) {state.failed=true; return retval;}
-                NoViableAltException nvae =
-                    new NoViableAltException("", 23, 0, input);
-
-                throw nvae;
-            }
-            switch (alt23) {
-                case 1 :
-                    // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:493:9: INNER
-                    {
-                    INNER54=(Token)match(input,INNER,FOLLOW_INNER_in_joinType2056); if (state.failed) return retval; 
-                    if ( state.backtracking==0 ) stream_INNER.add(INNER54);
-
-
-
-                    // AST REWRITE
-                    // elements: INNER
-                    // token labels: 
-                    // rule labels: retval
-                    // token list labels: 
-                    // rule list labels: 
-                    // wildcard labels: 
-                    if ( state.backtracking==0 ) {
-                    retval.tree = root_0;
-                    RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"rule retval",retval!=null?retval.tree:null);
-
-                    root_0 = (Object)adaptor.nil();
-                    // 494:17: -> INNER
-                    {
-                        adaptor.addChild(root_0, stream_INNER.nextNode());
-
-                    }
-
-                    retval.tree = root_0;}
-                    }
-                    break;
-                case 2 :
-                    // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:495:11: LEFT ( OUTER )?
-                    {
-                    LEFT55=(Token)match(input,LEFT,FOLLOW_LEFT_in_joinType2088); if (state.failed) return retval; 
-                    if ( state.backtracking==0 ) stream_LEFT.add(LEFT55);
-
-                    // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:495:16: ( OUTER )?
-                    int alt22=2;
-                    int LA22_0 = input.LA(1);
-
-                    if ( (LA22_0==OUTER) ) {
-                        alt22=1;
-                    }
-                    switch (alt22) {
-                        case 1 :
-                            // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:495:16: OUTER
-                            {
-                            OUTER56=(Token)match(input,OUTER,FOLLOW_OUTER_in_joinType2090); if (state.failed) return retval; 
-                            if ( state.backtracking==0 ) stream_OUTER.add(OUTER56);
-
-
-                            }
-                            break;
-
-                    }
-
-
-
-                    // AST REWRITE
-                    // elements: LEFT
-                    // token labels: 
-                    // rule labels: retval
-                    // token list labels: 
-                    // rule list labels: 
-                    // wildcard labels: 
-                    if ( state.backtracking==0 ) {
-                    retval.tree = root_0;
-                    RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"rule retval",retval!=null?retval.tree:null);
-
-                    root_0 = (Object)adaptor.nil();
-                    // 496:17: -> LEFT
-                    {
-                        adaptor.addChild(root_0, stream_LEFT.nextNode());
-
-                    }
-
-                    retval.tree = root_0;}
-                    }
-                    break;
-
-            }
-            retval.stop = input.LT(-1);
-
-            if ( state.backtracking==0 ) {
-
-            retval.tree = (Object)adaptor.rulePostProcessing(root_0);
-            adaptor.setTokenBoundaries(retval.tree, retval.start, retval.stop);
-            }
-        }
-
-            catch(RecognitionException e)
-            {
-                throw new CMISQueryException(getErrorString(e), e);
-            }
-        finally {
-        }
-        return retval;
-    }
-    // $ANTLR end "joinType"
-
-    public static class joinSpecification_return extends ParserRuleReturnScope {
-        Object tree;
-        public Object getTree() { return tree; }
-    };
-
-    // $ANTLR start "joinSpecification"
-    // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:499:1: joinSpecification : ON lhs= columnReference EQUALS rhs= columnReference -> ^( ON $lhs EQUALS $rhs) ;
-    public final CMISParser.joinSpecification_return joinSpecification() throws RecognitionException {
-        CMISParser.joinSpecification_return retval = new CMISParser.joinSpecification_return();
-        retval.start = input.LT(1);
-
-        Object root_0 = null;
-
-        Token ON57=null;
-        Token EQUALS58=null;
-        CMISParser.columnReference_return lhs = null;
-
-        CMISParser.columnReference_return rhs = null;
-
-
-        Object ON57_tree=null;
-        Object EQUALS58_tree=null;
-        RewriteRuleTokenStream stream_ON=new RewriteRuleTokenStream(adaptor,"token ON");
-        RewriteRuleTokenStream stream_EQUALS=new RewriteRuleTokenStream(adaptor,"token EQUALS");
-        RewriteRuleSubtreeStream stream_columnReference=new RewriteRuleSubtreeStream(adaptor,"rule columnReference");
-
-            paraphrases.push("in join condition"); 
-
-        try {
-            // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:508:9: ( ON lhs= columnReference EQUALS rhs= columnReference -> ^( ON $lhs EQUALS $rhs) )
-            // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:509:9: ON lhs= columnReference EQUALS rhs= columnReference
-            {
-            ON57=(Token)match(input,ON,FOLLOW_ON_in_joinSpecification2154); if (state.failed) return retval; 
-            if ( state.backtracking==0 ) stream_ON.add(ON57);
-
-            pushFollow(FOLLOW_columnReference_in_joinSpecification2158);
-            lhs=columnReference();
-
-            state._fsp--;
-            if (state.failed) return retval;
-            if ( state.backtracking==0 ) stream_columnReference.add(lhs.getTree());
-            EQUALS58=(Token)match(input,EQUALS,FOLLOW_EQUALS_in_joinSpecification2160); if (state.failed) return retval; 
-            if ( state.backtracking==0 ) stream_EQUALS.add(EQUALS58);
-
-            pushFollow(FOLLOW_columnReference_in_joinSpecification2164);
-            rhs=columnReference();
-
-            state._fsp--;
-            if (state.failed) return retval;
-            if ( state.backtracking==0 ) stream_columnReference.add(rhs.getTree());
-
-
-            // AST REWRITE
-            // elements: lhs, ON, rhs, EQUALS
-            // token labels: 
-            // rule labels: retval, rhs, lhs
-            // token list labels: 
-            // rule list labels: 
-            // wildcard labels: 
-            if ( state.backtracking==0 ) {
-            retval.tree = root_0;
-            RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"rule retval",retval!=null?retval.tree:null);
-            RewriteRuleSubtreeStream stream_rhs=new RewriteRuleSubtreeStream(adaptor,"rule rhs",rhs!=null?rhs.tree:null);
-            RewriteRuleSubtreeStream stream_lhs=new RewriteRuleSubtreeStream(adaptor,"rule lhs",lhs!=null?lhs.tree:null);
-
-            root_0 = (Object)adaptor.nil();
-            // 510:17: -> ^( ON $lhs EQUALS $rhs)
-            {
-                // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:511:25: ^( ON $lhs EQUALS $rhs)
-                {
-                Object root_1 = (Object)adaptor.nil();
-                root_1 = (Object)adaptor.becomeRoot(stream_ON.nextNode(), root_1);
-
-                adaptor.addChild(root_1, stream_lhs.nextTree());
-                adaptor.addChild(root_1, stream_EQUALS.nextNode());
-                adaptor.addChild(root_1, stream_rhs.nextTree());
-
-                adaptor.addChild(root_0, root_1);
-                }
-
-            }
-
-            retval.tree = root_0;}
-            }
-
-            retval.stop = input.LT(-1);
-
-            if ( state.backtracking==0 ) {
-
-            retval.tree = (Object)adaptor.rulePostProcessing(root_0);
-            adaptor.setTokenBoundaries(retval.tree, retval.start, retval.stop);
-            }
-            if ( state.backtracking==0 ) {
-
-                  paraphrases.pop(); 
-
-            }
-        }
-
-            catch(RecognitionException e)
-            {
-                throw new CMISQueryException(getErrorString(e), e);
-            }
-        finally {
-        }
-        return retval;
-    }
-    // $ANTLR end "joinSpecification"
-
-    public static class whereClause_return extends ParserRuleReturnScope {
-        Object tree;
-        public Object getTree() { return tree; }
-    };
-
-    // $ANTLR start "whereClause"
-    // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:518:1: whereClause : WHERE searchOrCondition -> searchOrCondition ;
-    public final CMISParser.whereClause_return whereClause() throws RecognitionException {
-        CMISParser.whereClause_return retval = new CMISParser.whereClause_return();
-        retval.start = input.LT(1);
-
-        Object root_0 = null;
-
-        Token WHERE59=null;
-        CMISParser.searchOrCondition_return searchOrCondition60 = null;
-
-
-        Object WHERE59_tree=null;
-        RewriteRuleTokenStream stream_WHERE=new RewriteRuleTokenStream(adaptor,"token WHERE");
-        RewriteRuleSubtreeStream stream_searchOrCondition=new RewriteRuleSubtreeStream(adaptor,"rule searchOrCondition");
-
-            paraphrases.push("in where"); 
-
-        try {
-            // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:527:9: ( WHERE searchOrCondition -> searchOrCondition )
-            // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:528:9: WHERE searchOrCondition
-            {
-            WHERE59=(Token)match(input,WHERE,FOLLOW_WHERE_in_whereClause2264); if (state.failed) return retval; 
-            if ( state.backtracking==0 ) stream_WHERE.add(WHERE59);
-
-            pushFollow(FOLLOW_searchOrCondition_in_whereClause2266);
-            searchOrCondition60=searchOrCondition();
-
-            state._fsp--;
-            if (state.failed) return retval;
-            if ( state.backtracking==0 ) stream_searchOrCondition.add(searchOrCondition60.getTree());
-
-
-            // AST REWRITE
-            // elements: searchOrCondition
-            // token labels: 
-            // rule labels: retval
-            // token list labels: 
-            // rule list labels: 
-            // wildcard labels: 
-            if ( state.backtracking==0 ) {
-            retval.tree = root_0;
-            RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"rule retval",retval!=null?retval.tree:null);
-
-            root_0 = (Object)adaptor.nil();
-            // 529:17: -> searchOrCondition
-            {
-                adaptor.addChild(root_0, stream_searchOrCondition.nextTree());
-
-            }
-
-            retval.tree = root_0;}
-            }
-
-            retval.stop = input.LT(-1);
-
-            if ( state.backtracking==0 ) {
-
-            retval.tree = (Object)adaptor.rulePostProcessing(root_0);
-            adaptor.setTokenBoundaries(retval.tree, retval.start, retval.stop);
-            }
-            if ( state.backtracking==0 ) {
-
-                  paraphrases.pop(); 
-
-            }
-        }
-
-            catch(RecognitionException e)
-            {
-                throw new CMISQueryException(getErrorString(e), e);
-            }
-        finally {
-        }
-        return retval;
-    }
-    // $ANTLR end "whereClause"
-
-    public static class searchOrCondition_return extends ParserRuleReturnScope {
-        Object tree;
-        public Object getTree() { return tree; }
-    };
-
-    // $ANTLR start "searchOrCondition"
-    // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:532:1: searchOrCondition : searchAndCondition ( OR searchAndCondition )* -> ^( DISJUNCTION ( searchAndCondition )+ ) ;
-    public final CMISParser.searchOrCondition_return searchOrCondition() throws RecognitionException {
-        CMISParser.searchOrCondition_return retval = new CMISParser.searchOrCondition_return();
-        retval.start = input.LT(1);
-
-        Object root_0 = null;
-
-        Token OR62=null;
-        CMISParser.searchAndCondition_return searchAndCondition61 = null;
-
-        CMISParser.searchAndCondition_return searchAndCondition63 = null;
-
-
-        Object OR62_tree=null;
-        RewriteRuleTokenStream stream_OR=new RewriteRuleTokenStream(adaptor,"token OR");
-        RewriteRuleSubtreeStream stream_searchAndCondition=new RewriteRuleSubtreeStream(adaptor,"rule searchAndCondition");
-        try {
-            // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:536:9: ( searchAndCondition ( OR searchAndCondition )* -> ^( DISJUNCTION ( searchAndCondition )+ ) )
-            // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:537:9: searchAndCondition ( OR searchAndCondition )*
-            {
-            pushFollow(FOLLOW_searchAndCondition_in_searchOrCondition2321);
-            searchAndCondition61=searchAndCondition();
-
-            state._fsp--;
-            if (state.failed) return retval;
-            if ( state.backtracking==0 ) stream_searchAndCondition.add(searchAndCondition61.getTree());
-            // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:537:28: ( OR searchAndCondition )*
-            loop24:
-            do {
-                int alt24=2;
-                int LA24_0 = input.LA(1);
-
-                if ( (LA24_0==OR) ) {
-                    alt24=1;
-                }
-
-
-                switch (alt24) {
-            	case 1 :
-            	    // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:537:29: OR searchAndCondition
-            	    {
-            	    OR62=(Token)match(input,OR,FOLLOW_OR_in_searchOrCondition2324); if (state.failed) return retval; 
-            	    if ( state.backtracking==0 ) stream_OR.add(OR62);
-
-            	    pushFollow(FOLLOW_searchAndCondition_in_searchOrCondition2326);
-            	    searchAndCondition63=searchAndCondition();
-
-            	    state._fsp--;
-            	    if (state.failed) return retval;
-            	    if ( state.backtracking==0 ) stream_searchAndCondition.add(searchAndCondition63.getTree());
-
-            	    }
-            	    break;
-
-            	default :
-            	    break loop24;
-                }
-            } while (true);
-
-
-
-            // AST REWRITE
-            // elements: searchAndCondition
-            // token labels: 
-            // rule labels: retval
-            // token list labels: 
-            // rule list labels: 
-            // wildcard labels: 
-            if ( state.backtracking==0 ) {
-            retval.tree = root_0;
-            RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"rule retval",retval!=null?retval.tree:null);
-
-            root_0 = (Object)adaptor.nil();
-            // 538:17: -> ^( DISJUNCTION ( searchAndCondition )+ )
-            {
-                // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:539:25: ^( DISJUNCTION ( searchAndCondition )+ )
-                {
-                Object root_1 = (Object)adaptor.nil();
-                root_1 = (Object)adaptor.becomeRoot((Object)adaptor.create(DISJUNCTION, "DISJUNCTION"), root_1);
-
-                if ( !(stream_searchAndCondition.hasNext()) ) {
-                    throw new RewriteEarlyExitException();
-                }
-                while ( stream_searchAndCondition.hasNext() ) {
-                    adaptor.addChild(root_1, stream_searchAndCondition.nextTree());
-
-                }
-                stream_searchAndCondition.reset();
-
-                adaptor.addChild(root_0, root_1);
-                }
-
-            }
-
-            retval.tree = root_0;}
-            }
-
-            retval.stop = input.LT(-1);
-
-            if ( state.backtracking==0 ) {
-
-            retval.tree = (Object)adaptor.rulePostProcessing(root_0);
-            adaptor.setTokenBoundaries(retval.tree, retval.start, retval.stop);
-            }
-        }
-
-            catch(RecognitionException e)
-            {
-                throw new CMISQueryException(getErrorString(e), e);
-            }
-        finally {
-        }
-        return retval;
-    }
-    // $ANTLR end "searchOrCondition"
-
-    public static class searchAndCondition_return extends ParserRuleReturnScope {
-        Object tree;
-        public Object getTree() { return tree; }
-    };
-
-    // $ANTLR start "searchAndCondition"
-    // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:542:1: searchAndCondition : searchNotCondition ( AND searchNotCondition )* -> ^( CONJUNCTION ( searchNotCondition )+ ) ;
-    public final CMISParser.searchAndCondition_return searchAndCondition() throws RecognitionException {
-        CMISParser.searchAndCondition_return retval = new CMISParser.searchAndCondition_return();
-        retval.start = input.LT(1);
-
-        Object root_0 = null;
-
-        Token AND65=null;
-        CMISParser.searchNotCondition_return searchNotCondition64 = null;
-
-        CMISParser.searchNotCondition_return searchNotCondition66 = null;
-
-
-        Object AND65_tree=null;
-        RewriteRuleTokenStream stream_AND=new RewriteRuleTokenStream(adaptor,"token AND");
-        RewriteRuleSubtreeStream stream_searchNotCondition=new RewriteRuleSubtreeStream(adaptor,"rule searchNotCondition");
-        try {
-            // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:546:9: ( searchNotCondition ( AND searchNotCondition )* -> ^( CONJUNCTION ( searchNotCondition )+ ) )
-            // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:547:9: searchNotCondition ( AND searchNotCondition )*
-            {
-            pushFollow(FOLLOW_searchNotCondition_in_searchAndCondition2412);
-            searchNotCondition64=searchNotCondition();
-
-            state._fsp--;
-            if (state.failed) return retval;
-            if ( state.backtracking==0 ) stream_searchNotCondition.add(searchNotCondition64.getTree());
-            // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:547:28: ( AND searchNotCondition )*
-            loop25:
-            do {
-                int alt25=2;
-                int LA25_0 = input.LA(1);
-
-                if ( (LA25_0==AND) ) {
-                    alt25=1;
-                }
-
-
-                switch (alt25) {
-            	case 1 :
-            	    // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:547:29: AND searchNotCondition
-            	    {
-            	    AND65=(Token)match(input,AND,FOLLOW_AND_in_searchAndCondition2415); if (state.failed) return retval; 
-            	    if ( state.backtracking==0 ) stream_AND.add(AND65);
-
-            	    pushFollow(FOLLOW_searchNotCondition_in_searchAndCondition2417);
-            	    searchNotCondition66=searchNotCondition();
-
-            	    state._fsp--;
-            	    if (state.failed) return retval;
-            	    if ( state.backtracking==0 ) stream_searchNotCondition.add(searchNotCondition66.getTree());
-
-            	    }
-            	    break;
-
-            	default :
-            	    break loop25;
-                }
-            } while (true);
-
-
-
-            // AST REWRITE
-            // elements: searchNotCondition
-            // token labels: 
-            // rule labels: retval
-            // token list labels: 
-            // rule list labels: 
-            // wildcard labels: 
-            if ( state.backtracking==0 ) {
-            retval.tree = root_0;
-            RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"rule retval",retval!=null?retval.tree:null);
-
-            root_0 = (Object)adaptor.nil();
-            // 548:17: -> ^( CONJUNCTION ( searchNotCondition )+ )
-            {
-                // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:549:25: ^( CONJUNCTION ( searchNotCondition )+ )
-                {
-                Object root_1 = (Object)adaptor.nil();
-                root_1 = (Object)adaptor.becomeRoot((Object)adaptor.create(CONJUNCTION, "CONJUNCTION"), root_1);
-
-                if ( !(stream_searchNotCondition.hasNext()) ) {
-                    throw new RewriteEarlyExitException();
-                }
-                while ( stream_searchNotCondition.hasNext() ) {
-                    adaptor.addChild(root_1, stream_searchNotCondition.nextTree());
-
-                }
-                stream_searchNotCondition.reset();
-
-                adaptor.addChild(root_0, root_1);
-                }
-
-            }
-
-            retval.tree = root_0;}
-            }
-
-            retval.stop = input.LT(-1);
-
-            if ( state.backtracking==0 ) {
-
-            retval.tree = (Object)adaptor.rulePostProcessing(root_0);
-            adaptor.setTokenBoundaries(retval.tree, retval.start, retval.stop);
-            }
-        }
-
-            catch(RecognitionException e)
-            {
-                throw new CMISQueryException(getErrorString(e), e);
-            }
-        finally {
-        }
-        return retval;
-    }
-    // $ANTLR end "searchAndCondition"
-
-    public static class searchNotCondition_return extends ParserRuleReturnScope {
-        Object tree;
-        public Object getTree() { return tree; }
-    };
-
-    // $ANTLR start "searchNotCondition"
-    // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:552:1: searchNotCondition : ( NOT searchTest -> ^( NEGATION searchTest ) | searchTest -> searchTest );
-    public final CMISParser.searchNotCondition_return searchNotCondition() throws RecognitionException {
-        CMISParser.searchNotCondition_return retval = new CMISParser.searchNotCondition_return();
-        retval.start = input.LT(1);
-
-        Object root_0 = null;
-
-        Token NOT67=null;
-        CMISParser.searchTest_return searchTest68 = null;
-
-        CMISParser.searchTest_return searchTest69 = null;
-
-
-        Object NOT67_tree=null;
-        RewriteRuleTokenStream stream_NOT=new RewriteRuleTokenStream(adaptor,"token NOT");
-        RewriteRuleSubtreeStream stream_searchTest=new RewriteRuleSubtreeStream(adaptor,"rule searchTest");
-        try {
-            // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:553:9: ( NOT searchTest -> ^( NEGATION searchTest ) | searchTest -> searchTest )
-            int alt26=2;
-            alt26 = dfa26.predict(input);
-            switch (alt26) {
-                case 1 :
-                    // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:554:9: NOT searchTest
-                    {
-                    NOT67=(Token)match(input,NOT,FOLLOW_NOT_in_searchNotCondition2501); if (state.failed) return retval; 
-                    if ( state.backtracking==0 ) stream_NOT.add(NOT67);
-
-                    pushFollow(FOLLOW_searchTest_in_searchNotCondition2503);
-                    searchTest68=searchTest();
-
-                    state._fsp--;
-                    if (state.failed) return retval;
-                    if ( state.backtracking==0 ) stream_searchTest.add(searchTest68.getTree());
-
-
-                    // AST REWRITE
-                    // elements: searchTest
-                    // token labels: 
-                    // rule labels: retval
-                    // token list labels: 
-                    // rule list labels: 
-                    // wildcard labels: 
-                    if ( state.backtracking==0 ) {
-                    retval.tree = root_0;
-                    RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"rule retval",retval!=null?retval.tree:null);
-
-                    root_0 = (Object)adaptor.nil();
-                    // 555:17: -> ^( NEGATION searchTest )
-                    {
-                        // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:556:25: ^( NEGATION searchTest )
-                        {
-                        Object root_1 = (Object)adaptor.nil();
-                        root_1 = (Object)adaptor.becomeRoot((Object)adaptor.create(NEGATION, "NEGATION"), root_1);
-
-                        adaptor.addChild(root_1, stream_searchTest.nextTree());
-
-                        adaptor.addChild(root_0, root_1);
-                        }
-
-                    }
-
-                    retval.tree = root_0;}
-                    }
-                    break;
-                case 2 :
-                    // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:557:11: searchTest
-                    {
-                    pushFollow(FOLLOW_searchTest_in_searchNotCondition2563);
-                    searchTest69=searchTest();
-
-                    state._fsp--;
-                    if (state.failed) return retval;
-                    if ( state.backtracking==0 ) stream_searchTest.add(searchTest69.getTree());
-
-
-                    // AST REWRITE
-                    // elements: searchTest
-                    // token labels: 
-                    // rule labels: retval
-                    // token list labels: 
-                    // rule list labels: 
-                    // wildcard labels: 
-                    if ( state.backtracking==0 ) {
-                    retval.tree = root_0;
-                    RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"rule retval",retval!=null?retval.tree:null);
-
-                    root_0 = (Object)adaptor.nil();
-                    // 558:17: -> searchTest
-                    {
-                        adaptor.addChild(root_0, stream_searchTest.nextTree());
-
-                    }
-
-                    retval.tree = root_0;}
-                    }
-                    break;
-
-            }
-            retval.stop = input.LT(-1);
-
-            if ( state.backtracking==0 ) {
-
-            retval.tree = (Object)adaptor.rulePostProcessing(root_0);
-            adaptor.setTokenBoundaries(retval.tree, retval.start, retval.stop);
-            }
-        }
-
-            catch(RecognitionException e)
-            {
-                throw new CMISQueryException(getErrorString(e), e);
-            }
-        finally {
-        }
-        return retval;
-    }
-    // $ANTLR end "searchNotCondition"
-
-    public static class searchTest_return extends ParserRuleReturnScope {
-        Object tree;
-        public Object getTree() { return tree; }
-    };
-
-    // $ANTLR start "searchTest"
-    // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:561:1: searchTest : ( predicate -> predicate | LPAREN searchOrCondition RPAREN -> searchOrCondition );
-    public final CMISParser.searchTest_return searchTest() throws RecognitionException {
-        CMISParser.searchTest_return retval = new CMISParser.searchTest_return();
-        retval.start = input.LT(1);
-
-        Object root_0 = null;
-
-        Token LPAREN71=null;
-        Token RPAREN73=null;
-        CMISParser.predicate_return predicate70 = null;
-
-        CMISParser.searchOrCondition_return searchOrCondition72 = null;
-
-
-        Object LPAREN71_tree=null;
-        Object RPAREN73_tree=null;
-        RewriteRuleTokenStream stream_RPAREN=new RewriteRuleTokenStream(adaptor,"token RPAREN");
-        RewriteRuleTokenStream stream_LPAREN=new RewriteRuleTokenStream(adaptor,"token LPAREN");
-        RewriteRuleSubtreeStream stream_predicate=new RewriteRuleSubtreeStream(adaptor,"rule predicate");
-        RewriteRuleSubtreeStream stream_searchOrCondition=new RewriteRuleSubtreeStream(adaptor,"rule searchOrCondition");
-        try {
-            // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:562:9: ( predicate -> predicate | LPAREN searchOrCondition RPAREN -> searchOrCondition )
-            int alt27=2;
-            alt27 = dfa27.predict(input);
-            switch (alt27) {
-                case 1 :
-                    // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:563:9: predicate
-                    {
-                    pushFollow(FOLLOW_predicate_in_searchTest2616);
-                    predicate70=predicate();
-
-                    state._fsp--;
-                    if (state.failed) return retval;
-                    if ( state.backtracking==0 ) stream_predicate.add(predicate70.getTree());
-
-
-                    // AST REWRITE
-                    // elements: predicate
-                    // token labels: 
-                    // rule labels: retval
-                    // token list labels: 
-                    // rule list labels: 
-                    // wildcard labels: 
-                    if ( state.backtracking==0 ) {
-                    retval.tree = root_0;
-                    RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"rule retval",retval!=null?retval.tree:null);
-
-                    root_0 = (Object)adaptor.nil();
-                    // 564:17: -> predicate
-                    {
-                        adaptor.addChild(root_0, stream_predicate.nextTree());
-
-                    }
-
-                    retval.tree = root_0;}
-                    }
-                    break;
-                case 2 :
-                    // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:565:11: LPAREN searchOrCondition RPAREN
-                    {
-                    LPAREN71=(Token)match(input,LPAREN,FOLLOW_LPAREN_in_searchTest2648); if (state.failed) return retval; 
-                    if ( state.backtracking==0 ) stream_LPAREN.add(LPAREN71);
-
-                    pushFollow(FOLLOW_searchOrCondition_in_searchTest2650);
-                    searchOrCondition72=searchOrCondition();
-
-                    state._fsp--;
-                    if (state.failed) return retval;
-                    if ( state.backtracking==0 ) stream_searchOrCondition.add(searchOrCondition72.getTree());
-                    RPAREN73=(Token)match(input,RPAREN,FOLLOW_RPAREN_in_searchTest2652); if (state.failed) return retval; 
-                    if ( state.backtracking==0 ) stream_RPAREN.add(RPAREN73);
-
-
-
-                    // AST REWRITE
-                    // elements: searchOrCondition
-                    // token labels: 
-                    // rule labels: retval
-                    // token list labels: 
-                    // rule list labels: 
-                    // wildcard labels: 
-                    if ( state.backtracking==0 ) {
-                    retval.tree = root_0;
-                    RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"rule retval",retval!=null?retval.tree:null);
-
-                    root_0 = (Object)adaptor.nil();
-                    // 566:17: -> searchOrCondition
-                    {
-                        adaptor.addChild(root_0, stream_searchOrCondition.nextTree());
-
-                    }
-
-                    retval.tree = root_0;}
-                    }
-                    break;
-
-            }
-            retval.stop = input.LT(-1);
-
-            if ( state.backtracking==0 ) {
-
-            retval.tree = (Object)adaptor.rulePostProcessing(root_0);
-            adaptor.setTokenBoundaries(retval.tree, retval.start, retval.stop);
-            }
-        }
-
-            catch(RecognitionException e)
-            {
-                throw new CMISQueryException(getErrorString(e), e);
-            }
-        finally {
-        }
-        return retval;
-    }
-    // $ANTLR end "searchTest"
-
-    public static class predicate_return extends ParserRuleReturnScope {
-        Object tree;
-        public Object getTree() { return tree; }
-    };
-
-    // $ANTLR start "predicate"
-    // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:569:1: predicate : ( comparisonPredicate | inPredicate | likePredicate | nullPredicate | quantifiedComparisonPredicate | quantifiedInPredicate | textSearchPredicate | folderPredicate );
-    public final CMISParser.predicate_return predicate() throws RecognitionException {
-        CMISParser.predicate_return retval = new CMISParser.predicate_return();
-        retval.start = input.LT(1);
-
-        Object root_0 = null;
-
-        CMISParser.comparisonPredicate_return comparisonPredicate74 = null;
-
-        CMISParser.inPredicate_return inPredicate75 = null;
-
-        CMISParser.likePredicate_return likePredicate76 = null;
-
-        CMISParser.nullPredicate_return nullPredicate77 = null;
-
-        CMISParser.quantifiedComparisonPredicate_return quantifiedComparisonPredicate78 = null;
-
-        CMISParser.quantifiedInPredicate_return quantifiedInPredicate79 = null;
-
-        CMISParser.textSearchPredicate_return textSearchPredicate80 = null;
-
-        CMISParser.folderPredicate_return folderPredicate81 = null;
-
-
-
-        try {
-            // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:570:9: ( comparisonPredicate | inPredicate | likePredicate | nullPredicate | quantifiedComparisonPredicate | quantifiedInPredicate | textSearchPredicate | folderPredicate )
-            int alt28=8;
-            alt28 = dfa28.predict(input);
-            switch (alt28) {
-                case 1 :
-                    // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:571:9: comparisonPredicate
-                    {
-                    root_0 = (Object)adaptor.nil();
-
-                    pushFollow(FOLLOW_comparisonPredicate_in_predicate2705);
-                    comparisonPredicate74=comparisonPredicate();
-
-                    state._fsp--;
-                    if (state.failed) return retval;
-                    if ( state.backtracking==0 ) adaptor.addChild(root_0, comparisonPredicate74.getTree());
-
-                    }
-                    break;
-                case 2 :
-                    // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:572:11: inPredicate
-                    {
-                    root_0 = (Object)adaptor.nil();
-
-                    pushFollow(FOLLOW_inPredicate_in_predicate2717);
-                    inPredicate75=inPredicate();
-
-                    state._fsp--;
-                    if (state.failed) return retval;
-                    if ( state.backtracking==0 ) adaptor.addChild(root_0, inPredicate75.getTree());
-
-                    }
-                    break;
-                case 3 :
-                    // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:573:11: likePredicate
-                    {
-                    root_0 = (Object)adaptor.nil();
-
-                    pushFollow(FOLLOW_likePredicate_in_predicate2729);
-                    likePredicate76=likePredicate();
-
-                    state._fsp--;
-                    if (state.failed) return retval;
-                    if ( state.backtracking==0 ) adaptor.addChild(root_0, likePredicate76.getTree());
-
-                    }
-                    break;
-                case 4 :
-                    // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:574:11: nullPredicate
-                    {
-                    root_0 = (Object)adaptor.nil();
-
-                    pushFollow(FOLLOW_nullPredicate_in_predicate2741);
-                    nullPredicate77=nullPredicate();
-
-                    state._fsp--;
-                    if (state.failed) return retval;
-                    if ( state.backtracking==0 ) adaptor.addChild(root_0, nullPredicate77.getTree());
-
-                    }
-                    break;
-                case 5 :
-                    // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:575:11: quantifiedComparisonPredicate
-                    {
-                    root_0 = (Object)adaptor.nil();
-
-                    pushFollow(FOLLOW_quantifiedComparisonPredicate_in_predicate2753);
-                    quantifiedComparisonPredicate78=quantifiedComparisonPredicate();
-
-                    state._fsp--;
-                    if (state.failed) return retval;
-                    if ( state.backtracking==0 ) adaptor.addChild(root_0, quantifiedComparisonPredicate78.getTree());
-
-                    }
-                    break;
-                case 6 :
-                    // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:576:11: quantifiedInPredicate
-                    {
-                    root_0 = (Object)adaptor.nil();
-
-                    pushFollow(FOLLOW_quantifiedInPredicate_in_predicate2765);
-                    quantifiedInPredicate79=quantifiedInPredicate();
-
-                    state._fsp--;
-                    if (state.failed) return retval;
-                    if ( state.backtracking==0 ) adaptor.addChild(root_0, quantifiedInPredicate79.getTree());
-
-                    }
-                    break;
-                case 7 :
-                    // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:577:11: textSearchPredicate
-                    {
-                    root_0 = (Object)adaptor.nil();
-
-                    pushFollow(FOLLOW_textSearchPredicate_in_predicate2777);
-                    textSearchPredicate80=textSearchPredicate();
-
-                    state._fsp--;
-                    if (state.failed) return retval;
-                    if ( state.backtracking==0 ) adaptor.addChild(root_0, textSearchPredicate80.getTree());
-
-                    }
-                    break;
-                case 8 :
-                    // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:578:11: folderPredicate
-                    {
-                    root_0 = (Object)adaptor.nil();
-
-                    pushFollow(FOLLOW_folderPredicate_in_predicate2789);
-                    folderPredicate81=folderPredicate();
-
-                    state._fsp--;
-                    if (state.failed) return retval;
-                    if ( state.backtracking==0 ) adaptor.addChild(root_0, folderPredicate81.getTree());
-
-                    }
-                    break;
-
-            }
-            retval.stop = input.LT(-1);
-
-            if ( state.backtracking==0 ) {
-
-            retval.tree = (Object)adaptor.rulePostProcessing(root_0);
-            adaptor.setTokenBoundaries(retval.tree, retval.start, retval.stop);
-            }
-        }
-
-            catch(RecognitionException e)
-            {
-                throw new CMISQueryException(getErrorString(e), e);
-            }
-        finally {
-        }
-        return retval;
-    }
-    // $ANTLR end "predicate"
-
-    public static class comparisonPredicate_return extends ParserRuleReturnScope {
-        Object tree;
-        public Object getTree() { return tree; }
-    };
-
-    // $ANTLR start "comparisonPredicate"
-    // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:581:1: comparisonPredicate : valueExpression compOp literalOrParameterName -> ^( PRED_COMPARISON SINGLE_VALUED_PROPERTY valueExpression compOp literalOrParameterName ) ;
-    public final CMISParser.comparisonPredicate_return comparisonPredicate() throws RecognitionException {
-        CMISParser.comparisonPredicate_return retval = new CMISParser.comparisonPredicate_return();
-        retval.start = input.LT(1);
-
-        Object root_0 = null;
-
-        CMISParser.valueExpression_return valueExpression82 = null;
-
-        CMISParser.compOp_return compOp83 = null;
-
-        CMISParser.literalOrParameterName_return literalOrParameterName84 = null;
-
-
-        RewriteRuleSubtreeStream stream_valueExpression=new RewriteRuleSubtreeStream(adaptor,"rule valueExpression");
-        RewriteRuleSubtreeStream stream_compOp=new RewriteRuleSubtreeStream(adaptor,"rule compOp");
-        RewriteRuleSubtreeStream stream_literalOrParameterName=new RewriteRuleSubtreeStream(adaptor,"rule literalOrParameterName");
-        try {
-            // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:582:9: ( valueExpression compOp literalOrParameterName -> ^( PRED_COMPARISON SINGLE_VALUED_PROPERTY valueExpression compOp literalOrParameterName ) )
-            // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:583:9: valueExpression compOp literalOrParameterName
-            {
-            pushFollow(FOLLOW_valueExpression_in_comparisonPredicate2822);
-            valueExpression82=valueExpression();
-
-            state._fsp--;
-            if (state.failed) return retval;
-            if ( state.backtracking==0 ) stream_valueExpression.add(valueExpression82.getTree());
-            pushFollow(FOLLOW_compOp_in_comparisonPredicate2824);
-            compOp83=compOp();
-
-            state._fsp--;
-            if (state.failed) return retval;
-            if ( state.backtracking==0 ) stream_compOp.add(compOp83.getTree());
-            pushFollow(FOLLOW_literalOrParameterName_in_comparisonPredicate2826);
-            literalOrParameterName84=literalOrParameterName();
-
-            state._fsp--;
-            if (state.failed) return retval;
-            if ( state.backtracking==0 ) stream_literalOrParameterName.add(literalOrParameterName84.getTree());
-
-
-            // AST REWRITE
-            // elements: literalOrParameterName, valueExpression, compOp
-            // token labels: 
-            // rule labels: retval
-            // token list labels: 
-            // rule list labels: 
-            // wildcard labels: 
-            if ( state.backtracking==0 ) {
-            retval.tree = root_0;
-            RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"rule retval",retval!=null?retval.tree:null);
-
-            root_0 = (Object)adaptor.nil();
-            // 584:17: -> ^( PRED_COMPARISON SINGLE_VALUED_PROPERTY valueExpression compOp literalOrParameterName )
-            {
-                // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:585:25: ^( PRED_COMPARISON SINGLE_VALUED_PROPERTY valueExpression compOp literalOrParameterName )
-                {
-                Object root_1 = (Object)adaptor.nil();
-                root_1 = (Object)adaptor.becomeRoot((Object)adaptor.create(PRED_COMPARISON, "PRED_COMPARISON"), root_1);
-
-                adaptor.addChild(root_1, (Object)adaptor.create(SINGLE_VALUED_PROPERTY, "SINGLE_VALUED_PROPERTY"));
-                adaptor.addChild(root_1, stream_valueExpression.nextTree());
-                adaptor.addChild(root_1, stream_compOp.nextTree());
-                adaptor.addChild(root_1, stream_literalOrParameterName.nextTree());
-
-                adaptor.addChild(root_0, root_1);
-                }
-
-            }
-
-            retval.tree = root_0;}
-            }
-
-            retval.stop = input.LT(-1);
-
-            if ( state.backtracking==0 ) {
-
-            retval.tree = (Object)adaptor.rulePostProcessing(root_0);
-            adaptor.setTokenBoundaries(retval.tree, retval.start, retval.stop);
-            }
-        }
-
-            catch(RecognitionException e)
-            {
-                throw new CMISQueryException(getErrorString(e), e);
-            }
-        finally {
-        }
-        return retval;
-    }
-    // $ANTLR end "comparisonPredicate"
-
-    public static class compOp_return extends ParserRuleReturnScope {
-        Object tree;
-        public Object getTree() { return tree; }
-    };
-
-    // $ANTLR start "compOp"
-    // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:588:1: compOp : ( EQUALS | NOTEQUALS | LESSTHAN | GREATERTHAN | LESSTHANOREQUALS | GREATERTHANOREQUALS );
-    public final CMISParser.compOp_return compOp() throws RecognitionException {
-        CMISParser.compOp_return retval = new CMISParser.compOp_return();
-        retval.start = input.LT(1);
-
-        Object root_0 = null;
-
-        Token set85=null;
-
-        Object set85_tree=null;
-
-        try {
-            // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:589:9: ( EQUALS | NOTEQUALS | LESSTHAN | GREATERTHAN | LESSTHANOREQUALS | GREATERTHANOREQUALS )
-            // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:
-            {
-            root_0 = (Object)adaptor.nil();
-
-            set85=(Token)input.LT(1);
-            if ( input.LA(1)==EQUALS||(input.LA(1)>=NOTEQUALS && input.LA(1)<=GREATERTHANOREQUALS) ) {
-                input.consume();
-                if ( state.backtracking==0 ) adaptor.addChild(root_0, (Object)adaptor.create(set85));
-                state.errorRecovery=false;state.failed=false;
-            }
-            else {
-                if (state.backtracking>0) {state.failed=true; return retval;}
-                MismatchedSetException mse = new MismatchedSetException(null,input);
-                throw mse;
-            }
-
-
-            }
-
-            retval.stop = input.LT(-1);
-
-            if ( state.backtracking==0 ) {
-
-            retval.tree = (Object)adaptor.rulePostProcessing(root_0);
-            adaptor.setTokenBoundaries(retval.tree, retval.start, retval.stop);
-            }
-        }
-
-            catch(RecognitionException e)
-            {
-                throw new CMISQueryException(getErrorString(e), e);
-            }
-        finally {
-        }
-        return retval;
-    }
-    // $ANTLR end "compOp"
-
-    public static class literalOrParameterName_return extends ParserRuleReturnScope {
-        Object tree;
-        public Object getTree() { return tree; }
-    };
-
-    // $ANTLR start "literalOrParameterName"
-    // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:598:1: literalOrParameterName : ( literal | {...}? => parameterName );
-    public final CMISParser.literalOrParameterName_return literalOrParameterName() throws RecognitionException {
-        CMISParser.literalOrParameterName_return retval = new CMISParser.literalOrParameterName_return();
-        retval.start = input.LT(1);
-
-        Object root_0 = null;
-
-        CMISParser.literal_return literal86 = null;
-
-        CMISParser.parameterName_return parameterName87 = null;
-
-
-
-        try {
-            // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:599:9: ( literal | {...}? => parameterName )
-            int alt29=2;
-            int LA29_0 = input.LA(1);
-
-            if ( (LA29_0==FLOATING_POINT_LITERAL) ) {
-                alt29=1;
-            }
-            else if ( (LA29_0==DECIMAL_INTEGER_LITERAL) ) {
-                alt29=1;
-            }
-            else if ( (LA29_0==QUOTED_STRING) ) {
-                alt29=1;
-            }
-            else if ( (LA29_0==TRUE) ) {
-                alt29=1;
-            }
-            else if ( (LA29_0==FALSE) ) {
-                alt29=1;
-            }
-            else if ( (LA29_0==TIMESTAMP) ) {
-                alt29=1;
-            }
-            else if ( (LA29_0==COLON) && ((strict == false))) {
-                alt29=2;
-            }
-            else {
-                if (state.backtracking>0) {state.failed=true; return retval;}
-                NoViableAltException nvae =
-                    new NoViableAltException("", 29, 0, input);
-
-                throw nvae;
-            }
-            switch (alt29) {
-                case 1 :
-                    // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:600:9: literal
-                    {
-                    root_0 = (Object)adaptor.nil();
-
-                    pushFollow(FOLLOW_literal_in_literalOrParameterName3006);
-                    literal86=literal();
-
-                    state._fsp--;
-                    if (state.failed) return retval;
-                    if ( state.backtracking==0 ) adaptor.addChild(root_0, literal86.getTree());
-
-                    }
-                    break;
-                case 2 :
-                    // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:601:11: {...}? => parameterName
-                    {
-                    root_0 = (Object)adaptor.nil();
-
-                    if ( !((strict == false)) ) {
-                        if (state.backtracking>0) {state.failed=true; return retval;}
-                        throw new FailedPredicateException(input, "literalOrParameterName", "strict == false");
-                    }
-                    pushFollow(FOLLOW_parameterName_in_literalOrParameterName3021);
-                    parameterName87=parameterName();
-
-                    state._fsp--;
-                    if (state.failed) return retval;
-                    if ( state.backtracking==0 ) adaptor.addChild(root_0, parameterName87.getTree());
-
-                    }
-                    break;
-
-            }
-            retval.stop = input.LT(-1);
-
-            if ( state.backtracking==0 ) {
-
-            retval.tree = (Object)adaptor.rulePostProcessing(root_0);
-            adaptor.setTokenBoundaries(retval.tree, retval.start, retval.stop);
-            }
-        }
-
-            catch(RecognitionException e)
-            {
-                throw new CMISQueryException(getErrorString(e), e);
-            }
-        finally {
-        }
-        return retval;
-    }
-    // $ANTLR end "literalOrParameterName"
-
-    public static class literal_return extends ParserRuleReturnScope {
-        Object tree;
-        public Object getTree() { return tree; }
-    };
-
-    // $ANTLR start "literal"
-    // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:604:1: literal : ( signedNumericLiteral | characterStringLiteral | booleanLiteral | datetimeLiteral );
-    public final CMISParser.literal_return literal() throws RecognitionException {
-        CMISParser.literal_return retval = new CMISParser.literal_return();
-        retval.start = input.LT(1);
-
-        Object root_0 = null;
-
-        CMISParser.signedNumericLiteral_return signedNumericLiteral88 = null;
-
-        CMISParser.characterStringLiteral_return characterStringLiteral89 = null;
-
-        CMISParser.booleanLiteral_return booleanLiteral90 = null;
-
-        CMISParser.datetimeLiteral_return datetimeLiteral91 = null;
-
-
-
-        try {
-            // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:605:9: ( signedNumericLiteral | characterStringLiteral | booleanLiteral | datetimeLiteral )
-            int alt30=4;
-            switch ( input.LA(1) ) {
-            case FLOATING_POINT_LITERAL:
-            case DECIMAL_INTEGER_LITERAL:
-                {
-                alt30=1;
-                }
-                break;
-            case QUOTED_STRING:
-                {
-                alt30=2;
-                }
-                break;
-            case TRUE:
-            case FALSE:
-                {
-                alt30=3;
-                }
-                break;
-            case TIMESTAMP:
-                {
-                alt30=4;
-                }
-                break;
-            default:
-                if (state.backtracking>0) {state.failed=true; return retval;}
-                NoViableAltException nvae =
-                    new NoViableAltException("", 30, 0, input);
-
-                throw nvae;
-            }
-
-            switch (alt30) {
-                case 1 :
-                    // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:606:9: signedNumericLiteral
-                    {
-                    root_0 = (Object)adaptor.nil();
-
-                    pushFollow(FOLLOW_signedNumericLiteral_in_literal3054);
-                    signedNumericLiteral88=signedNumericLiteral();
-
-                    state._fsp--;
-                    if (state.failed) return retval;
-                    if ( state.backtracking==0 ) adaptor.addChild(root_0, signedNumericLiteral88.getTree());
-
-                    }
-                    break;
-                case 2 :
-                    // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:607:11: characterStringLiteral
-                    {
-                    root_0 = (Object)adaptor.nil();
-
-                    pushFollow(FOLLOW_characterStringLiteral_in_literal3066);
-                    characterStringLiteral89=characterStringLiteral();
-
-                    state._fsp--;
-                    if (state.failed) return retval;
-                    if ( state.backtracking==0 ) adaptor.addChild(root_0, characterStringLiteral89.getTree());
-
-                    }
-                    break;
-                case 3 :
-                    // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:608:11: booleanLiteral
-                    {
-                    root_0 = (Object)adaptor.nil();
-
-                    pushFollow(FOLLOW_booleanLiteral_in_literal3078);
-                    booleanLiteral90=booleanLiteral();
-
-                    state._fsp--;
-                    if (state.failed) return retval;
-                    if ( state.backtracking==0 ) adaptor.addChild(root_0, booleanLiteral90.getTree());
-
-                    }
-                    break;
-                case 4 :
-                    // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:609:11: datetimeLiteral
-                    {
-                    root_0 = (Object)adaptor.nil();
-
-                    pushFollow(FOLLOW_datetimeLiteral_in_literal3090);
-                    datetimeLiteral91=datetimeLiteral();
-
-                    state._fsp--;
-                    if (state.failed) return retval;
-                    if ( state.backtracking==0 ) adaptor.addChild(root_0, datetimeLiteral91.getTree());
-
-                    }
-                    break;
-
-            }
-            retval.stop = input.LT(-1);
-
-            if ( state.backtracking==0 ) {
-
-            retval.tree = (Object)adaptor.rulePostProcessing(root_0);
-            adaptor.setTokenBoundaries(retval.tree, retval.start, retval.stop);
-            }
-        }
-
-            catch(RecognitionException e)
-            {
-                throw new CMISQueryException(getErrorString(e), e);
-            }
-        finally {
-        }
-        return retval;
-    }
-    // $ANTLR end "literal"
-
-    public static class inPredicate_return extends ParserRuleReturnScope {
-        Object tree;
-        public Object getTree() { return tree; }
-    };
-
-    // $ANTLR start "inPredicate"
-    // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:612:1: inPredicate : columnReference ( NOT )? IN LPAREN inValueList RPAREN -> ^( PRED_IN SINGLE_VALUED_PROPERTY columnReference inValueList ( NOT )? ) ;
-    public final CMISParser.inPredicate_return inPredicate() throws RecognitionException {
-        CMISParser.inPredicate_return retval = new CMISParser.inPredicate_return();
-        retval.start = input.LT(1);
-
-        Object root_0 = null;
-
-        Token NOT93=null;
-        Token IN94=null;
-        Token LPAREN95=null;
-        Token RPAREN97=null;
-        CMISParser.columnReference_return columnReference92 = null;
-
-        CMISParser.inValueList_return inValueList96 = null;
-
-
-        Object NOT93_tree=null;
-        Object IN94_tree=null;
-        Object LPAREN95_tree=null;
-        Object RPAREN97_tree=null;
-        RewriteRuleTokenStream stream_RPAREN=new RewriteRuleTokenStream(adaptor,"token RPAREN");
-        RewriteRuleTokenStream stream_IN=new RewriteRuleTokenStream(adaptor,"token IN");
-        RewriteRuleTokenStream stream_NOT=new RewriteRuleTokenStream(adaptor,"token NOT");
-        RewriteRuleTokenStream stream_LPAREN=new RewriteRuleTokenStream(adaptor,"token LPAREN");
-        RewriteRuleSubtreeStream stream_columnReference=new RewriteRuleSubtreeStream(adaptor,"rule columnReference");
-        RewriteRuleSubtreeStream stream_inValueList=new RewriteRuleSubtreeStream(adaptor,"rule inValueList");
-        try {
-            // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:613:9: ( columnReference ( NOT )? IN LPAREN inValueList RPAREN -> ^( PRED_IN SINGLE_VALUED_PROPERTY columnReference inValueList ( NOT )? ) )
-            // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:614:9: columnReference ( NOT )? IN LPAREN inValueList RPAREN
-            {
-            pushFollow(FOLLOW_columnReference_in_inPredicate3123);
-            columnReference92=columnReference();
-
-            state._fsp--;
-            if (state.failed) return retval;
-            if ( state.backtracking==0 ) stream_columnReference.add(columnReference92.getTree());
-            // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:614:25: ( NOT )?
-            int alt31=2;
-            int LA31_0 = input.LA(1);
-
-            if ( (LA31_0==NOT) ) {
-                alt31=1;
-            }
-            switch (alt31) {
-                case 1 :
-                    // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:614:25: NOT
-                    {
-                    NOT93=(Token)match(input,NOT,FOLLOW_NOT_in_inPredicate3125); if (state.failed) return retval; 
-                    if ( state.backtracking==0 ) stream_NOT.add(NOT93);
-
-
-                    }
-                    break;
-
-            }
-
-            IN94=(Token)match(input,IN,FOLLOW_IN_in_inPredicate3128); if (state.failed) return retval; 
-            if ( state.backtracking==0 ) stream_IN.add(IN94);
-
-            LPAREN95=(Token)match(input,LPAREN,FOLLOW_LPAREN_in_inPredicate3130); if (state.failed) return retval; 
-            if ( state.backtracking==0 ) stream_LPAREN.add(LPAREN95);
-
-            pushFollow(FOLLOW_inValueList_in_inPredicate3132);
-            inValueList96=inValueList();
-
-            state._fsp--;
-            if (state.failed) return retval;
-            if ( state.backtracking==0 ) stream_inValueList.add(inValueList96.getTree());
-            RPAREN97=(Token)match(input,RPAREN,FOLLOW_RPAREN_in_inPredicate3134); if (state.failed) return retval; 
-            if ( state.backtracking==0 ) stream_RPAREN.add(RPAREN97);
-
-
-
-            // AST REWRITE
-            // elements: inValueList, columnReference, NOT
-            // token labels: 
-            // rule labels: retval
-            // token list labels: 
-            // rule list labels: 
-            // wildcard labels: 
-            if ( state.backtracking==0 ) {
-            retval.tree = root_0;
-            RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"rule retval",retval!=null?retval.tree:null);
-
-            root_0 = (Object)adaptor.nil();
-            // 615:17: -> ^( PRED_IN SINGLE_VALUED_PROPERTY columnReference inValueList ( NOT )? )
-            {
-                // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:616:25: ^( PRED_IN SINGLE_VALUED_PROPERTY columnReference inValueList ( NOT )? )
-                {
-                Object root_1 = (Object)adaptor.nil();
-                root_1 = (Object)adaptor.becomeRoot((Object)adaptor.create(PRED_IN, "PRED_IN"), root_1);
-
-                adaptor.addChild(root_1, (Object)adaptor.create(SINGLE_VALUED_PROPERTY, "SINGLE_VALUED_PROPERTY"));
-                adaptor.addChild(root_1, stream_columnReference.nextTree());
-                adaptor.addChild(root_1, stream_inValueList.nextTree());
-                // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:616:86: ( NOT )?
-                if ( stream_NOT.hasNext() ) {
-                    adaptor.addChild(root_1, stream_NOT.nextNode());
-
-                }
-                stream_NOT.reset();
-
-                adaptor.addChild(root_0, root_1);
-                }
-
-            }
-
-            retval.tree = root_0;}
-            }
-
-            retval.stop = input.LT(-1);
-
-            if ( state.backtracking==0 ) {
-
-            retval.tree = (Object)adaptor.rulePostProcessing(root_0);
-            adaptor.setTokenBoundaries(retval.tree, retval.start, retval.stop);
-            }
-        }
-
-            catch(RecognitionException e)
-            {
-                throw new CMISQueryException(getErrorString(e), e);
-            }
-        finally {
-        }
-        return retval;
-    }
-    // $ANTLR end "inPredicate"
-
-    public static class inValueList_return extends ParserRuleReturnScope {
-        Object tree;
-        public Object getTree() { return tree; }
-    };
-
-    // $ANTLR start "inValueList"
-    // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:619:1: inValueList : literalOrParameterName ( COMMA literalOrParameterName )* -> ^( LIST ( literalOrParameterName )+ ) ;
-    public final CMISParser.inValueList_return inValueList() throws RecognitionException {
-        CMISParser.inValueList_return retval = new CMISParser.inValueList_return();
-        retval.start = input.LT(1);
-
-        Object root_0 = null;
-
-        Token COMMA99=null;
-        CMISParser.literalOrParameterName_return literalOrParameterName98 = null;
-
-        CMISParser.literalOrParameterName_return literalOrParameterName100 = null;
-
-
-        Object COMMA99_tree=null;
-        RewriteRuleTokenStream stream_COMMA=new RewriteRuleTokenStream(adaptor,"token COMMA");
-        RewriteRuleSubtreeStream stream_literalOrParameterName=new RewriteRuleSubtreeStream(adaptor,"rule literalOrParameterName");
-        try {
-            // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:620:9: ( literalOrParameterName ( COMMA literalOrParameterName )* -> ^( LIST ( literalOrParameterName )+ ) )
-            // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:621:9: literalOrParameterName ( COMMA literalOrParameterName )*
-            {
-            pushFollow(FOLLOW_literalOrParameterName_in_inValueList3222);
-            literalOrParameterName98=literalOrParameterName();
-
-            state._fsp--;
-            if (state.failed) return retval;
-            if ( state.backtracking==0 ) stream_literalOrParameterName.add(literalOrParameterName98.getTree());
-            // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:621:32: ( COMMA literalOrParameterName )*
-            loop32:
-            do {
-                int alt32=2;
-                int LA32_0 = input.LA(1);
-
-                if ( (LA32_0==COMMA) ) {
-                    alt32=1;
-                }
-
-
-                switch (alt32) {
-            	case 1 :
-            	    // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:621:33: COMMA literalOrParameterName
-            	    {
-            	    COMMA99=(Token)match(input,COMMA,FOLLOW_COMMA_in_inValueList3225); if (state.failed) return retval; 
-            	    if ( state.backtracking==0 ) stream_COMMA.add(COMMA99);
-
-            	    pushFollow(FOLLOW_literalOrParameterName_in_inValueList3227);
-            	    literalOrParameterName100=literalOrParameterName();
-
-            	    state._fsp--;
-            	    if (state.failed) return retval;
-            	    if ( state.backtracking==0 ) stream_literalOrParameterName.add(literalOrParameterName100.getTree());
-
-            	    }
-            	    break;
-
-            	default :
-            	    break loop32;
-                }
-            } while (true);
-
-
-
-            // AST REWRITE
-            // elements: literalOrParameterName
-            // token labels: 
-            // rule labels: retval
-            // token list labels: 
-            // rule list labels: 
-            // wildcard labels: 
-            if ( state.backtracking==0 ) {
-            retval.tree = root_0;
-            RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"rule retval",retval!=null?retval.tree:null);
-
-            root_0 = (Object)adaptor.nil();
-            // 622:17: -> ^( LIST ( literalOrParameterName )+ )
-            {
-                // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:623:25: ^( LIST ( literalOrParameterName )+ )
-                {
-                Object root_1 = (Object)adaptor.nil();
-                root_1 = (Object)adaptor.becomeRoot((Object)adaptor.create(LIST, "LIST"), root_1);
-
-                if ( !(stream_literalOrParameterName.hasNext()) ) {
-                    throw new RewriteEarlyExitException();
-                }
-                while ( stream_literalOrParameterName.hasNext() ) {
-                    adaptor.addChild(root_1, stream_literalOrParameterName.nextTree());
-
-                }
-                stream_literalOrParameterName.reset();
-
-                adaptor.addChild(root_0, root_1);
-                }
-
-            }
-
-            retval.tree = root_0;}
-            }
-
-            retval.stop = input.LT(-1);
-
-            if ( state.backtracking==0 ) {
-
-            retval.tree = (Object)adaptor.rulePostProcessing(root_0);
-            adaptor.setTokenBoundaries(retval.tree, retval.start, retval.stop);
-            }
-        }
-
-            catch(RecognitionException e)
-            {
-                throw new CMISQueryException(getErrorString(e), e);
-            }
-        finally {
-        }
-        return retval;
-    }
-    // $ANTLR end "inValueList"
-
-    public static class likePredicate_return extends ParserRuleReturnScope {
-        Object tree;
-        public Object getTree() { return tree; }
-    };
-
-    // $ANTLR start "likePredicate"
-    // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:626:1: likePredicate : columnReference ( NOT )? LIKE characterStringLiteral -> ^( PRED_LIKE columnReference characterStringLiteral ( NOT )? ) ;
-    public final CMISParser.likePredicate_return likePredicate() throws RecognitionException {
-        CMISParser.likePredicate_return retval = new CMISParser.likePredicate_return();
-        retval.start = input.LT(1);
-
-        Object root_0 = null;
-
-        Token NOT102=null;
-        Token LIKE103=null;
-        CMISParser.columnReference_return columnReference101 = null;
-
-        CMISParser.characterStringLiteral_return characterStringLiteral104 = null;
-
-
-        Object NOT102_tree=null;
-        Object LIKE103_tree=null;
-        RewriteRuleTokenStream stream_NOT=new RewriteRuleTokenStream(adaptor,"token NOT");
-        RewriteRuleTokenStream stream_LIKE=new RewriteRuleTokenStream(adaptor,"token LIKE");
-        RewriteRuleSubtreeStream stream_columnReference=new RewriteRuleSubtreeStream(adaptor,"rule columnReference");
-        RewriteRuleSubtreeStream stream_characterStringLiteral=new RewriteRuleSubtreeStream(adaptor,"rule characterStringLiteral");
-        try {
-            // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:627:9: ( columnReference ( NOT )? LIKE characterStringLiteral -> ^( PRED_LIKE columnReference characterStringLiteral ( NOT )? ) )
-            // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:628:9: columnReference ( NOT )? LIKE characterStringLiteral
-            {
-            pushFollow(FOLLOW_columnReference_in_likePredicate3311);
-            columnReference101=columnReference();
-
-            state._fsp--;
-            if (state.failed) return retval;
-            if ( state.backtracking==0 ) stream_columnReference.add(columnReference101.getTree());
-            // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:628:25: ( NOT )?
-            int alt33=2;
-            int LA33_0 = input.LA(1);
-
-            if ( (LA33_0==NOT) ) {
-                alt33=1;
-            }
-            switch (alt33) {
-                case 1 :
-                    // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:628:25: NOT
-                    {
-                    NOT102=(Token)match(input,NOT,FOLLOW_NOT_in_likePredicate3313); if (state.failed) return retval; 
-                    if ( state.backtracking==0 ) stream_NOT.add(NOT102);
-
-
-                    }
-                    break;
-
-            }
-
-            LIKE103=(Token)match(input,LIKE,FOLLOW_LIKE_in_likePredicate3316); if (state.failed) return retval; 
-            if ( state.backtracking==0 ) stream_LIKE.add(LIKE103);
-
-            pushFollow(FOLLOW_characterStringLiteral_in_likePredicate3318);
-            characterStringLiteral104=characterStringLiteral();
-
-            state._fsp--;
-            if (state.failed) return retval;
-            if ( state.backtracking==0 ) stream_characterStringLiteral.add(characterStringLiteral104.getTree());
-
-
-            // AST REWRITE
-            // elements: characterStringLiteral, NOT, columnReference
-            // token labels: 
-            // rule labels: retval
-            // token list labels: 
-            // rule list labels: 
-            // wildcard labels: 
-            if ( state.backtracking==0 ) {
-            retval.tree = root_0;
-            RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"rule retval",retval!=null?retval.tree:null);
-
-            root_0 = (Object)adaptor.nil();
-            // 629:17: -> ^( PRED_LIKE columnReference characterStringLiteral ( NOT )? )
-            {
-                // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:630:25: ^( PRED_LIKE columnReference characterStringLiteral ( NOT )? )
-                {
-                Object root_1 = (Object)adaptor.nil();
-                root_1 = (Object)adaptor.becomeRoot((Object)adaptor.create(PRED_LIKE, "PRED_LIKE"), root_1);
-
-                adaptor.addChild(root_1, stream_columnReference.nextTree());
-                adaptor.addChild(root_1, stream_characterStringLiteral.nextTree());
-                // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:630:76: ( NOT )?
-                if ( stream_NOT.hasNext() ) {
-                    adaptor.addChild(root_1, stream_NOT.nextNode());
-
-                }
-                stream_NOT.reset();
-
-                adaptor.addChild(root_0, root_1);
-                }
-
-            }
-
-            retval.tree = root_0;}
-            }
-
-            retval.stop = input.LT(-1);
-
-            if ( state.backtracking==0 ) {
-
-            retval.tree = (Object)adaptor.rulePostProcessing(root_0);
-            adaptor.setTokenBoundaries(retval.tree, retval.start, retval.stop);
-            }
-        }
-
-            catch(RecognitionException e)
-            {
-                throw new CMISQueryException(getErrorString(e), e);
-            }
-        finally {
-        }
-        return retval;
-    }
-    // $ANTLR end "likePredicate"
-
-    public static class nullPredicate_return extends ParserRuleReturnScope {
-        Object tree;
-        public Object getTree() { return tree; }
-    };
-
-    // $ANTLR start "nullPredicate"
-    // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:633:1: nullPredicate : ( columnReference IS NULL -> ^( PRED_EXISTS columnReference NOT ) | columnReference IS NOT NULL -> ^( PRED_EXISTS columnReference ) );
-    public final CMISParser.nullPredicate_return nullPredicate() throws RecognitionException {
-        CMISParser.nullPredicate_return retval = new CMISParser.nullPredicate_return();
-        retval.start = input.LT(1);
-
-        Object root_0 = null;
-
-        Token IS106=null;
-        Token NULL107=null;
-        Token IS109=null;
-        Token NOT110=null;
-        Token NULL111=null;
-        CMISParser.columnReference_return columnReference105 = null;
-
-        CMISParser.columnReference_return columnReference108 = null;
-
-
-        Object IS106_tree=null;
-        Object NULL107_tree=null;
-        Object IS109_tree=null;
-        Object NOT110_tree=null;
-        Object NULL111_tree=null;
-        RewriteRuleTokenStream stream_NOT=new RewriteRuleTokenStream(adaptor,"token NOT");
-        RewriteRuleTokenStream stream_IS=new RewriteRuleTokenStream(adaptor,"token IS");
-        RewriteRuleTokenStream stream_NULL=new RewriteRuleTokenStream(adaptor,"token NULL");
-        RewriteRuleSubtreeStream stream_columnReference=new RewriteRuleSubtreeStream(adaptor,"rule columnReference");
-        try {
-            // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:634:9: ( columnReference IS NULL -> ^( PRED_EXISTS columnReference NOT ) | columnReference IS NOT NULL -> ^( PRED_EXISTS columnReference ) )
-            int alt34=2;
-            alt34 = dfa34.predict(input);
-            switch (alt34) {
-                case 1 :
-                    // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:635:9: columnReference IS NULL
-                    {
-                    pushFollow(FOLLOW_columnReference_in_nullPredicate3404);
-                    columnReference105=columnReference();
-
-                    state._fsp--;
-                    if (state.failed) return retval;
-                    if ( state.backtracking==0 ) stream_columnReference.add(columnReference105.getTree());
-                    IS106=(Token)match(input,IS,FOLLOW_IS_in_nullPredicate3406); if (state.failed) return retval; 
-                    if ( state.backtracking==0 ) stream_IS.add(IS106);
-
-                    NULL107=(Token)match(input,NULL,FOLLOW_NULL_in_nullPredicate3408); if (state.failed) return retval; 
-                    if ( state.backtracking==0 ) stream_NULL.add(NULL107);
-
-
-
-                    // AST REWRITE
-                    // elements: columnReference
-                    // token labels: 
-                    // rule labels: retval
-                    // token list labels: 
-                    // rule list labels: 
-                    // wildcard labels: 
-                    if ( state.backtracking==0 ) {
-                    retval.tree = root_0;
-                    RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"rule retval",retval!=null?retval.tree:null);
-
-                    root_0 = (Object)adaptor.nil();
-                    // 636:17: -> ^( PRED_EXISTS columnReference NOT )
-                    {
-                        // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:637:25: ^( PRED_EXISTS columnReference NOT )
-                        {
-                        Object root_1 = (Object)adaptor.nil();
-                        root_1 = (Object)adaptor.becomeRoot((Object)adaptor.create(PRED_EXISTS, "PRED_EXISTS"), root_1);
-
-                        adaptor.addChild(root_1, stream_columnReference.nextTree());
-                        adaptor.addChild(root_1, (Object)adaptor.create(NOT, "NOT"));
-
-                        adaptor.addChild(root_0, root_1);
-                        }
-
-                    }
-
-                    retval.tree = root_0;}
-                    }
-                    break;
-                case 2 :
-                    // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:638:11: columnReference IS NOT NULL
-                    {
-                    pushFollow(FOLLOW_columnReference_in_nullPredicate3470);
-                    columnReference108=columnReference();
-
-                    state._fsp--;
-                    if (state.failed) return retval;
-                    if ( state.backtracking==0 ) stream_columnReference.add(columnReference108.getTree());
-                    IS109=(Token)match(input,IS,FOLLOW_IS_in_nullPredicate3472); if (state.failed) return retval; 
-                    if ( state.backtracking==0 ) stream_IS.add(IS109);
-
-                    NOT110=(Token)match(input,NOT,FOLLOW_NOT_in_nullPredicate3474); if (state.failed) return retval; 
-                    if ( state.backtracking==0 ) stream_NOT.add(NOT110);
-
-                    NULL111=(Token)match(input,NULL,FOLLOW_NULL_in_nullPredicate3476); if (state.failed) return retval; 
-                    if ( state.backtracking==0 ) stream_NULL.add(NULL111);
-
-
-
-                    // AST REWRITE
-                    // elements: columnReference
-                    // token labels: 
-                    // rule labels: retval
-                    // token list labels: 
-                    // rule list labels: 
-                    // wildcard labels: 
-                    if ( state.backtracking==0 ) {
-                    retval.tree = root_0;
-                    RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"rule retval",retval!=null?retval.tree:null);
-
-                    root_0 = (Object)adaptor.nil();
-                    // 639:17: -> ^( PRED_EXISTS columnReference )
-                    {
-                        // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:640:25: ^( PRED_EXISTS columnReference )
-                        {
-                        Object root_1 = (Object)adaptor.nil();
-                        root_1 = (Object)adaptor.becomeRoot((Object)adaptor.create(PRED_EXISTS, "PRED_EXISTS"), root_1);
-
-                        adaptor.addChild(root_1, stream_columnReference.nextTree());
-
-                        adaptor.addChild(root_0, root_1);
-                        }
-
-                    }
-
-                    retval.tree = root_0;}
-                    }
-                    break;
-
-            }
-            retval.stop = input.LT(-1);
-
-            if ( state.backtracking==0 ) {
-
-            retval.tree = (Object)adaptor.rulePostProcessing(root_0);
-            adaptor.setTokenBoundaries(retval.tree, retval.start, retval.stop);
-            }
-        }
-
-            catch(RecognitionException e)
-            {
-                throw new CMISQueryException(getErrorString(e), e);
-            }
-        finally {
-        }
-        return retval;
-    }
-    // $ANTLR end "nullPredicate"
-
-    public static class quantifiedComparisonPredicate_return extends ParserRuleReturnScope {
-        Object tree;
-        public Object getTree() { return tree; }
-    };
-
-    // $ANTLR start "quantifiedComparisonPredicate"
-    // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:643:1: quantifiedComparisonPredicate : literalOrParameterName compOp ANY columnReference -> ^( PRED_COMPARISON ANY literalOrParameterName compOp columnReference ) ;
-    public final CMISParser.quantifiedComparisonPredicate_return quantifiedComparisonPredicate() throws RecognitionException {
-        CMISParser.quantifiedComparisonPredicate_return retval = new CMISParser.quantifiedComparisonPredicate_return();
-        retval.start = input.LT(1);
-
-        Object root_0 = null;
-
-        Token ANY114=null;
-        CMISParser.literalOrParameterName_return literalOrParameterName112 = null;
-
-        CMISParser.compOp_return compOp113 = null;
-
-        CMISParser.columnReference_return columnReference115 = null;
-
-
-        Object ANY114_tree=null;
-        RewriteRuleTokenStream stream_ANY=new RewriteRuleTokenStream(adaptor,"token ANY");
-        RewriteRuleSubtreeStream stream_columnReference=new RewriteRuleSubtreeStream(adaptor,"rule columnReference");
-        RewriteRuleSubtreeStream stream_compOp=new RewriteRuleSubtreeStream(adaptor,"rule compOp");
-        RewriteRuleSubtreeStream stream_literalOrParameterName=new RewriteRuleSubtreeStream(adaptor,"rule literalOrParameterName");
-        try {
-            // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:644:9: ( literalOrParameterName compOp ANY columnReference -> ^( PRED_COMPARISON ANY literalOrParameterName compOp columnReference ) )
-            // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:645:9: literalOrParameterName compOp ANY columnReference
-            {
-            pushFollow(FOLLOW_literalOrParameterName_in_quantifiedComparisonPredicate3557);
-            literalOrParameterName112=literalOrParameterName();
-
-            state._fsp--;
-            if (state.failed) return retval;
-            if ( state.backtracking==0 ) stream_literalOrParameterName.add(literalOrParameterName112.getTree());
-            pushFollow(FOLLOW_compOp_in_quantifiedComparisonPredicate3559);
-            compOp113=compOp();
-
-            state._fsp--;
-            if (state.failed) return retval;
-            if ( state.backtracking==0 ) stream_compOp.add(compOp113.getTree());
-            ANY114=(Token)match(input,ANY,FOLLOW_ANY_in_quantifiedComparisonPredicate3561); if (state.failed) return retval; 
-            if ( state.backtracking==0 ) stream_ANY.add(ANY114);
-
-            pushFollow(FOLLOW_columnReference_in_quantifiedComparisonPredicate3563);
-            columnReference115=columnReference();
-
-            state._fsp--;
-            if (state.failed) return retval;
-            if ( state.backtracking==0 ) stream_columnReference.add(columnReference115.getTree());
-
-
-            // AST REWRITE
-            // elements: literalOrParameterName, columnReference, ANY, compOp
-            // token labels: 
-            // rule labels: retval
-            // token list labels: 
-            // rule list labels: 
-            // wildcard labels: 
-            if ( state.backtracking==0 ) {
-            retval.tree = root_0;
-            RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"rule retval",retval!=null?retval.tree:null);
-
-            root_0 = (Object)adaptor.nil();
-            // 646:17: -> ^( PRED_COMPARISON ANY literalOrParameterName compOp columnReference )
-            {
-                // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:647:25: ^( PRED_COMPARISON ANY literalOrParameterName compOp columnReference )
-                {
-                Object root_1 = (Object)adaptor.nil();
-                root_1 = (Object)adaptor.becomeRoot((Object)adaptor.create(PRED_COMPARISON, "PRED_COMPARISON"), root_1);
-
-                adaptor.addChild(root_1, stream_ANY.nextNode());
-                adaptor.addChild(root_1, stream_literalOrParameterName.nextTree());
-                adaptor.addChild(root_1, stream_compOp.nextTree());
-                adaptor.addChild(root_1, stream_columnReference.nextTree());
-
-                adaptor.addChild(root_0, root_1);
-                }
-
-            }
-
-            retval.tree = root_0;}
-            }
-
-            retval.stop = input.LT(-1);
-
-            if ( state.backtracking==0 ) {
-
-            retval.tree = (Object)adaptor.rulePostProcessing(root_0);
-            adaptor.setTokenBoundaries(retval.tree, retval.start, retval.stop);
-            }
-        }
-
-            catch(RecognitionException e)
-            {
-                throw new CMISQueryException(getErrorString(e), e);
-            }
-        finally {
-        }
-        return retval;
-    }
-    // $ANTLR end "quantifiedComparisonPredicate"
-
-    public static class quantifiedInPredicate_return extends ParserRuleReturnScope {
-        Object tree;
-        public Object getTree() { return tree; }
-    };
-
-    // $ANTLR start "quantifiedInPredicate"
-    // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:650:1: quantifiedInPredicate : ANY columnReference ( NOT )? IN LPAREN inValueList RPAREN -> ^( PRED_IN ANY columnReference inValueList ( NOT )? ) ;
-    public final CMISParser.quantifiedInPredicate_return quantifiedInPredicate() throws RecognitionException {
-        CMISParser.quantifiedInPredicate_return retval = new CMISParser.quantifiedInPredicate_return();
-        retval.start = input.LT(1);
-
-        Object root_0 = null;
-
-        Token ANY116=null;
-        Token NOT118=null;
-        Token IN119=null;
-        Token LPAREN120=null;
-        Token RPAREN122=null;
-        CMISParser.columnReference_return columnReference117 = null;
-
-        CMISParser.inValueList_return inValueList121 = null;
-
-
-        Object ANY116_tree=null;
-        Object NOT118_tree=null;
-        Object IN119_tree=null;
-        Object LPAREN120_tree=null;
-        Object RPAREN122_tree=null;
-        RewriteRuleTokenStream stream_RPAREN=new RewriteRuleTokenStream(adaptor,"token RPAREN");
-        RewriteRuleTokenStream stream_ANY=new RewriteRuleTokenStream(adaptor,"token ANY");
-        RewriteRuleTokenStream stream_IN=new RewriteRuleTokenStream(adaptor,"token IN");
-        RewriteRuleTokenStream stream_NOT=new RewriteRuleTokenStream(adaptor,"token NOT");
-        RewriteRuleTokenStream stream_LPAREN=new RewriteRuleTokenStream(adaptor,"token LPAREN");
-        RewriteRuleSubtreeStream stream_columnReference=new RewriteRuleSubtreeStream(adaptor,"rule columnReference");
-        RewriteRuleSubtreeStream stream_inValueList=new RewriteRuleSubtreeStream(adaptor,"rule inValueList");
-        try {
-            // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:651:9: ( ANY columnReference ( NOT )? IN LPAREN inValueList RPAREN -> ^( PRED_IN ANY columnReference inValueList ( NOT )? ) )
-            // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:652:9: ANY columnReference ( NOT )? IN LPAREN inValueList RPAREN
-            {
-            ANY116=(Token)match(input,ANY,FOLLOW_ANY_in_quantifiedInPredicate3650); if (state.failed) return retval; 
-            if ( state.backtracking==0 ) stream_ANY.add(ANY116);
-
-            pushFollow(FOLLOW_columnReference_in_quantifiedInPredicate3652);
-            columnReference117=columnReference();
-
-            state._fsp--;
-            if (state.failed) return retval;
-            if ( state.backtracking==0 ) stream_columnReference.add(columnReference117.getTree());
-            // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:652:29: ( NOT )?
-            int alt35=2;
-            int LA35_0 = input.LA(1);
-
-            if ( (LA35_0==NOT) ) {
-                alt35=1;
-            }
-            switch (alt35) {
-                case 1 :
-                    // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:652:29: NOT
-                    {
-                    NOT118=(Token)match(input,NOT,FOLLOW_NOT_in_quantifiedInPredicate3654); if (state.failed) return retval; 
-                    if ( state.backtracking==0 ) stream_NOT.add(NOT118);
-
-
-                    }
-                    break;
-
-            }
-
-            IN119=(Token)match(input,IN,FOLLOW_IN_in_quantifiedInPredicate3657); if (state.failed) return retval; 
-            if ( state.backtracking==0 ) stream_IN.add(IN119);
-
-            LPAREN120=(Token)match(input,LPAREN,FOLLOW_LPAREN_in_quantifiedInPredicate3659); if (state.failed) return retval; 
-            if ( state.backtracking==0 ) stream_LPAREN.add(LPAREN120);
-
-            pushFollow(FOLLOW_inValueList_in_quantifiedInPredicate3661);
-            inValueList121=inValueList();
-
-            state._fsp--;
-            if (state.failed) return retval;
-            if ( state.backtracking==0 ) stream_inValueList.add(inValueList121.getTree());
-            RPAREN122=(Token)match(input,RPAREN,FOLLOW_RPAREN_in_quantifiedInPredicate3663); if (state.failed) return retval; 
-            if ( state.backtracking==0 ) stream_RPAREN.add(RPAREN122);
-
-
-
-            // AST REWRITE
-            // elements: NOT, inValueList, columnReference, ANY
-            // token labels: 
-            // rule labels: retval
-            // token list labels: 
-            // rule list labels: 
-            // wildcard labels: 
-            if ( state.backtracking==0 ) {
-            retval.tree = root_0;
-            RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"rule retval",retval!=null?retval.tree:null);
-
-            root_0 = (Object)adaptor.nil();
-            // 653:17: -> ^( PRED_IN ANY columnReference inValueList ( NOT )? )
-            {
-                // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:654:25: ^( PRED_IN ANY columnReference inValueList ( NOT )? )
-                {
-                Object root_1 = (Object)adaptor.nil();
-                root_1 = (Object)adaptor.becomeRoot((Object)adaptor.create(PRED_IN, "PRED_IN"), root_1);
-
-                adaptor.addChild(root_1, stream_ANY.nextNode());
-                adaptor.addChild(root_1, stream_columnReference.nextTree());
-                adaptor.addChild(root_1, stream_inValueList.nextTree());
-                // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:654:67: ( NOT )?
-                if ( stream_NOT.hasNext() ) {
-                    adaptor.addChild(root_1, stream_NOT.nextNode());
-
-                }
-                stream_NOT.reset();
-
-                adaptor.addChild(root_0, root_1);
-                }
-
-            }
-
-            retval.tree = root_0;}
-            }
-
-            retval.stop = input.LT(-1);
-
-            if ( state.backtracking==0 ) {
-
-            retval.tree = (Object)adaptor.rulePostProcessing(root_0);
-            adaptor.setTokenBoundaries(retval.tree, retval.start, retval.stop);
-            }
-        }
-
-            catch(RecognitionException e)
-            {
-                throw new CMISQueryException(getErrorString(e), e);
-            }
-        finally {
-        }
-        return retval;
-    }
-    // $ANTLR end "quantifiedInPredicate"
-
-    public static class textSearchPredicate_return extends ParserRuleReturnScope {
-        Object tree;
-        public Object getTree() { return tree; }
-    };
-
-    // $ANTLR start "textSearchPredicate"
-    // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:657:1: textSearchPredicate : CONTAINS LPAREN ( qualifier COMMA )? textSearchExpression RPAREN -> ^( PRED_FTS textSearchExpression ( qualifier )? ) ;
-    public final CMISParser.textSearchPredicate_return textSearchPredicate() throws RecognitionException {
-        CMISParser.textSearchPredicate_return retval = new CMISParser.textSearchPredicate_return();
-        retval.start = input.LT(1);
-
-        Object root_0 = null;
-
-        Token CONTAINS123=null;
-        Token LPAREN124=null;
-        Token COMMA126=null;
-        Token RPAREN128=null;
-        CMISParser.qualifier_return qualifier125 = null;
-
-        CMISParser.textSearchExpression_return textSearchExpression127 = null;
-
-
-        Object CONTAINS123_tree=null;
-        Object LPAREN124_tree=null;
-        Object COMMA126_tree=null;
-        Object RPAREN128_tree=null;
-        RewriteRuleTokenStream stream_RPAREN=new RewriteRuleTokenStream(adaptor,"token RPAREN");
-        RewriteRuleTokenStream stream_COMMA=new RewriteRuleTokenStream(adaptor,"token COMMA");
-        RewriteRuleTokenStream stream_CONTAINS=new RewriteRuleTokenStream(adaptor,"token CONTAINS");
-        RewriteRuleTokenStream stream_LPAREN=new RewriteRuleTokenStream(adaptor,"token LPAREN");
-        RewriteRuleSubtreeStream stream_qualifier=new RewriteRuleSubtreeStream(adaptor,"rule qualifier");
-        RewriteRuleSubtreeStream stream_textSearchExpression=new RewriteRuleSubtreeStream(adaptor,"rule textSearchExpression");
-        try {
-            // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:658:9: ( CONTAINS LPAREN ( qualifier COMMA )? textSearchExpression RPAREN -> ^( PRED_FTS textSearchExpression ( qualifier )? ) )
-            // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:659:9: CONTAINS LPAREN ( qualifier COMMA )? textSearchExpression RPAREN
-            {
-            CONTAINS123=(Token)match(input,CONTAINS,FOLLOW_CONTAINS_in_textSearchPredicate3751); if (state.failed) return retval; 
-            if ( state.backtracking==0 ) stream_CONTAINS.add(CONTAINS123);
-
-            LPAREN124=(Token)match(input,LPAREN,FOLLOW_LPAREN_in_textSearchPredicate3753); if (state.failed) return retval; 
-            if ( state.backtracking==0 ) stream_LPAREN.add(LPAREN124);
-
-            // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:659:25: ( qualifier COMMA )?
-            int alt36=2;
-            int LA36_0 = input.LA(1);
-
-            if ( (LA36_0==ID) ) {
-                alt36=1;
-            }
-            else if ( (LA36_0==DOUBLE_QUOTE) && ((strict == false))) {
-                alt36=1;
-            }
-            switch (alt36) {
-                case 1 :
-                    // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:659:26: qualifier COMMA
-                    {
-                    pushFollow(FOLLOW_qualifier_in_textSearchPredicate3756);
-                    qualifier125=qualifier();
-
-                    state._fsp--;
-                    if (state.failed) return retval;
-                    if ( state.backtracking==0 ) stream_qualifier.add(qualifier125.getTree());
-                    COMMA126=(Token)match(input,COMMA,FOLLOW_COMMA_in_textSearchPredicate3758); if (state.failed) return retval; 
-                    if ( state.backtracking==0 ) stream_COMMA.add(COMMA126);
-
-
-                    }
-                    break;
-
-            }
-
-            pushFollow(FOLLOW_textSearchExpression_in_textSearchPredicate3762);
-            textSearchExpression127=textSearchExpression();
-
-            state._fsp--;
-            if (state.failed) return retval;
-            if ( state.backtracking==0 ) stream_textSearchExpression.add(textSearchExpression127.getTree());
-            RPAREN128=(Token)match(input,RPAREN,FOLLOW_RPAREN_in_textSearchPredicate3764); if (state.failed) return retval; 
-            if ( state.backtracking==0 ) stream_RPAREN.add(RPAREN128);
-
-
-
-            // AST REWRITE
-            // elements: textSearchExpression, qualifier
-            // token labels: 
-            // rule labels: retval
-            // token list labels: 
-            // rule list labels: 
-            // wildcard labels: 
-            if ( state.backtracking==0 ) {
-            retval.tree = root_0;
-            RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"rule retval",retval!=null?retval.tree:null);
-
-            root_0 = (Object)adaptor.nil();
-            // 660:17: -> ^( PRED_FTS textSearchExpression ( qualifier )? )
-            {
-                // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:661:25: ^( PRED_FTS textSearchExpression ( qualifier )? )
-                {
-                Object root_1 = (Object)adaptor.nil();
-                root_1 = (Object)adaptor.becomeRoot((Object)adaptor.create(PRED_FTS, "PRED_FTS"), root_1);
-
-                adaptor.addChild(root_1, stream_textSearchExpression.nextTree());
-                // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:661:57: ( qualifier )?
-                if ( stream_qualifier.hasNext() ) {
-                    adaptor.addChild(root_1, stream_qualifier.nextTree());
-
-                }
-                stream_qualifier.reset();
-
-                adaptor.addChild(root_0, root_1);
-                }
-
-            }
-
-            retval.tree = root_0;}
-            }
-
-            retval.stop = input.LT(-1);
-
-            if ( state.backtracking==0 ) {
-
-            retval.tree = (Object)adaptor.rulePostProcessing(root_0);
-            adaptor.setTokenBoundaries(retval.tree, retval.start, retval.stop);
-            }
-        }
-
-            catch(RecognitionException e)
-            {
-                throw new CMISQueryException(getErrorString(e), e);
-            }
-        finally {
-        }
-        return retval;
-    }
-    // $ANTLR end "textSearchPredicate"
-
-    public static class folderPredicate_return extends ParserRuleReturnScope {
-        Object tree;
-        public Object getTree() { return tree; }
-    };
-
-    // $ANTLR start "folderPredicate"
-    // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:664:1: folderPredicate : ( IN_FOLDER folderPredicateArgs -> ^( PRED_CHILD folderPredicateArgs ) | IN_TREE folderPredicateArgs -> ^( PRED_DESCENDANT folderPredicateArgs ) );
-    public final CMISParser.folderPredicate_return folderPredicate() throws RecognitionException {
-        CMISParser.folderPredicate_return retval = new CMISParser.folderPredicate_return();
-        retval.start = input.LT(1);
-
-        Object root_0 = null;
-
-        Token IN_FOLDER129=null;
-        Token IN_TREE131=null;
-        CMISParser.folderPredicateArgs_return folderPredicateArgs130 = null;
-
-        CMISParser.folderPredicateArgs_return folderPredicateArgs132 = null;
-
-
-        Object IN_FOLDER129_tree=null;
-        Object IN_TREE131_tree=null;
-        RewriteRuleTokenStream stream_IN_TREE=new RewriteRuleTokenStream(adaptor,"token IN_TREE");
-        RewriteRuleTokenStream stream_IN_FOLDER=new RewriteRuleTokenStream(adaptor,"token IN_FOLDER");
-        RewriteRuleSubtreeStream stream_folderPredicateArgs=new RewriteRuleSubtreeStream(adaptor,"rule folderPredicateArgs");
-        try {
-            // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:665:9: ( IN_FOLDER folderPredicateArgs -> ^( PRED_CHILD folderPredicateArgs ) | IN_TREE folderPredicateArgs -> ^( PRED_DESCENDANT folderPredicateArgs ) )
-            int alt37=2;
-            int LA37_0 = input.LA(1);
-
-            if ( (LA37_0==IN_FOLDER) ) {
-                alt37=1;
-            }
-            else if ( (LA37_0==IN_TREE) ) {
-                alt37=2;
-            }
-            else {
-                if (state.backtracking>0) {state.failed=true; return retval;}
-                NoViableAltException nvae =
-                    new NoViableAltException("", 37, 0, input);
-
-                throw nvae;
-            }
-            switch (alt37) {
-                case 1 :
-                    // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:666:9: IN_FOLDER folderPredicateArgs
-                    {
-                    IN_FOLDER129=(Token)match(input,IN_FOLDER,FOLLOW_IN_FOLDER_in_folderPredicate3848); if (state.failed) return retval; 
-                    if ( state.backtracking==0 ) stream_IN_FOLDER.add(IN_FOLDER129);
-
-                    pushFollow(FOLLOW_folderPredicateArgs_in_folderPredicate3850);
-                    folderPredicateArgs130=folderPredicateArgs();
-
-                    state._fsp--;
-                    if (state.failed) return retval;
-                    if ( state.backtracking==0 ) stream_folderPredicateArgs.add(folderPredicateArgs130.getTree());
-
-
-                    // AST REWRITE
-                    // elements: folderPredicateArgs
-                    // token labels: 
-                    // rule labels: retval
-                    // token list labels: 
-                    // rule list labels: 
-                    // wildcard labels: 
-                    if ( state.backtracking==0 ) {
-                    retval.tree = root_0;
-                    RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"rule retval",retval!=null?retval.tree:null);
-
-                    root_0 = (Object)adaptor.nil();
-                    // 667:17: -> ^( PRED_CHILD folderPredicateArgs )
-                    {
-                        // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:668:25: ^( PRED_CHILD folderPredicateArgs )
-                        {
-                        Object root_1 = (Object)adaptor.nil();
-                        root_1 = (Object)adaptor.becomeRoot((Object)adaptor.create(PRED_CHILD, "PRED_CHILD"), root_1);
-
-                        adaptor.addChild(root_1, stream_folderPredicateArgs.nextTree());
-
-                        adaptor.addChild(root_0, root_1);
-                        }
-
-                    }
-
-                    retval.tree = root_0;}
-                    }
-                    break;
-                case 2 :
-                    // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:669:11: IN_TREE folderPredicateArgs
-                    {
-                    IN_TREE131=(Token)match(input,IN_TREE,FOLLOW_IN_TREE_in_folderPredicate3910); if (state.failed) return retval; 
-                    if ( state.backtracking==0 ) stream_IN_TREE.add(IN_TREE131);
-
-                    pushFollow(FOLLOW_folderPredicateArgs_in_folderPredicate3912);
-                    folderPredicateArgs132=folderPredicateArgs();
-
-                    state._fsp--;
-                    if (state.failed) return retval;
-                    if ( state.backtracking==0 ) stream_folderPredicateArgs.add(folderPredicateArgs132.getTree());
-
-
-                    // AST REWRITE
-                    // elements: folderPredicateArgs
-                    // token labels: 
-                    // rule labels: retval
-                    // token list labels: 
-                    // rule list labels: 
-                    // wildcard labels: 
-                    if ( state.backtracking==0 ) {
-                    retval.tree = root_0;
-                    RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"rule retval",retval!=null?retval.tree:null);
-
-                    root_0 = (Object)adaptor.nil();
-                    // 670:17: -> ^( PRED_DESCENDANT folderPredicateArgs )
-                    {
-                        // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:671:25: ^( PRED_DESCENDANT folderPredicateArgs )
-                        {
-                        Object root_1 = (Object)adaptor.nil();
-                        root_1 = (Object)adaptor.becomeRoot((Object)adaptor.create(PRED_DESCENDANT, "PRED_DESCENDANT"), root_1);
-
-                        adaptor.addChild(root_1, stream_folderPredicateArgs.nextTree());
-
-                        adaptor.addChild(root_0, root_1);
-                        }
-
-                    }
-
-                    retval.tree = root_0;}
-                    }
-                    break;
-
-            }
-            retval.stop = input.LT(-1);
-
-            if ( state.backtracking==0 ) {
-
-            retval.tree = (Object)adaptor.rulePostProcessing(root_0);
-            adaptor.setTokenBoundaries(retval.tree, retval.start, retval.stop);
-            }
-        }
-
-            catch(RecognitionException e)
-            {
-                throw new CMISQueryException(getErrorString(e), e);
-            }
-        finally {
-        }
-        return retval;
-    }
-    // $ANTLR end "folderPredicate"
-
-    public static class folderPredicateArgs_return extends ParserRuleReturnScope {
-        Object tree;
-        public Object getTree() { return tree; }
-    };
-
-    // $ANTLR start "folderPredicateArgs"
-    // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:674:1: folderPredicateArgs : LPAREN ( qualifier COMMA )? folderId RPAREN -> folderId ( qualifier )? ;
-    public final CMISParser.folderPredicateArgs_return folderPredicateArgs() throws RecognitionException {
-        CMISParser.folderPredicateArgs_return retval = new CMISParser.folderPredicateArgs_return();
-        retval.start = input.LT(1);
-
-        Object root_0 = null;
-
-        Token LPAREN133=null;
-        Token COMMA135=null;
-        Token RPAREN137=null;
-        CMISParser.qualifier_return qualifier134 = null;
-
-        CMISParser.folderId_return folderId136 = null;
-
-
-        Object LPAREN133_tree=null;
-        Object COMMA135_tree=null;
-        Object RPAREN137_tree=null;
-        RewriteRuleTokenStream stream_RPAREN=new RewriteRuleTokenStream(adaptor,"token RPAREN");
-        RewriteRuleTokenStream stream_COMMA=new RewriteRuleTokenStream(adaptor,"token COMMA");
-        RewriteRuleTokenStream stream_LPAREN=new RewriteRuleTokenStream(adaptor,"token LPAREN");
-        RewriteRuleSubtreeStream stream_qualifier=new RewriteRuleSubtreeStream(adaptor,"rule qualifier");
-        RewriteRuleSubtreeStream stream_folderId=new RewriteRuleSubtreeStream(adaptor,"rule folderId");
-        try {
-            // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:675:9: ( LPAREN ( qualifier COMMA )? folderId RPAREN -> folderId ( qualifier )? )
-            // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:676:9: LPAREN ( qualifier COMMA )? folderId RPAREN
-            {
-            LPAREN133=(Token)match(input,LPAREN,FOLLOW_LPAREN_in_folderPredicateArgs3993); if (state.failed) return retval; 
-            if ( state.backtracking==0 ) stream_LPAREN.add(LPAREN133);
-
-            // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:676:16: ( qualifier COMMA )?
-            int alt38=2;
-            int LA38_0 = input.LA(1);
-
-            if ( (LA38_0==ID) ) {
-                alt38=1;
-            }
-            else if ( (LA38_0==DOUBLE_QUOTE) && ((strict == false))) {
-                alt38=1;
-            }
-            switch (alt38) {
-                case 1 :
-                    // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:676:17: qualifier COMMA
-                    {
-                    pushFollow(FOLLOW_qualifier_in_folderPredicateArgs3996);
-                    qualifier134=qualifier();
-
-                    state._fsp--;
-                    if (state.failed) return retval;
-                    if ( state.backtracking==0 ) stream_qualifier.add(qualifier134.getTree());
-                    COMMA135=(Token)match(input,COMMA,FOLLOW_COMMA_in_folderPredicateArgs3998); if (state.failed) return retval; 
-                    if ( state.backtracking==0 ) stream_COMMA.add(COMMA135);
-
-
-                    }
-                    break;
-
-            }
-
-            pushFollow(FOLLOW_folderId_in_folderPredicateArgs4002);
-            folderId136=folderId();
-
-            state._fsp--;
-            if (state.failed) return retval;
-            if ( state.backtracking==0 ) stream_folderId.add(folderId136.getTree());
-            RPAREN137=(Token)match(input,RPAREN,FOLLOW_RPAREN_in_folderPredicateArgs4004); if (state.failed) return retval; 
-            if ( state.backtracking==0 ) stream_RPAREN.add(RPAREN137);
-
-
-
-            // AST REWRITE
-            // elements: folderId, qualifier
-            // token labels: 
-            // rule labels: retval
-            // token list labels: 
-            // rule list labels: 
-            // wildcard labels: 
-            if ( state.backtracking==0 ) {
-            retval.tree = root_0;
-            RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"rule retval",retval!=null?retval.tree:null);
-
-            root_0 = (Object)adaptor.nil();
-            // 677:17: -> folderId ( qualifier )?
-            {
-                adaptor.addChild(root_0, stream_folderId.nextTree());
-                // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:677:29: ( qualifier )?
-                if ( stream_qualifier.hasNext() ) {
-                    adaptor.addChild(root_0, stream_qualifier.nextTree());
-
-                }
-                stream_qualifier.reset();
-
-            }
-
-            retval.tree = root_0;}
-            }
-
-            retval.stop = input.LT(-1);
-
-            if ( state.backtracking==0 ) {
-
-            retval.tree = (Object)adaptor.rulePostProcessing(root_0);
-            adaptor.setTokenBoundaries(retval.tree, retval.start, retval.stop);
-            }
-        }
-
-            catch(RecognitionException e)
-            {
-                throw new CMISQueryException(getErrorString(e), e);
-            }
-        finally {
-        }
-        return retval;
-    }
-    // $ANTLR end "folderPredicateArgs"
-
-    public static class orderByClause_return extends ParserRuleReturnScope {
-        Object tree;
-        public Object getTree() { return tree; }
-    };
-
-    // $ANTLR start "orderByClause"
-    // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:680:1: orderByClause : ORDER BY sortSpecification ( COMMA sortSpecification )* -> ^( ORDER ( sortSpecification )+ ) ;
-    public final CMISParser.orderByClause_return orderByClause() throws RecognitionException {
-        CMISParser.orderByClause_return retval = new CMISParser.orderByClause_return();
-        retval.start = input.LT(1);
-
-        Object root_0 = null;
-
-        Token ORDER138=null;
-        Token BY139=null;
-        Token COMMA141=null;
-        CMISParser.sortSpecification_return sortSpecification140 = null;
-
-        CMISParser.sortSpecification_return sortSpecification142 = null;
-
-
-        Object ORDER138_tree=null;
-        Object BY139_tree=null;
-        Object COMMA141_tree=null;
-        RewriteRuleTokenStream stream_BY=new RewriteRuleTokenStream(adaptor,"token BY");
-        RewriteRuleTokenStream stream_ORDER=new RewriteRuleTokenStream(adaptor,"token ORDER");
-        RewriteRuleTokenStream stream_COMMA=new RewriteRuleTokenStream(adaptor,"token COMMA");
-        RewriteRuleSubtreeStream stream_sortSpecification=new RewriteRuleSubtreeStream(adaptor,"rule sortSpecification");
-
-            paraphrases.push("in order by"); 
-
-        try {
-            // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:689:9: ( ORDER BY sortSpecification ( COMMA sortSpecification )* -> ^( ORDER ( sortSpecification )+ ) )
-            // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:690:9: ORDER BY sortSpecification ( COMMA sortSpecification )*
-            {
-            ORDER138=(Token)match(input,ORDER,FOLLOW_ORDER_in_orderByClause4070); if (state.failed) return retval; 
-            if ( state.backtracking==0 ) stream_ORDER.add(ORDER138);
-
-            BY139=(Token)match(input,BY,FOLLOW_BY_in_orderByClause4072); if (state.failed) return retval; 
-            if ( state.backtracking==0 ) stream_BY.add(BY139);
-
-            pushFollow(FOLLOW_sortSpecification_in_orderByClause4074);
-            sortSpecification140=sortSpecification();
-
-            state._fsp--;
-            if (state.failed) return retval;
-            if ( state.backtracking==0 ) stream_sortSpecification.add(sortSpecification140.getTree());
-            // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:690:36: ( COMMA sortSpecification )*
-            loop39:
-            do {
-                int alt39=2;
-                int LA39_0 = input.LA(1);
-
-                if ( (LA39_0==COMMA) ) {
-                    alt39=1;
-                }
-
-
-                switch (alt39) {
-            	case 1 :
-            	    // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:690:37: COMMA sortSpecification
-            	    {
-            	    COMMA141=(Token)match(input,COMMA,FOLLOW_COMMA_in_orderByClause4077); if (state.failed) return retval; 
-            	    if ( state.backtracking==0 ) stream_COMMA.add(COMMA141);
-
-            	    pushFollow(FOLLOW_sortSpecification_in_orderByClause4079);
-            	    sortSpecification142=sortSpecification();
-
-            	    state._fsp--;
-            	    if (state.failed) return retval;
-            	    if ( state.backtracking==0 ) stream_sortSpecification.add(sortSpecification142.getTree());
-
-            	    }
-            	    break;
-
-            	default :
-            	    break loop39;
-                }
-            } while (true);
-
-
-
-            // AST REWRITE
-            // elements: sortSpecification, ORDER
-            // token labels: 
-            // rule labels: retval
-            // token list labels: 
-            // rule list labels: 
-            // wildcard labels: 
-            if ( state.backtracking==0 ) {
-            retval.tree = root_0;
-            RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"rule retval",retval!=null?retval.tree:null);
-
-            root_0 = (Object)adaptor.nil();
-            // 691:17: -> ^( ORDER ( sortSpecification )+ )
-            {
-                // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:692:25: ^( ORDER ( sortSpecification )+ )
-                {
-                Object root_1 = (Object)adaptor.nil();
-                root_1 = (Object)adaptor.becomeRoot(stream_ORDER.nextNode(), root_1);
-
-                if ( !(stream_sortSpecification.hasNext()) ) {
-                    throw new RewriteEarlyExitException();
-                }
-                while ( stream_sortSpecification.hasNext() ) {
-                    adaptor.addChild(root_1, stream_sortSpecification.nextTree());
-
-                }
-                stream_sortSpecification.reset();
-
-                adaptor.addChild(root_0, root_1);
-                }
-
-            }
-
-            retval.tree = root_0;}
-            }
-
-            retval.stop = input.LT(-1);
-
-            if ( state.backtracking==0 ) {
-
-            retval.tree = (Object)adaptor.rulePostProcessing(root_0);
-            adaptor.setTokenBoundaries(retval.tree, retval.start, retval.stop);
-            }
-            if ( state.backtracking==0 ) {
-
-                  paraphrases.pop(); 
-
-            }
-        }
-
-            catch(RecognitionException e)
-            {
-                throw new CMISQueryException(getErrorString(e), e);
-            }
-        finally {
-        }
-        return retval;
-    }
-    // $ANTLR end "orderByClause"
-
-    public static class sortSpecification_return extends ParserRuleReturnScope {
-        Object tree;
-        public Object getTree() { return tree; }
-    };
-
-    // $ANTLR start "sortSpecification"
-    // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:695:1: sortSpecification : ( columnReference -> ^( SORT_SPECIFICATION columnReference ASC ) | columnReference (by= ASC | by= DESC ) -> ^( SORT_SPECIFICATION columnReference $by) );
-    public final CMISParser.sortSpecification_return sortSpecification() throws RecognitionException {
-        CMISParser.sortSpecification_return retval = new CMISParser.sortSpecification_return();
-        retval.start = input.LT(1);
-
-        Object root_0 = null;
-
-        Token by=null;
-        CMISParser.columnReference_return columnReference143 = null;
-
-        CMISParser.columnReference_return columnReference144 = null;
-
-
-        Object by_tree=null;
-        RewriteRuleTokenStream stream_ASC=new RewriteRuleTokenStream(adaptor,"token ASC");
-        RewriteRuleTokenStream stream_DESC=new RewriteRuleTokenStream(adaptor,"token DESC");
-        RewriteRuleSubtreeStream stream_columnReference=new RewriteRuleSubtreeStream(adaptor,"rule columnReference");
-        try {
-            // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:696:9: ( columnReference -> ^( SORT_SPECIFICATION columnReference ASC ) | columnReference (by= ASC | by= DESC ) -> ^( SORT_SPECIFICATION columnReference $by) )
-            int alt41=2;
-            alt41 = dfa41.predict(input);
-            switch (alt41) {
-                case 1 :
-                    // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:697:9: columnReference
-                    {
-                    pushFollow(FOLLOW_columnReference_in_sortSpecification4163);
-                    columnReference143=columnReference();
-
-                    state._fsp--;
-                    if (state.failed) return retval;
-                    if ( state.backtracking==0 ) stream_columnReference.add(columnReference143.getTree());
-
-
-                    // AST REWRITE
-                    // elements: columnReference
-                    // token labels: 
-                    // rule labels: retval
-                    // token list labels: 
-                    // rule list labels: 
-                    // wildcard labels: 
-                    if ( state.backtracking==0 ) {
-                    retval.tree = root_0;
-                    RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"rule retval",retval!=null?retval.tree:null);
-
-                    root_0 = (Object)adaptor.nil();
-                    // 698:17: -> ^( SORT_SPECIFICATION columnReference ASC )
-                    {
-                        // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:699:25: ^( SORT_SPECIFICATION columnReference ASC )
-                        {
-                        Object root_1 = (Object)adaptor.nil();
-                        root_1 = (Object)adaptor.becomeRoot((Object)adaptor.create(SORT_SPECIFICATION, "SORT_SPECIFICATION"), root_1);
-
-                        adaptor.addChild(root_1, stream_columnReference.nextTree());
-                        adaptor.addChild(root_1, (Object)adaptor.create(ASC, "ASC"));
-
-                        adaptor.addChild(root_0, root_1);
-                        }
-
-                    }
-
-                    retval.tree = root_0;}
-                    }
-                    break;
-                case 2 :
-                    // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:700:11: columnReference (by= ASC | by= DESC )
-                    {
-                    pushFollow(FOLLOW_columnReference_in_sortSpecification4225);
-                    columnReference144=columnReference();
-
-                    state._fsp--;
-                    if (state.failed) return retval;
-                    if ( state.backtracking==0 ) stream_columnReference.add(columnReference144.getTree());
-                    // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:701:9: (by= ASC | by= DESC )
-                    int alt40=2;
-                    int LA40_0 = input.LA(1);
-
-                    if ( (LA40_0==ASC) ) {
-                        alt40=1;
-                    }
-                    else if ( (LA40_0==DESC) ) {
-                        alt40=2;
-                    }
-                    else {
-                        if (state.backtracking>0) {state.failed=true; return retval;}
-                        NoViableAltException nvae =
-                            new NoViableAltException("", 40, 0, input);
-
-                        throw nvae;
-                    }
-                    switch (alt40) {
-                        case 1 :
-                            // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:702:17: by= ASC
-                            {
-                            by=(Token)match(input,ASC,FOLLOW_ASC_in_sortSpecification4255); if (state.failed) return retval; 
-                            if ( state.backtracking==0 ) stream_ASC.add(by);
-
-
-                            }
-                            break;
-                        case 2 :
-                            // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:703:19: by= DESC
-                            {
-                            by=(Token)match(input,DESC,FOLLOW_DESC_in_sortSpecification4277); if (state.failed) return retval; 
-                            if ( state.backtracking==0 ) stream_DESC.add(by);
-
-
-                            }
-                            break;
-
-                    }
-
-
-
-                    // AST REWRITE
-                    // elements: by, columnReference
-                    // token labels: by
-                    // rule labels: retval
-                    // token list labels: 
-                    // rule list labels: 
-                    // wildcard labels: 
-                    if ( state.backtracking==0 ) {
-                    retval.tree = root_0;
-                    RewriteRuleTokenStream stream_by=new RewriteRuleTokenStream(adaptor,"token by",by);
-                    RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"rule retval",retval!=null?retval.tree:null);
-
-                    root_0 = (Object)adaptor.nil();
-                    // 705:17: -> ^( SORT_SPECIFICATION columnReference $by)
-                    {
-                        // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:706:25: ^( SORT_SPECIFICATION columnReference $by)
-                        {
-                        Object root_1 = (Object)adaptor.nil();
-                        root_1 = (Object)adaptor.becomeRoot((Object)adaptor.create(SORT_SPECIFICATION, "SORT_SPECIFICATION"), root_1);
-
-                        adaptor.addChild(root_1, stream_columnReference.nextTree());
-                        adaptor.addChild(root_1, stream_by.nextNode());
-
-                        adaptor.addChild(root_0, root_1);
-                        }
-
-                    }
-
-                    retval.tree = root_0;}
-                    }
-                    break;
-
-            }
-            retval.stop = input.LT(-1);
-
-            if ( state.backtracking==0 ) {
-
-            retval.tree = (Object)adaptor.rulePostProcessing(root_0);
-            adaptor.setTokenBoundaries(retval.tree, retval.start, retval.stop);
-            }
-        }
-
-            catch(RecognitionException e)
-            {
-                throw new CMISQueryException(getErrorString(e), e);
-            }
-        finally {
-        }
-        return retval;
-    }
-    // $ANTLR end "sortSpecification"
-
-    public static class correlationName_return extends ParserRuleReturnScope {
-        Object tree;
-        public Object getTree() { return tree; }
-    };
-
-    // $ANTLR start "correlationName"
-    // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:709:1: correlationName : identifier ;
-    public final CMISParser.correlationName_return correlationName() throws RecognitionException {
-        CMISParser.correlationName_return retval = new CMISParser.correlationName_return();
-        retval.start = input.LT(1);
-
-        Object root_0 = null;
-
-        CMISParser.identifier_return identifier145 = null;
-
-
-
-        try {
-            // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:710:9: ( identifier )
-            // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:711:9: identifier
-            {
-            root_0 = (Object)adaptor.nil();
-
-            pushFollow(FOLLOW_identifier_in_correlationName4371);
-            identifier145=identifier();
-
-            state._fsp--;
-            if (state.failed) return retval;
-            if ( state.backtracking==0 ) adaptor.addChild(root_0, identifier145.getTree());
-
-            }
-
-            retval.stop = input.LT(-1);
-
-            if ( state.backtracking==0 ) {
-
-            retval.tree = (Object)adaptor.rulePostProcessing(root_0);
-            adaptor.setTokenBoundaries(retval.tree, retval.start, retval.stop);
-            }
-        }
-
-            catch(RecognitionException e)
-            {
-                throw new CMISQueryException(getErrorString(e), e);
-            }
-        finally {
-        }
-        return retval;
-    }
-    // $ANTLR end "correlationName"
-
-    public static class tableName_return extends ParserRuleReturnScope {
-        Object tree;
-        public Object getTree() { return tree; }
-    };
-
-    // $ANTLR start "tableName"
-    // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:719:1: tableName : identifier -> identifier ;
-    public final CMISParser.tableName_return tableName() throws RecognitionException {
-        CMISParser.tableName_return retval = new CMISParser.tableName_return();
-        retval.start = input.LT(1);
-
-        Object root_0 = null;
-
-        CMISParser.identifier_return identifier146 = null;
-
-
-        RewriteRuleSubtreeStream stream_identifier=new RewriteRuleSubtreeStream(adaptor,"rule identifier");
-        try {
-            // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:720:9: ( identifier -> identifier )
-            // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:721:9: identifier
-            {
-            pushFollow(FOLLOW_identifier_in_tableName4407);
-            identifier146=identifier();
-
-            state._fsp--;
-            if (state.failed) return retval;
-            if ( state.backtracking==0 ) stream_identifier.add(identifier146.getTree());
-
-
-            // AST REWRITE
-            // elements: identifier
-            // token labels: 
-            // rule labels: retval
-            // token list labels: 
-            // rule list labels: 
-            // wildcard labels: 
-            if ( state.backtracking==0 ) {
-            retval.tree = root_0;
-            RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"rule retval",retval!=null?retval.tree:null);
-
-            root_0 = (Object)adaptor.nil();
-            // 722:17: -> identifier
-            {
-                adaptor.addChild(root_0, stream_identifier.nextTree());
-
-            }
-
-            retval.tree = root_0;}
-            }
-
-            retval.stop = input.LT(-1);
-
-            if ( state.backtracking==0 ) {
-
-            retval.tree = (Object)adaptor.rulePostProcessing(root_0);
-            adaptor.setTokenBoundaries(retval.tree, retval.start, retval.stop);
-            }
-        }
-
-            catch(RecognitionException e)
-            {
-                throw new CMISQueryException(getErrorString(e), e);
-            }
-        finally {
-        }
-        return retval;
-    }
-    // $ANTLR end "tableName"
-
-    public static class columnName_return extends ParserRuleReturnScope {
-        Object tree;
-        public Object getTree() { return tree; }
-    };
-
-    // $ANTLR start "columnName"
-    // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:725:1: columnName : identifier -> identifier ;
-    public final CMISParser.columnName_return columnName() throws RecognitionException {
-        CMISParser.columnName_return retval = new CMISParser.columnName_return();
-        retval.start = input.LT(1);
-
-        Object root_0 = null;
-
-        CMISParser.identifier_return identifier147 = null;
-
-
-        RewriteRuleSubtreeStream stream_identifier=new RewriteRuleSubtreeStream(adaptor,"rule identifier");
-        try {
-            // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:726:9: ( identifier -> identifier )
-            // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:727:9: identifier
-            {
-            pushFollow(FOLLOW_identifier_in_columnName4460);
-            identifier147=identifier();
-
-            state._fsp--;
-            if (state.failed) return retval;
-            if ( state.backtracking==0 ) stream_identifier.add(identifier147.getTree());
-
-
-            // AST REWRITE
-            // elements: identifier
-            // token labels: 
-            // rule labels: retval
-            // token list labels: 
-            // rule list labels: 
-            // wildcard labels: 
-            if ( state.backtracking==0 ) {
-            retval.tree = root_0;
-            RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"rule retval",retval!=null?retval.tree:null);
-
-            root_0 = (Object)adaptor.nil();
-            // 728:17: -> identifier
-            {
-                adaptor.addChild(root_0, stream_identifier.nextTree());
-
-            }
-
-            retval.tree = root_0;}
-            }
-
-            retval.stop = input.LT(-1);
-
-            if ( state.backtracking==0 ) {
-
-            retval.tree = (Object)adaptor.rulePostProcessing(root_0);
-            adaptor.setTokenBoundaries(retval.tree, retval.start, retval.stop);
-            }
-        }
-
-            catch(RecognitionException e)
-            {
-                throw new CMISQueryException(getErrorString(e), e);
-            }
-        finally {
-        }
-        return retval;
-    }
-    // $ANTLR end "columnName"
-
-    public static class parameterName_return extends ParserRuleReturnScope {
-        Object tree;
-        public Object getTree() { return tree; }
-    };
-
-    // $ANTLR start "parameterName"
-    // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:731:1: parameterName : COLON identifier -> ^( PARAMETER identifier ) ;
-    public final CMISParser.parameterName_return parameterName() throws RecognitionException {
-        CMISParser.parameterName_return retval = new CMISParser.parameterName_return();
-        retval.start = input.LT(1);
-
-        Object root_0 = null;
-
-        Token COLON148=null;
-        CMISParser.identifier_return identifier149 = null;
-
-
-        Object COLON148_tree=null;
-        RewriteRuleTokenStream stream_COLON=new RewriteRuleTokenStream(adaptor,"token COLON");
-        RewriteRuleSubtreeStream stream_identifier=new RewriteRuleSubtreeStream(adaptor,"rule identifier");
-        try {
-            // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:732:9: ( COLON identifier -> ^( PARAMETER identifier ) )
-            // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:733:9: COLON identifier
-            {
-            COLON148=(Token)match(input,COLON,FOLLOW_COLON_in_parameterName4513); if (state.failed) return retval; 
-            if ( state.backtracking==0 ) stream_COLON.add(COLON148);
-
-            pushFollow(FOLLOW_identifier_in_parameterName4515);
-            identifier149=identifier();
-
-            state._fsp--;
-            if (state.failed) return retval;
-            if ( state.backtracking==0 ) stream_identifier.add(identifier149.getTree());
-
-
-            // AST REWRITE
-            // elements: identifier
-            // token labels: 
-            // rule labels: retval
-            // token list labels: 
-            // rule list labels: 
-            // wildcard labels: 
-            if ( state.backtracking==0 ) {
-            retval.tree = root_0;
-            RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"rule retval",retval!=null?retval.tree:null);
-
-            root_0 = (Object)adaptor.nil();
-            // 734:17: -> ^( PARAMETER identifier )
-            {
-                // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:735:25: ^( PARAMETER identifier )
-                {
-                Object root_1 = (Object)adaptor.nil();
-                root_1 = (Object)adaptor.becomeRoot((Object)adaptor.create(PARAMETER, "PARAMETER"), root_1);
-
-                adaptor.addChild(root_1, stream_identifier.nextTree());
-
-                adaptor.addChild(root_0, root_1);
-                }
-
-            }
-
-            retval.tree = root_0;}
-            }
-
-            retval.stop = input.LT(-1);
-
-            if ( state.backtracking==0 ) {
-
-            retval.tree = (Object)adaptor.rulePostProcessing(root_0);
-            adaptor.setTokenBoundaries(retval.tree, retval.start, retval.stop);
-            }
-        }
-
-            catch(RecognitionException e)
-            {
-                throw new CMISQueryException(getErrorString(e), e);
-            }
-        finally {
-        }
-        return retval;
-    }
-    // $ANTLR end "parameterName"
-
-    public static class folderId_return extends ParserRuleReturnScope {
-        Object tree;
-        public Object getTree() { return tree; }
-    };
-
-    // $ANTLR start "folderId"
-    // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:738:1: folderId : characterStringLiteral -> characterStringLiteral ;
-    public final CMISParser.folderId_return folderId() throws RecognitionException {
-        CMISParser.folderId_return retval = new CMISParser.folderId_return();
-        retval.start = input.LT(1);
-
-        Object root_0 = null;
-
-        CMISParser.characterStringLiteral_return characterStringLiteral150 = null;
-
-
-        RewriteRuleSubtreeStream stream_characterStringLiteral=new RewriteRuleSubtreeStream(adaptor,"rule characterStringLiteral");
-        try {
-            // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:739:9: ( characterStringLiteral -> characterStringLiteral )
-            // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:740:9: characterStringLiteral
-            {
-            pushFollow(FOLLOW_characterStringLiteral_in_folderId4596);
-            characterStringLiteral150=characterStringLiteral();
-
-            state._fsp--;
-            if (state.failed) return retval;
-            if ( state.backtracking==0 ) stream_characterStringLiteral.add(characterStringLiteral150.getTree());
-
-
-            // AST REWRITE
-            // elements: characterStringLiteral
-            // token labels: 
-            // rule labels: retval
-            // token list labels: 
-            // rule list labels: 
-            // wildcard labels: 
-            if ( state.backtracking==0 ) {
-            retval.tree = root_0;
-            RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"rule retval",retval!=null?retval.tree:null);
-
-            root_0 = (Object)adaptor.nil();
-            // 741:17: -> characterStringLiteral
-            {
-                adaptor.addChild(root_0, stream_characterStringLiteral.nextTree());
-
-            }
-
-            retval.tree = root_0;}
-            }
-
-            retval.stop = input.LT(-1);
-
-            if ( state.backtracking==0 ) {
-
-            retval.tree = (Object)adaptor.rulePostProcessing(root_0);
-            adaptor.setTokenBoundaries(retval.tree, retval.start, retval.stop);
-            }
-        }
-
-            catch(RecognitionException e)
-            {
-                throw new CMISQueryException(getErrorString(e), e);
-            }
-        finally {
-        }
-        return retval;
-    }
-    // $ANTLR end "folderId"
-
-    public static class textSearchExpression_return extends ParserRuleReturnScope {
-        Object tree;
-        public Object getTree() { return tree; }
-    };
-
-    // $ANTLR start "textSearchExpression"
-    // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:744:1: textSearchExpression : QUOTED_STRING ;
-    public final CMISParser.textSearchExpression_return textSearchExpression() throws RecognitionException {
-        CMISParser.textSearchExpression_return retval = new CMISParser.textSearchExpression_return();
-        retval.start = input.LT(1);
-
-        Object root_0 = null;
-
-        Token QUOTED_STRING151=null;
-
-        Object QUOTED_STRING151_tree=null;
-
-        try {
-            // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:745:9: ( QUOTED_STRING )
-            // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:746:9: QUOTED_STRING
-            {
-            root_0 = (Object)adaptor.nil();
-
-            QUOTED_STRING151=(Token)match(input,QUOTED_STRING,FOLLOW_QUOTED_STRING_in_textSearchExpression4649); if (state.failed) return retval;
-            if ( state.backtracking==0 ) {
-            QUOTED_STRING151_tree = (Object)adaptor.create(QUOTED_STRING151);
-            adaptor.addChild(root_0, QUOTED_STRING151_tree);
-            }
-
-            }
-
-            retval.stop = input.LT(-1);
-
-            if ( state.backtracking==0 ) {
-
-            retval.tree = (Object)adaptor.rulePostProcessing(root_0);
-            adaptor.setTokenBoundaries(retval.tree, retval.start, retval.stop);
-            }
-        }
-
-            catch(RecognitionException e)
-            {
-                throw new CMISQueryException(getErrorString(e), e);
-            }
-        finally {
-        }
-        return retval;
-    }
-    // $ANTLR end "textSearchExpression"
-
-    public static class identifier_return extends ParserRuleReturnScope {
-        Object tree;
-        public Object getTree() { return tree; }
-    };
-
-    // $ANTLR start "identifier"
-    // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:749:1: identifier : ( ID -> ID | {...}? => DOUBLE_QUOTE keyWordOrId DOUBLE_QUOTE -> ^( keyWordOrId ) );
-    public final CMISParser.identifier_return identifier() throws RecognitionException {
-        CMISParser.identifier_return retval = new CMISParser.identifier_return();
-        retval.start = input.LT(1);
-
-        Object root_0 = null;
-
-        Token ID152=null;
-        Token DOUBLE_QUOTE153=null;
-        Token DOUBLE_QUOTE155=null;
-        CMISParser.keyWordOrId_return keyWordOrId154 = null;
-
-
-        Object ID152_tree=null;
-        Object DOUBLE_QUOTE153_tree=null;
-        Object DOUBLE_QUOTE155_tree=null;
-        RewriteRuleTokenStream stream_ID=new RewriteRuleTokenStream(adaptor,"token ID");
-        RewriteRuleTokenStream stream_DOUBLE_QUOTE=new RewriteRuleTokenStream(adaptor,"token DOUBLE_QUOTE");
-        RewriteRuleSubtreeStream stream_keyWordOrId=new RewriteRuleSubtreeStream(adaptor,"rule keyWordOrId");
-        try {
-            // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:750:9: ( ID -> ID | {...}? => DOUBLE_QUOTE keyWordOrId DOUBLE_QUOTE -> ^( keyWordOrId ) )
-            int alt42=2;
-            int LA42_0 = input.LA(1);
-
-            if ( (LA42_0==ID) ) {
-                alt42=1;
-            }
-            else if ( (LA42_0==DOUBLE_QUOTE) && ((strict == false))) {
-                alt42=2;
-            }
-            else {
-                if (state.backtracking>0) {state.failed=true; return retval;}
-                NoViableAltException nvae =
-                    new NoViableAltException("", 42, 0, input);
-
-                throw nvae;
-            }
-            switch (alt42) {
-                case 1 :
-                    // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:751:9: ID
-                    {
-                    ID152=(Token)match(input,ID,FOLLOW_ID_in_identifier4682); if (state.failed) return retval; 
-                    if ( state.backtracking==0 ) stream_ID.add(ID152);
-
-
-
-                    // AST REWRITE
-                    // elements: ID
-                    // token labels: 
-                    // rule labels: retval
-                    // token list labels: 
-                    // rule list labels: 
-                    // wildcard labels: 
-                    if ( state.backtracking==0 ) {
-                    retval.tree = root_0;
-                    RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"rule retval",retval!=null?retval.tree:null);
-
-                    root_0 = (Object)adaptor.nil();
-                    // 752:17: -> ID
-                    {
-                        adaptor.addChild(root_0, stream_ID.nextNode());
-
-                    }
-
-                    retval.tree = root_0;}
-                    }
-                    break;
-                case 2 :
-                    // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:753:11: {...}? => DOUBLE_QUOTE keyWordOrId DOUBLE_QUOTE
-                    {
-                    if ( !((strict == false)) ) {
-                        if (state.backtracking>0) {state.failed=true; return retval;}
-                        throw new FailedPredicateException(input, "identifier", "strict == false");
-                    }
-                    DOUBLE_QUOTE153=(Token)match(input,DOUBLE_QUOTE,FOLLOW_DOUBLE_QUOTE_in_identifier4717); if (state.failed) return retval; 
-                    if ( state.backtracking==0 ) stream_DOUBLE_QUOTE.add(DOUBLE_QUOTE153);
-
-                    pushFollow(FOLLOW_keyWordOrId_in_identifier4719);
-                    keyWordOrId154=keyWordOrId();
-
-                    state._fsp--;
-                    if (state.failed) return retval;
-                    if ( state.backtracking==0 ) stream_keyWordOrId.add(keyWordOrId154.getTree());
-                    DOUBLE_QUOTE155=(Token)match(input,DOUBLE_QUOTE,FOLLOW_DOUBLE_QUOTE_in_identifier4721); if (state.failed) return retval; 
-                    if ( state.backtracking==0 ) stream_DOUBLE_QUOTE.add(DOUBLE_QUOTE155);
-
-
-
-                    // AST REWRITE
-                    // elements: keyWordOrId
-                    // token labels: 
-                    // rule labels: retval
-                    // token list labels: 
-                    // rule list labels: 
-                    // wildcard labels: 
-                    if ( state.backtracking==0 ) {
-                    retval.tree = root_0;
-                    RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"rule retval",retval!=null?retval.tree:null);
-
-                    root_0 = (Object)adaptor.nil();
-                    // 754:17: -> ^( keyWordOrId )
-                    {
-                        // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:755:25: ^( keyWordOrId )
-                        {
-                        Object root_1 = (Object)adaptor.nil();
-                        root_1 = (Object)adaptor.becomeRoot(stream_keyWordOrId.nextNode(), root_1);
-
-                        adaptor.addChild(root_0, root_1);
-                        }
-
-                    }
-
-                    retval.tree = root_0;}
-                    }
-                    break;
-
-            }
-            retval.stop = input.LT(-1);
-
-            if ( state.backtracking==0 ) {
-
-            retval.tree = (Object)adaptor.rulePostProcessing(root_0);
-            adaptor.setTokenBoundaries(retval.tree, retval.start, retval.stop);
-            }
-        }
-
-            catch(RecognitionException e)
-            {
-                throw new CMISQueryException(getErrorString(e), e);
-            }
-        finally {
-        }
-        return retval;
-    }
-    // $ANTLR end "identifier"
-
-    public static class signedNumericLiteral_return extends ParserRuleReturnScope {
-        Object tree;
-        public Object getTree() { return tree; }
-    };
-
-    // $ANTLR start "signedNumericLiteral"
-    // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:758:1: signedNumericLiteral : ( FLOATING_POINT_LITERAL -> ^( NUMERIC_LITERAL FLOATING_POINT_LITERAL ) | integerLiteral -> integerLiteral );
-    public final CMISParser.signedNumericLiteral_return signedNumericLiteral() throws RecognitionException {
-        CMISParser.signedNumericLiteral_return retval = new CMISParser.signedNumericLiteral_return();
-        retval.start = input.LT(1);
-
-        Object root_0 = null;
-
-        Token FLOATING_POINT_LITERAL156=null;
-        CMISParser.integerLiteral_return integerLiteral157 = null;
-
-
-        Object FLOATING_POINT_LITERAL156_tree=null;
-        RewriteRuleTokenStream stream_FLOATING_POINT_LITERAL=new RewriteRuleTokenStream(adaptor,"token FLOATING_POINT_LITERAL");
-        RewriteRuleSubtreeStream stream_integerLiteral=new RewriteRuleSubtreeStream(adaptor,"rule integerLiteral");
-        try {
-            // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:759:9: ( FLOATING_POINT_LITERAL -> ^( NUMERIC_LITERAL FLOATING_POINT_LITERAL ) | integerLiteral -> integerLiteral )
-            int alt43=2;
-            int LA43_0 = input.LA(1);
-
-            if ( (LA43_0==FLOATING_POINT_LITERAL) ) {
-                alt43=1;
-            }
-            else if ( (LA43_0==DECIMAL_INTEGER_LITERAL) ) {
-                alt43=2;
-            }
-            else {
-                if (state.backtracking>0) {state.failed=true; return retval;}
-                NoViableAltException nvae =
-                    new NoViableAltException("", 43, 0, input);
-
-                throw nvae;
-            }
-            switch (alt43) {
-                case 1 :
-                    // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:760:9: FLOATING_POINT_LITERAL
-                    {
-                    FLOATING_POINT_LITERAL156=(Token)match(input,FLOATING_POINT_LITERAL,FOLLOW_FLOATING_POINT_LITERAL_in_signedNumericLiteral4800); if (state.failed) return retval; 
-                    if ( state.backtracking==0 ) stream_FLOATING_POINT_LITERAL.add(FLOATING_POINT_LITERAL156);
-
-
-
-                    // AST REWRITE
-                    // elements: FLOATING_POINT_LITERAL
-                    // token labels: 
-                    // rule labels: retval
-                    // token list labels: 
-                    // rule list labels: 
-                    // wildcard labels: 
-                    if ( state.backtracking==0 ) {
-                    retval.tree = root_0;
-                    RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"rule retval",retval!=null?retval.tree:null);
-
-                    root_0 = (Object)adaptor.nil();
-                    // 761:17: -> ^( NUMERIC_LITERAL FLOATING_POINT_LITERAL )
-                    {
-                        // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:762:25: ^( NUMERIC_LITERAL FLOATING_POINT_LITERAL )
-                        {
-                        Object root_1 = (Object)adaptor.nil();
-                        root_1 = (Object)adaptor.becomeRoot((Object)adaptor.create(NUMERIC_LITERAL, "NUMERIC_LITERAL"), root_1);
-
-                        adaptor.addChild(root_1, stream_FLOATING_POINT_LITERAL.nextNode());
-
-                        adaptor.addChild(root_0, root_1);
-                        }
-
-                    }
-
-                    retval.tree = root_0;}
-                    }
-                    break;
-                case 2 :
-                    // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:763:11: integerLiteral
-                    {
-                    pushFollow(FOLLOW_integerLiteral_in_signedNumericLiteral4860);
-                    integerLiteral157=integerLiteral();
-
-                    state._fsp--;
-                    if (state.failed) return retval;
-                    if ( state.backtracking==0 ) stream_integerLiteral.add(integerLiteral157.getTree());
-
-
-                    // AST REWRITE
-                    // elements: integerLiteral
-                    // token labels: 
-                    // rule labels: retval
-                    // token list labels: 
-                    // rule list labels: 
-                    // wildcard labels: 
-                    if ( state.backtracking==0 ) {
-                    retval.tree = root_0;
-                    RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"rule retval",retval!=null?retval.tree:null);
-
-                    root_0 = (Object)adaptor.nil();
-                    // 764:17: -> integerLiteral
-                    {
-                        adaptor.addChild(root_0, stream_integerLiteral.nextTree());
-
-                    }
-
-                    retval.tree = root_0;}
-                    }
-                    break;
-
-            }
-            retval.stop = input.LT(-1);
-
-            if ( state.backtracking==0 ) {
-
-            retval.tree = (Object)adaptor.rulePostProcessing(root_0);
-            adaptor.setTokenBoundaries(retval.tree, retval.start, retval.stop);
-            }
-        }
-
-            catch(RecognitionException e)
-            {
-                throw new CMISQueryException(getErrorString(e), e);
-            }
-        finally {
-        }
-        return retval;
-    }
-    // $ANTLR end "signedNumericLiteral"
-
-    public static class integerLiteral_return extends ParserRuleReturnScope {
-        Object tree;
-        public Object getTree() { return tree; }
-    };
-
-    // $ANTLR start "integerLiteral"
-    // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:767:1: integerLiteral : DECIMAL_INTEGER_LITERAL -> ^( NUMERIC_LITERAL DECIMAL_INTEGER_LITERAL ) ;
-    public final CMISParser.integerLiteral_return integerLiteral() throws RecognitionException {
-        CMISParser.integerLiteral_return retval = new CMISParser.integerLiteral_return();
-        retval.start = input.LT(1);
-
-        Object root_0 = null;
-
-        Token DECIMAL_INTEGER_LITERAL158=null;
-
-        Object DECIMAL_INTEGER_LITERAL158_tree=null;
-        RewriteRuleTokenStream stream_DECIMAL_INTEGER_LITERAL=new RewriteRuleTokenStream(adaptor,"token DECIMAL_INTEGER_LITERAL");
-
-        try {
-            // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:768:9: ( DECIMAL_INTEGER_LITERAL -> ^( NUMERIC_LITERAL DECIMAL_INTEGER_LITERAL ) )
-            // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:769:9: DECIMAL_INTEGER_LITERAL
-            {
-            DECIMAL_INTEGER_LITERAL158=(Token)match(input,DECIMAL_INTEGER_LITERAL,FOLLOW_DECIMAL_INTEGER_LITERAL_in_integerLiteral4913); if (state.failed) return retval; 
-            if ( state.backtracking==0 ) stream_DECIMAL_INTEGER_LITERAL.add(DECIMAL_INTEGER_LITERAL158);
-
-
-
-            // AST REWRITE
-            // elements: DECIMAL_INTEGER_LITERAL
-            // token labels: 
-            // rule labels: retval
-            // token list labels: 
-            // rule list labels: 
-            // wildcard labels: 
-            if ( state.backtracking==0 ) {
-            retval.tree = root_0;
-            RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"rule retval",retval!=null?retval.tree:null);
-
-            root_0 = (Object)adaptor.nil();
-            // 770:17: -> ^( NUMERIC_LITERAL DECIMAL_INTEGER_LITERAL )
-            {
-                // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:771:25: ^( NUMERIC_LITERAL DECIMAL_INTEGER_LITERAL )
-                {
-                Object root_1 = (Object)adaptor.nil();
-                root_1 = (Object)adaptor.becomeRoot((Object)adaptor.create(NUMERIC_LITERAL, "NUMERIC_LITERAL"), root_1);
-
-                adaptor.addChild(root_1, stream_DECIMAL_INTEGER_LITERAL.nextNode());
-
-                adaptor.addChild(root_0, root_1);
-                }
-
-            }
-
-            retval.tree = root_0;}
-            }
-
-            retval.stop = input.LT(-1);
-
-            if ( state.backtracking==0 ) {
-
-            retval.tree = (Object)adaptor.rulePostProcessing(root_0);
-            adaptor.setTokenBoundaries(retval.tree, retval.start, retval.stop);
-            }
-        }
-
-            catch(RecognitionException e)
-            {
-                throw new CMISQueryException(getErrorString(e), e);
-            }
-        finally {
-        }
-        return retval;
-    }
-    // $ANTLR end "integerLiteral"
-
-    public static class booleanLiteral_return extends ParserRuleReturnScope {
-        Object tree;
-        public Object getTree() { return tree; }
-    };
-
-    // $ANTLR start "booleanLiteral"
-    // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:774:1: booleanLiteral : ( TRUE -> ^( BOOLEAN_LITERAL TRUE ) | FALSE -> ^( BOOLEAN_LITERAL FALSE ) );
-    public final CMISParser.booleanLiteral_return booleanLiteral() throws RecognitionException {
-        CMISParser.booleanLiteral_return retval = new CMISParser.booleanLiteral_return();
-        retval.start = input.LT(1);
-
-        Object root_0 = null;
-
-        Token TRUE159=null;
-        Token FALSE160=null;
-
-        Object TRUE159_tree=null;
-        Object FALSE160_tree=null;
-        RewriteRuleTokenStream stream_FALSE=new RewriteRuleTokenStream(adaptor,"token FALSE");
-        RewriteRuleTokenStream stream_TRUE=new RewriteRuleTokenStream(adaptor,"token TRUE");
-
-        try {
-            // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:775:9: ( TRUE -> ^( BOOLEAN_LITERAL TRUE ) | FALSE -> ^( BOOLEAN_LITERAL FALSE ) )
-            int alt44=2;
-            int LA44_0 = input.LA(1);
-
-            if ( (LA44_0==TRUE) ) {
-                alt44=1;
-            }
-            else if ( (LA44_0==FALSE) ) {
-                alt44=2;
-            }
-            else {
-                if (state.backtracking>0) {state.failed=true; return retval;}
-                NoViableAltException nvae =
-                    new NoViableAltException("", 44, 0, input);
-
-                throw nvae;
-            }
-            switch (alt44) {
-                case 1 :
-                    // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:776:9: TRUE
-                    {
-                    TRUE159=(Token)match(input,TRUE,FOLLOW_TRUE_in_booleanLiteral4994); if (state.failed) return retval; 
-                    if ( state.backtracking==0 ) stream_TRUE.add(TRUE159);
-
-
-
-                    // AST REWRITE
-                    // elements: TRUE
-                    // token labels: 
-                    // rule labels: retval
-                    // token list labels: 
-                    // rule list labels: 
-                    // wildcard labels: 
-                    if ( state.backtracking==0 ) {
-                    retval.tree = root_0;
-                    RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"rule retval",retval!=null?retval.tree:null);
-
-                    root_0 = (Object)adaptor.nil();
-                    // 777:17: -> ^( BOOLEAN_LITERAL TRUE )
-                    {
-                        // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:778:25: ^( BOOLEAN_LITERAL TRUE )
-                        {
-                        Object root_1 = (Object)adaptor.nil();
-                        root_1 = (Object)adaptor.becomeRoot((Object)adaptor.create(BOOLEAN_LITERAL, "BOOLEAN_LITERAL"), root_1);
-
-                        adaptor.addChild(root_1, stream_TRUE.nextNode());
-
-                        adaptor.addChild(root_0, root_1);
-                        }
-
-                    }
-
-                    retval.tree = root_0;}
-                    }
-                    break;
-                case 2 :
-                    // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:779:11: FALSE
-                    {
-                    FALSE160=(Token)match(input,FALSE,FOLLOW_FALSE_in_booleanLiteral5054); if (state.failed) return retval; 
-                    if ( state.backtracking==0 ) stream_FALSE.add(FALSE160);
-
-
-
-                    // AST REWRITE
-                    // elements: FALSE
-                    // token labels: 
-                    // rule labels: retval
-                    // token list labels: 
-                    // rule list labels: 
-                    // wildcard labels: 
-                    if ( state.backtracking==0 ) {
-                    retval.tree = root_0;
-                    RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"rule retval",retval!=null?retval.tree:null);
-
-                    root_0 = (Object)adaptor.nil();
-                    // 780:17: -> ^( BOOLEAN_LITERAL FALSE )
-                    {
-                        // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:781:25: ^( BOOLEAN_LITERAL FALSE )
-                        {
-                        Object root_1 = (Object)adaptor.nil();
-                        root_1 = (Object)adaptor.becomeRoot((Object)adaptor.create(BOOLEAN_LITERAL, "BOOLEAN_LITERAL"), root_1);
-
-                        adaptor.addChild(root_1, stream_FALSE.nextNode());
-
-                        adaptor.addChild(root_0, root_1);
-                        }
-
-                    }
-
-                    retval.tree = root_0;}
-                    }
-                    break;
-
-            }
-            retval.stop = input.LT(-1);
-
-            if ( state.backtracking==0 ) {
-
-            retval.tree = (Object)adaptor.rulePostProcessing(root_0);
-            adaptor.setTokenBoundaries(retval.tree, retval.start, retval.stop);
-            }
-        }
-
-            catch(RecognitionException e)
-            {
-                throw new CMISQueryException(getErrorString(e), e);
-            }
-        finally {
-        }
-        return retval;
-    }
-    // $ANTLR end "booleanLiteral"
-
-    public static class datetimeLiteral_return extends ParserRuleReturnScope {
-        Object tree;
-        public Object getTree() { return tree; }
-    };
-
-    // $ANTLR start "datetimeLiteral"
-    // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:784:1: datetimeLiteral : TIMESTAMP QUOTED_STRING -> ^( DATETIME_LITERAL QUOTED_STRING ) ;
-    public final CMISParser.datetimeLiteral_return datetimeLiteral() throws RecognitionException {
-        CMISParser.datetimeLiteral_return retval = new CMISParser.datetimeLiteral_return();
-        retval.start = input.LT(1);
-
-        Object root_0 = null;
-
-        Token TIMESTAMP161=null;
-        Token QUOTED_STRING162=null;
-
-        Object TIMESTAMP161_tree=null;
-        Object QUOTED_STRING162_tree=null;
-        RewriteRuleTokenStream stream_QUOTED_STRING=new RewriteRuleTokenStream(adaptor,"token QUOTED_STRING");
-        RewriteRuleTokenStream stream_TIMESTAMP=new RewriteRuleTokenStream(adaptor,"token TIMESTAMP");
-
-        try {
-            // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:785:9: ( TIMESTAMP QUOTED_STRING -> ^( DATETIME_LITERAL QUOTED_STRING ) )
-            // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:786:9: TIMESTAMP QUOTED_STRING
-            {
-            TIMESTAMP161=(Token)match(input,TIMESTAMP,FOLLOW_TIMESTAMP_in_datetimeLiteral5135); if (state.failed) return retval; 
-            if ( state.backtracking==0 ) stream_TIMESTAMP.add(TIMESTAMP161);
-
-            QUOTED_STRING162=(Token)match(input,QUOTED_STRING,FOLLOW_QUOTED_STRING_in_datetimeLiteral5137); if (state.failed) return retval; 
-            if ( state.backtracking==0 ) stream_QUOTED_STRING.add(QUOTED_STRING162);
-
-
-
-            // AST REWRITE
-            // elements: QUOTED_STRING
-            // token labels: 
-            // rule labels: retval
-            // token list labels: 
-            // rule list labels: 
-            // wildcard labels: 
-            if ( state.backtracking==0 ) {
-            retval.tree = root_0;
-            RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"rule retval",retval!=null?retval.tree:null);
-
-            root_0 = (Object)adaptor.nil();
-            // 787:17: -> ^( DATETIME_LITERAL QUOTED_STRING )
-            {
-                // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:788:25: ^( DATETIME_LITERAL QUOTED_STRING )
-                {
-                Object root_1 = (Object)adaptor.nil();
-                root_1 = (Object)adaptor.becomeRoot((Object)adaptor.create(DATETIME_LITERAL, "DATETIME_LITERAL"), root_1);
-
-                adaptor.addChild(root_1, stream_QUOTED_STRING.nextNode());
-
-                adaptor.addChild(root_0, root_1);
-                }
-
-            }
-
-            retval.tree = root_0;}
-            }
-
-            retval.stop = input.LT(-1);
-
-            if ( state.backtracking==0 ) {
-
-            retval.tree = (Object)adaptor.rulePostProcessing(root_0);
-            adaptor.setTokenBoundaries(retval.tree, retval.start, retval.stop);
-            }
-        }
-
-            catch(RecognitionException e)
-            {
-                throw new CMISQueryException(getErrorString(e), e);
-            }
-        finally {
-        }
-        return retval;
-    }
-    // $ANTLR end "datetimeLiteral"
-
-    public static class characterStringLiteral_return extends ParserRuleReturnScope {
-        Object tree;
-        public Object getTree() { return tree; }
-    };
-
-    // $ANTLR start "characterStringLiteral"
-    // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:791:1: characterStringLiteral : QUOTED_STRING -> ^( STRING_LITERAL QUOTED_STRING ) ;
-    public final CMISParser.characterStringLiteral_return characterStringLiteral() throws RecognitionException {
-        CMISParser.characterStringLiteral_return retval = new CMISParser.characterStringLiteral_return();
-        retval.start = input.LT(1);
-
-        Object root_0 = null;
-
-        Token QUOTED_STRING163=null;
-
-        Object QUOTED_STRING163_tree=null;
-        RewriteRuleTokenStream stream_QUOTED_STRING=new RewriteRuleTokenStream(adaptor,"token QUOTED_STRING");
-
-        try {
-            // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:792:9: ( QUOTED_STRING -> ^( STRING_LITERAL QUOTED_STRING ) )
-            // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:793:9: QUOTED_STRING
-            {
-            QUOTED_STRING163=(Token)match(input,QUOTED_STRING,FOLLOW_QUOTED_STRING_in_characterStringLiteral5218); if (state.failed) return retval; 
-            if ( state.backtracking==0 ) stream_QUOTED_STRING.add(QUOTED_STRING163);
-
-
-
-            // AST REWRITE
-            // elements: QUOTED_STRING
-            // token labels: 
-            // rule labels: retval
-            // token list labels: 
-            // rule list labels: 
-            // wildcard labels: 
-            if ( state.backtracking==0 ) {
-            retval.tree = root_0;
-            RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"rule retval",retval!=null?retval.tree:null);
-
-            root_0 = (Object)adaptor.nil();
-            // 794:17: -> ^( STRING_LITERAL QUOTED_STRING )
-            {
-                // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:795:25: ^( STRING_LITERAL QUOTED_STRING )
-                {
-                Object root_1 = (Object)adaptor.nil();
-                root_1 = (Object)adaptor.becomeRoot((Object)adaptor.create(STRING_LITERAL, "STRING_LITERAL"), root_1);
-
-                adaptor.addChild(root_1, stream_QUOTED_STRING.nextNode());
-
-                adaptor.addChild(root_0, root_1);
-                }
-
-            }
-
-            retval.tree = root_0;}
-            }
-
-            retval.stop = input.LT(-1);
-
-            if ( state.backtracking==0 ) {
-
-            retval.tree = (Object)adaptor.rulePostProcessing(root_0);
-            adaptor.setTokenBoundaries(retval.tree, retval.start, retval.stop);
-            }
-        }
-
-            catch(RecognitionException e)
-            {
-                throw new CMISQueryException(getErrorString(e), e);
-            }
-        finally {
-        }
-        return retval;
-    }
-    // $ANTLR end "characterStringLiteral"
-
-    public static class keyWord_return extends ParserRuleReturnScope {
-        Object tree;
-        public Object getTree() { return tree; }
-    };
-
-    // $ANTLR start "keyWord"
-    // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:798:1: keyWord : ( SELECT | AS | FROM | JOIN | INNER | LEFT | OUTER | ON | WHERE | OR | AND | NOT | IN | LIKE | IS | NULL | ANY | CONTAINS | IN_FOLDER | IN_TREE | ORDER | BY | ASC | DESC | TIMESTAMP | TRUE | FALSE | cmisFunction );
-    public final CMISParser.keyWord_return keyWord() throws RecognitionException {
-        CMISParser.keyWord_return retval = new CMISParser.keyWord_return();
-        retval.start = input.LT(1);
-
-        Object root_0 = null;
-
-        Token SELECT164=null;
-        Token AS165=null;
-        Token FROM166=null;
-        Token JOIN167=null;
-        Token INNER168=null;
-        Token LEFT169=null;
-        Token OUTER170=null;
-        Token ON171=null;
-        Token WHERE172=null;
-        Token OR173=null;
-        Token AND174=null;
-        Token NOT175=null;
-        Token IN176=null;
-        Token LIKE177=null;
-        Token IS178=null;
-        Token NULL179=null;
-        Token ANY180=null;
-        Token CONTAINS181=null;
-        Token IN_FOLDER182=null;
-        Token IN_TREE183=null;
-        Token ORDER184=null;
-        Token BY185=null;
-        Token ASC186=null;
-        Token DESC187=null;
-        Token TIMESTAMP188=null;
-        Token TRUE189=null;
-        Token FALSE190=null;
-        CMISParser.cmisFunction_return cmisFunction191 = null;
-
-
-        Object SELECT164_tree=null;
-        Object AS165_tree=null;
-        Object FROM166_tree=null;
-        Object JOIN167_tree=null;
-        Object INNER168_tree=null;
-        Object LEFT169_tree=null;
-        Object OUTER170_tree=null;
-        Object ON171_tree=null;
-        Object WHERE172_tree=null;
-        Object OR173_tree=null;
-        Object AND174_tree=null;
-        Object NOT175_tree=null;
-        Object IN176_tree=null;
-        Object LIKE177_tree=null;
-        Object IS178_tree=null;
-        Object NULL179_tree=null;
-        Object ANY180_tree=null;
-        Object CONTAINS181_tree=null;
-        Object IN_FOLDER182_tree=null;
-        Object IN_TREE183_tree=null;
-        Object ORDER184_tree=null;
-        Object BY185_tree=null;
-        Object ASC186_tree=null;
-        Object DESC187_tree=null;
-        Object TIMESTAMP188_tree=null;
-        Object TRUE189_tree=null;
-        Object FALSE190_tree=null;
-
-        try {
-            // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:799:9: ( SELECT | AS | FROM | JOIN | INNER | LEFT | OUTER | ON | WHERE | OR | AND | NOT | IN | LIKE | IS | NULL | ANY | CONTAINS | IN_FOLDER | IN_TREE | ORDER | BY | ASC | DESC | TIMESTAMP | TRUE | FALSE | cmisFunction )
-            int alt45=28;
-            switch ( input.LA(1) ) {
-            case SELECT:
-                {
-                alt45=1;
-                }
-                break;
-            case AS:
-                {
-                alt45=2;
-                }
-                break;
-            case FROM:
-                {
-                alt45=3;
-                }
-                break;
-            case JOIN:
-                {
-                alt45=4;
-                }
-                break;
-            case INNER:
-                {
-                alt45=5;
-                }
-                break;
-            case LEFT:
-                {
-                alt45=6;
-                }
-                break;
-            case OUTER:
-                {
-                alt45=7;
-                }
-                break;
-            case ON:
-                {
-                alt45=8;
-                }
-                break;
-            case WHERE:
-                {
-                alt45=9;
-                }
-                break;
-            case OR:
-                {
-                alt45=10;
-                }
-                break;
-            case AND:
-                {
-                alt45=11;
-                }
-                break;
-            case NOT:
-                {
-                alt45=12;
-                }
-                break;
-            case IN:
-                {
-                alt45=13;
-                }
-                break;
-            case LIKE:
-                {
-                alt45=14;
-                }
-                break;
-            case IS:
-                {
-                alt45=15;
-                }
-                break;
-            case NULL:
-                {
-                alt45=16;
-                }
-                break;
-            case ANY:
-                {
-                alt45=17;
-                }
-                break;
-            case CONTAINS:
-                {
-                alt45=18;
-                }
-                break;
-            case IN_FOLDER:
-                {
-                alt45=19;
-                }
-                break;
-            case IN_TREE:
-                {
-                alt45=20;
-                }
-                break;
-            case ORDER:
-                {
-                alt45=21;
-                }
-                break;
-            case BY:
-                {
-                alt45=22;
-                }
-                break;
-            case ASC:
-                {
-                alt45=23;
-                }
-                break;
-            case DESC:
-                {
-                alt45=24;
-                }
-                break;
-            case TIMESTAMP:
-                {
-                alt45=25;
-                }
-                break;
-            case TRUE:
-                {
-                alt45=26;
-                }
-                break;
-            case FALSE:
-                {
-                alt45=27;
-                }
-                break;
-            case SCORE:
-                {
-                alt45=28;
-                }
-                break;
-            default:
-                if (state.backtracking>0) {state.failed=true; return retval;}
-                NoViableAltException nvae =
-                    new NoViableAltException("", 45, 0, input);
-
-                throw nvae;
-            }
-
-            switch (alt45) {
-                case 1 :
-                    // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:800:9: SELECT
-                    {
-                    root_0 = (Object)adaptor.nil();
-
-                    SELECT164=(Token)match(input,SELECT,FOLLOW_SELECT_in_keyWord5299); if (state.failed) return retval;
-                    if ( state.backtracking==0 ) {
-                    SELECT164_tree = (Object)adaptor.create(SELECT164);
-                    adaptor.addChild(root_0, SELECT164_tree);
-                    }
-
-                    }
-                    break;
-                case 2 :
-                    // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:801:11: AS
-                    {
-                    root_0 = (Object)adaptor.nil();
-
-                    AS165=(Token)match(input,AS,FOLLOW_AS_in_keyWord5311); if (state.failed) return retval;
-                    if ( state.backtracking==0 ) {
-                    AS165_tree = (Object)adaptor.create(AS165);
-                    adaptor.addChild(root_0, AS165_tree);
-                    }
-
-                    }
-                    break;
-                case 3 :
-                    // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:802:11: FROM
-                    {
-                    root_0 = (Object)adaptor.nil();
-
-                    FROM166=(Token)match(input,FROM,FOLLOW_FROM_in_keyWord5323); if (state.failed) return retval;
-                    if ( state.backtracking==0 ) {
-                    FROM166_tree = (Object)adaptor.create(FROM166);
-                    adaptor.addChild(root_0, FROM166_tree);
-                    }
-
-                    }
-                    break;
-                case 4 :
-                    // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:803:11: JOIN
-                    {
-                    root_0 = (Object)adaptor.nil();
-
-                    JOIN167=(Token)match(input,JOIN,FOLLOW_JOIN_in_keyWord5335); if (state.failed) return retval;
-                    if ( state.backtracking==0 ) {
-                    JOIN167_tree = (Object)adaptor.create(JOIN167);
-                    adaptor.addChild(root_0, JOIN167_tree);
-                    }
-
-                    }
-                    break;
-                case 5 :
-                    // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:804:11: INNER
-                    {
-                    root_0 = (Object)adaptor.nil();
-
-                    INNER168=(Token)match(input,INNER,FOLLOW_INNER_in_keyWord5347); if (state.failed) return retval;
-                    if ( state.backtracking==0 ) {
-                    INNER168_tree = (Object)adaptor.create(INNER168);
-                    adaptor.addChild(root_0, INNER168_tree);
-                    }
-
-                    }
-                    break;
-                case 6 :
-                    // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:805:11: LEFT
-                    {
-                    root_0 = (Object)adaptor.nil();
-
-                    LEFT169=(Token)match(input,LEFT,FOLLOW_LEFT_in_keyWord5359); if (state.failed) return retval;
-                    if ( state.backtracking==0 ) {
-                    LEFT169_tree = (Object)adaptor.create(LEFT169);
-                    adaptor.addChild(root_0, LEFT169_tree);
-                    }
-
-                    }
-                    break;
-                case 7 :
-                    // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:806:11: OUTER
-                    {
-                    root_0 = (Object)adaptor.nil();
-
-                    OUTER170=(Token)match(input,OUTER,FOLLOW_OUTER_in_keyWord5371); if (state.failed) return retval;
-                    if ( state.backtracking==0 ) {
-                    OUTER170_tree = (Object)adaptor.create(OUTER170);
-                    adaptor.addChild(root_0, OUTER170_tree);
-                    }
-
-                    }
-                    break;
-                case 8 :
-                    // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:807:11: ON
-                    {
-                    root_0 = (Object)adaptor.nil();
-
-                    ON171=(Token)match(input,ON,FOLLOW_ON_in_keyWord5383); if (state.failed) return retval;
-                    if ( state.backtracking==0 ) {
-                    ON171_tree = (Object)adaptor.create(ON171);
-                    adaptor.addChild(root_0, ON171_tree);
-                    }
-
-                    }
-                    break;
-                case 9 :
-                    // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:808:11: WHERE
-                    {
-                    root_0 = (Object)adaptor.nil();
-
-                    WHERE172=(Token)match(input,WHERE,FOLLOW_WHERE_in_keyWord5395); if (state.failed) return retval;
-                    if ( state.backtracking==0 ) {
-                    WHERE172_tree = (Object)adaptor.create(WHERE172);
-                    adaptor.addChild(root_0, WHERE172_tree);
-                    }
-
-                    }
-                    break;
-                case 10 :
-                    // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:809:11: OR
-                    {
-                    root_0 = (Object)adaptor.nil();
-
-                    OR173=(Token)match(input,OR,FOLLOW_OR_in_keyWord5407); if (state.failed) return retval;
-                    if ( state.backtracking==0 ) {
-                    OR173_tree = (Object)adaptor.create(OR173);
-                    adaptor.addChild(root_0, OR173_tree);
-                    }
-
-                    }
-                    break;
-                case 11 :
-                    // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:810:11: AND
-                    {
-                    root_0 = (Object)adaptor.nil();
-
-                    AND174=(Token)match(input,AND,FOLLOW_AND_in_keyWord5419); if (state.failed) return retval;
-                    if ( state.backtracking==0 ) {
-                    AND174_tree = (Object)adaptor.create(AND174);
-                    adaptor.addChild(root_0, AND174_tree);
-                    }
-
-                    }
-                    break;
-                case 12 :
-                    // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:811:11: NOT
-                    {
-                    root_0 = (Object)adaptor.nil();
-
-                    NOT175=(Token)match(input,NOT,FOLLOW_NOT_in_keyWord5431); if (state.failed) return retval;
-                    if ( state.backtracking==0 ) {
-                    NOT175_tree = (Object)adaptor.create(NOT175);
-                    adaptor.addChild(root_0, NOT175_tree);
-                    }
-
-                    }
-                    break;
-                case 13 :
-                    // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:812:11: IN
-                    {
-                    root_0 = (Object)adaptor.nil();
-
-                    IN176=(Token)match(input,IN,FOLLOW_IN_in_keyWord5443); if (state.failed) return retval;
-                    if ( state.backtracking==0 ) {
-                    IN176_tree = (Object)adaptor.create(IN176);
-                    adaptor.addChild(root_0, IN176_tree);
-                    }
-
-                    }
-                    break;
-                case 14 :
-                    // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:813:11: LIKE
-                    {
-                    root_0 = (Object)adaptor.nil();
-
-                    LIKE177=(Token)match(input,LIKE,FOLLOW_LIKE_in_keyWord5455); if (state.failed) return retval;
-                    if ( state.backtracking==0 ) {
-                    LIKE177_tree = (Object)adaptor.create(LIKE177);
-                    adaptor.addChild(root_0, LIKE177_tree);
-                    }
-
-                    }
-                    break;
-                case 15 :
-                    // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:814:11: IS
-                    {
-                    root_0 = (Object)adaptor.nil();
-
-                    IS178=(Token)match(input,IS,FOLLOW_IS_in_keyWord5467); if (state.failed) return retval;
-                    if ( state.backtracking==0 ) {
-                    IS178_tree = (Object)adaptor.create(IS178);
-                    adaptor.addChild(root_0, IS178_tree);
-                    }
-
-                    }
-                    break;
-                case 16 :
-                    // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:815:11: NULL
-                    {
-                    root_0 = (Object)adaptor.nil();
-
-                    NULL179=(Token)match(input,NULL,FOLLOW_NULL_in_keyWord5479); if (state.failed) return retval;
-                    if ( state.backtracking==0 ) {
-                    NULL179_tree = (Object)adaptor.create(NULL179);
-                    adaptor.addChild(root_0, NULL179_tree);
-                    }
-
-                    }
-                    break;
-                case 17 :
-                    // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:816:11: ANY
-                    {
-                    root_0 = (Object)adaptor.nil();
-
-                    ANY180=(Token)match(input,ANY,FOLLOW_ANY_in_keyWord5491); if (state.failed) return retval;
-                    if ( state.backtracking==0 ) {
-                    ANY180_tree = (Object)adaptor.create(ANY180);
-                    adaptor.addChild(root_0, ANY180_tree);
-                    }
-
-                    }
-                    break;
-                case 18 :
-                    // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:817:11: CONTAINS
-                    {
-                    root_0 = (Object)adaptor.nil();
-
-                    CONTAINS181=(Token)match(input,CONTAINS,FOLLOW_CONTAINS_in_keyWord5503); if (state.failed) return retval;
-                    if ( state.backtracking==0 ) {
-                    CONTAINS181_tree = (Object)adaptor.create(CONTAINS181);
-                    adaptor.addChild(root_0, CONTAINS181_tree);
-                    }
-
-                    }
-                    break;
-                case 19 :
-                    // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:818:11: IN_FOLDER
-                    {
-                    root_0 = (Object)adaptor.nil();
-
-                    IN_FOLDER182=(Token)match(input,IN_FOLDER,FOLLOW_IN_FOLDER_in_keyWord5515); if (state.failed) return retval;
-                    if ( state.backtracking==0 ) {
-                    IN_FOLDER182_tree = (Object)adaptor.create(IN_FOLDER182);
-                    adaptor.addChild(root_0, IN_FOLDER182_tree);
-                    }
-
-                    }
-                    break;
-                case 20 :
-                    // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:819:11: IN_TREE
-                    {
-                    root_0 = (Object)adaptor.nil();
-
-                    IN_TREE183=(Token)match(input,IN_TREE,FOLLOW_IN_TREE_in_keyWord5527); if (state.failed) return retval;
-                    if ( state.backtracking==0 ) {
-                    IN_TREE183_tree = (Object)adaptor.create(IN_TREE183);
-                    adaptor.addChild(root_0, IN_TREE183_tree);
-                    }
-
-                    }
-                    break;
-                case 21 :
-                    // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:820:11: ORDER
-                    {
-                    root_0 = (Object)adaptor.nil();
-
-                    ORDER184=(Token)match(input,ORDER,FOLLOW_ORDER_in_keyWord5539); if (state.failed) return retval;
-                    if ( state.backtracking==0 ) {
-                    ORDER184_tree = (Object)adaptor.create(ORDER184);
-                    adaptor.addChild(root_0, ORDER184_tree);
-                    }
-
-                    }
-                    break;
-                case 22 :
-                    // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:821:11: BY
-                    {
-                    root_0 = (Object)adaptor.nil();
-
-                    BY185=(Token)match(input,BY,FOLLOW_BY_in_keyWord5551); if (state.failed) return retval;
-                    if ( state.backtracking==0 ) {
-                    BY185_tree = (Object)adaptor.create(BY185);
-                    adaptor.addChild(root_0, BY185_tree);
-                    }
-
-                    }
-                    break;
-                case 23 :
-                    // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:822:11: ASC
-                    {
-                    root_0 = (Object)adaptor.nil();
-
-                    ASC186=(Token)match(input,ASC,FOLLOW_ASC_in_keyWord5563); if (state.failed) return retval;
-                    if ( state.backtracking==0 ) {
-                    ASC186_tree = (Object)adaptor.create(ASC186);
-                    adaptor.addChild(root_0, ASC186_tree);
-                    }
-
-                    }
-                    break;
-                case 24 :
-                    // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:823:11: DESC
-                    {
-                    root_0 = (Object)adaptor.nil();
-
-                    DESC187=(Token)match(input,DESC,FOLLOW_DESC_in_keyWord5575); if (state.failed) return retval;
-                    if ( state.backtracking==0 ) {
-                    DESC187_tree = (Object)adaptor.create(DESC187);
-                    adaptor.addChild(root_0, DESC187_tree);
-                    }
-
-                    }
-                    break;
-                case 25 :
-                    // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:824:11: TIMESTAMP
-                    {
-                    root_0 = (Object)adaptor.nil();
-
-                    TIMESTAMP188=(Token)match(input,TIMESTAMP,FOLLOW_TIMESTAMP_in_keyWord5587); if (state.failed) return retval;
-                    if ( state.backtracking==0 ) {
-                    TIMESTAMP188_tree = (Object)adaptor.create(TIMESTAMP188);
-                    adaptor.addChild(root_0, TIMESTAMP188_tree);
-                    }
-
-                    }
-                    break;
-                case 26 :
-                    // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:825:11: TRUE
-                    {
-                    root_0 = (Object)adaptor.nil();
-
-                    TRUE189=(Token)match(input,TRUE,FOLLOW_TRUE_in_keyWord5599); if (state.failed) return retval;
-                    if ( state.backtracking==0 ) {
-                    TRUE189_tree = (Object)adaptor.create(TRUE189);
-                    adaptor.addChild(root_0, TRUE189_tree);
-                    }
-
-                    }
-                    break;
-                case 27 :
-                    // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:826:11: FALSE
-                    {
-                    root_0 = (Object)adaptor.nil();
-
-                    FALSE190=(Token)match(input,FALSE,FOLLOW_FALSE_in_keyWord5611); if (state.failed) return retval;
-                    if ( state.backtracking==0 ) {
-                    FALSE190_tree = (Object)adaptor.create(FALSE190);
-                    adaptor.addChild(root_0, FALSE190_tree);
-                    }
-
-                    }
-                    break;
-                case 28 :
-                    // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:827:11: cmisFunction
-                    {
-                    root_0 = (Object)adaptor.nil();
-
-                    pushFollow(FOLLOW_cmisFunction_in_keyWord5623);
-                    cmisFunction191=cmisFunction();
-
-                    state._fsp--;
-                    if (state.failed) return retval;
-                    if ( state.backtracking==0 ) adaptor.addChild(root_0, cmisFunction191.getTree());
-
-                    }
-                    break;
-
-            }
-            retval.stop = input.LT(-1);
-
-            if ( state.backtracking==0 ) {
-
-            retval.tree = (Object)adaptor.rulePostProcessing(root_0);
-            adaptor.setTokenBoundaries(retval.tree, retval.start, retval.stop);
-            }
-        }
-
-            catch(RecognitionException e)
-            {
-                throw new CMISQueryException(getErrorString(e), e);
-            }
-        finally {
-        }
-        return retval;
-    }
-    // $ANTLR end "keyWord"
-
-    public static class cmisFunction_return extends ParserRuleReturnScope {
-        Object tree;
-        public Object getTree() { return tree; }
-    };
-
-    // $ANTLR start "cmisFunction"
-    // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:830:1: cmisFunction : SCORE -> SCORE ;
-    public final CMISParser.cmisFunction_return cmisFunction() throws RecognitionException {
-        CMISParser.cmisFunction_return retval = new CMISParser.cmisFunction_return();
-        retval.start = input.LT(1);
-
-        Object root_0 = null;
-
-        Token SCORE192=null;
-
-        Object SCORE192_tree=null;
-        RewriteRuleTokenStream stream_SCORE=new RewriteRuleTokenStream(adaptor,"token SCORE");
-
-        try {
-            // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:831:9: ( SCORE -> SCORE )
-            // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:832:9: SCORE
-            {
-            SCORE192=(Token)match(input,SCORE,FOLLOW_SCORE_in_cmisFunction5656); if (state.failed) return retval; 
-            if ( state.backtracking==0 ) stream_SCORE.add(SCORE192);
-
-
-
-            // AST REWRITE
-            // elements: SCORE
-            // token labels: 
-            // rule labels: retval
-            // token list labels: 
-            // rule list labels: 
-            // wildcard labels: 
-            if ( state.backtracking==0 ) {
-            retval.tree = root_0;
-            RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"rule retval",retval!=null?retval.tree:null);
-
-            root_0 = (Object)adaptor.nil();
-            // 833:17: -> SCORE
-            {
-                adaptor.addChild(root_0, stream_SCORE.nextNode());
-
-            }
-
-            retval.tree = root_0;}
-            }
-
-            retval.stop = input.LT(-1);
-
-            if ( state.backtracking==0 ) {
-
-            retval.tree = (Object)adaptor.rulePostProcessing(root_0);
-            adaptor.setTokenBoundaries(retval.tree, retval.start, retval.stop);
-            }
-        }
-
-            catch(RecognitionException e)
-            {
-                throw new CMISQueryException(getErrorString(e), e);
-            }
-        finally {
-        }
-        return retval;
-    }
-    // $ANTLR end "cmisFunction"
-
-    public static class keyWordOrId_return extends ParserRuleReturnScope {
-        Object tree;
-        public Object getTree() { return tree; }
-    };
-
-    // $ANTLR start "keyWordOrId"
-    // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:836:1: keyWordOrId : ( keyWord -> keyWord | ID -> ID );
-    public final CMISParser.keyWordOrId_return keyWordOrId() throws RecognitionException {
-        CMISParser.keyWordOrId_return retval = new CMISParser.keyWordOrId_return();
-        retval.start = input.LT(1);
-
-        Object root_0 = null;
-
-        Token ID194=null;
-        CMISParser.keyWord_return keyWord193 = null;
-
-
-        Object ID194_tree=null;
-        RewriteRuleTokenStream stream_ID=new RewriteRuleTokenStream(adaptor,"token ID");
-        RewriteRuleSubtreeStream stream_keyWord=new RewriteRuleSubtreeStream(adaptor,"rule keyWord");
-        try {
-            // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:837:9: ( keyWord -> keyWord | ID -> ID )
-            int alt46=2;
-            int LA46_0 = input.LA(1);
-
-            if ( (LA46_0==SELECT||LA46_0==AS||(LA46_0>=FROM && LA46_0<=ON)||(LA46_0>=WHERE && LA46_0<=NOT)||(LA46_0>=IN && LA46_0<=DESC)||(LA46_0>=TRUE && LA46_0<=SCORE)) ) {
-                alt46=1;
-            }
-            else if ( (LA46_0==ID) ) {
-                alt46=2;
-            }
-            else {
-                if (state.backtracking>0) {state.failed=true; return retval;}
-                NoViableAltException nvae =
-                    new NoViableAltException("", 46, 0, input);
-
-                throw nvae;
-            }
-            switch (alt46) {
-                case 1 :
-                    // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:838:9: keyWord
-                    {
-                    pushFollow(FOLLOW_keyWord_in_keyWordOrId5709);
-                    keyWord193=keyWord();
-
-                    state._fsp--;
-                    if (state.failed) return retval;
-                    if ( state.backtracking==0 ) stream_keyWord.add(keyWord193.getTree());
-
-
-                    // AST REWRITE
-                    // elements: keyWord
-                    // token labels: 
-                    // rule labels: retval
-                    // token list labels: 
-                    // rule list labels: 
-                    // wildcard labels: 
-                    if ( state.backtracking==0 ) {
-                    retval.tree = root_0;
-                    RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"rule retval",retval!=null?retval.tree:null);
-
-                    root_0 = (Object)adaptor.nil();
-                    // 839:17: -> keyWord
-                    {
-                        adaptor.addChild(root_0, stream_keyWord.nextTree());
-
-                    }
-
-                    retval.tree = root_0;}
-                    }
-                    break;
-                case 2 :
-                    // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:840:11: ID
-                    {
-                    ID194=(Token)match(input,ID,FOLLOW_ID_in_keyWordOrId5741); if (state.failed) return retval; 
-                    if ( state.backtracking==0 ) stream_ID.add(ID194);
-
-
-
-                    // AST REWRITE
-                    // elements: ID
-                    // token labels: 
-                    // rule labels: retval
-                    // token list labels: 
-                    // rule list labels: 
-                    // wildcard labels: 
-                    if ( state.backtracking==0 ) {
-                    retval.tree = root_0;
-                    RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"rule retval",retval!=null?retval.tree:null);
-
-                    root_0 = (Object)adaptor.nil();
-                    // 841:17: -> ID
-                    {
-                        adaptor.addChild(root_0, stream_ID.nextNode());
-
-                    }
-
-                    retval.tree = root_0;}
-                    }
-                    break;
-
-            }
-            retval.stop = input.LT(-1);
-
-            if ( state.backtracking==0 ) {
-
-            retval.tree = (Object)adaptor.rulePostProcessing(root_0);
-            adaptor.setTokenBoundaries(retval.tree, retval.start, retval.stop);
-            }
-        }
-
-            catch(RecognitionException e)
-            {
-                throw new CMISQueryException(getErrorString(e), e);
-            }
-        finally {
-        }
-        return retval;
-    }
-    // $ANTLR end "keyWordOrId"
-
-    // $ANTLR start synpred1_CMIS
-    public final void synpred1_CMIS_fragment() throws RecognitionException {   
-        // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:388:9: ( tableName )
-        // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:388:10: tableName
-        {
-        pushFollow(FOLLOW_tableName_in_synpred1_CMIS1323);
-        tableName();
-
-        state._fsp--;
-        if (state.failed) return ;
-
-        }
-    }
-    // $ANTLR end synpred1_CMIS
-
-    // $ANTLR start synpred2_CMIS
-    public final void synpred2_CMIS_fragment() throws RecognitionException {   
-        // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:484:9: ( LPAREN singleTable ( joinedTable )+ RPAREN )
-        // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:484:10: LPAREN singleTable ( joinedTable )+ RPAREN
-        {
-        match(input,LPAREN,FOLLOW_LPAREN_in_synpred2_CMIS1917); if (state.failed) return ;
-        pushFollow(FOLLOW_singleTable_in_synpred2_CMIS1919);
-        singleTable();
-
-        state._fsp--;
-        if (state.failed) return ;
-        // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:484:29: ( joinedTable )+
-        int cnt47=0;
-        loop47:
-        do {
-            int alt47=2;
-            int LA47_0 = input.LA(1);
-
-            if ( ((LA47_0>=JOIN && LA47_0<=LEFT)) ) {
-                alt47=1;
-            }
-
-
-            switch (alt47) {
-        	case 1 :
-        	    // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:484:29: joinedTable
-        	    {
-        	    pushFollow(FOLLOW_joinedTable_in_synpred2_CMIS1921);
-        	    joinedTable();
-
-        	    state._fsp--;
-        	    if (state.failed) return ;
-
-        	    }
-        	    break;
-
-        	default :
-        	    if ( cnt47 >= 1 ) break loop47;
-        	    if (state.backtracking>0) {state.failed=true; return ;}
-                    EarlyExitException eee =
-                        new EarlyExitException(47, input);
-                    throw eee;
-            }
-            cnt47++;
-        } while (true);
-
-        match(input,RPAREN,FOLLOW_RPAREN_in_synpred2_CMIS1924); if (state.failed) return ;
-
-        }
-    }
-    // $ANTLR end synpred2_CMIS
-
-    // Delegated rules
-
-    public final boolean synpred2_CMIS() {
-        state.backtracking++;
-        int start = input.mark();
-        try {
-            synpred2_CMIS_fragment(); // can never throw exception
-        } catch (RecognitionException re) {
-            System.err.println("impossible: "+re);
-        }
-        boolean success = !state.failed;
-        input.rewind(start);
-        state.backtracking--;
-        state.failed=false;
-        return success;
-    }
-    public final boolean synpred1_CMIS() {
-        state.backtracking++;
-        int start = input.mark();
-        try {
-            synpred1_CMIS_fragment(); // can never throw exception
-        } catch (RecognitionException re) {
-            System.err.println("impossible: "+re);
-        }
-        boolean success = !state.failed;
-        input.rewind(start);
-        state.backtracking--;
-        state.failed=false;
-        return success;
-    }
-
-
-    protected DFA4 dfa4 = new DFA4(this);
-    protected DFA7 dfa7 = new DFA7(this);
-    protected DFA8 dfa8 = new DFA8(this);
-    protected DFA9 dfa9 = new DFA9(this);
-    protected DFA12 dfa12 = new DFA12(this);
-    protected DFA10 dfa10 = new DFA10(this);
-    protected DFA11 dfa11 = new DFA11(this);
-    protected DFA13 dfa13 = new DFA13(this);
-    protected DFA14 dfa14 = new DFA14(this);
-    protected DFA18 dfa18 = new DFA18(this);
-    protected DFA26 dfa26 = new DFA26(this);
-    protected DFA27 dfa27 = new DFA27(this);
-    protected DFA28 dfa28 = new DFA28(this);
-    protected DFA34 dfa34 = new DFA34(this);
-    protected DFA41 dfa41 = new DFA41(this);
-    static final String DFA4_eotS =
-        "\40\uffff";
-    static final String DFA4_eofS =
-        "\40\uffff";
-    static final String DFA4_minS =
-        "\1\40\37\uffff";
-    static final String DFA4_maxS =
-        "\1\115\37\uffff";
-    static final String DFA4_acceptS =
-        "\1\uffff\1\1\36\2";
-    static final String DFA4_specialS =
-        "\1\0\37\uffff}>";
-    static final String[] DFA4_transitionS = {
-            "\1\5\1\1\1\uffff\1\6\4\uffff\1\7\1\10\1\11\1\12\1\13\1\14\1"+
-            "\uffff\1\15\1\16\1\17\1\20\5\uffff\1\21\1\22\1\23\1\24\1\25"+
-            "\1\26\1\27\1\30\1\31\1\32\1\33\1\34\2\uffff\1\2\1\3\2\uffff"+
-            "\1\36\1\37\1\35\1\4",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            ""
-    };
-
-    static final short[] DFA4_eot = DFA.unpackEncodedString(DFA4_eotS);
-    static final short[] DFA4_eof = DFA.unpackEncodedString(DFA4_eofS);
-    static final char[] DFA4_min = DFA.unpackEncodedStringToUnsignedChars(DFA4_minS);
-    static final char[] DFA4_max = DFA.unpackEncodedStringToUnsignedChars(DFA4_maxS);
-    static final short[] DFA4_accept = DFA.unpackEncodedString(DFA4_acceptS);
-    static final short[] DFA4_special = DFA.unpackEncodedString(DFA4_specialS);
-    static final short[][] DFA4_transition;
-
-    static {
-        int numStates = DFA4_transitionS.length;
-        DFA4_transition = new short[numStates][];
-        for (int i=0; i<numStates; i++) {
-            DFA4_transition[i] = DFA.unpackEncodedString(DFA4_transitionS[i]);
-        }
-    }
-
-    class DFA4 extends DFA {
-
-        public DFA4(BaseRecognizer recognizer) {
-            this.recognizer = recognizer;
-            this.decisionNumber = 4;
-            this.eot = DFA4_eot;
-            this.eof = DFA4_eof;
-            this.min = DFA4_min;
-            this.max = DFA4_max;
-            this.accept = DFA4_accept;
-            this.special = DFA4_special;
-            this.transition = DFA4_transition;
-        }
-        public String getDescription() {
-            return "300:1: selectList : ( STAR -> ^( ALL_COLUMNS ) | selectSubList ( COMMA selectSubList )* -> ^( COLUMNS ( selectSubList )+ ) );";
-        }
-        public int specialStateTransition(int s, IntStream _input) throws NoViableAltException {
-            TokenStream input = (TokenStream)_input;
-        	int _s = s;
-            switch ( s ) {
-                    case 0 : 
-                        int LA4_0 = input.LA(1);
-
-                         
-                        int index4_0 = input.index();
-                        input.rewind();
-                        s = -1;
-                        if ( (LA4_0==STAR) ) {s = 1;}
-
-                        else if ( (LA4_0==ID) ) {s = 2;}
-
-                        else if ( (LA4_0==DOUBLE_QUOTE) && ((strict == false))) {s = 3;}
-
-                        else if ( (LA4_0==SCORE) ) {s = 4;}
-
-                        else if ( (LA4_0==SELECT) && ((strict == false))) {s = 5;}
-
-                        else if ( (LA4_0==AS) && ((strict == false))) {s = 6;}
-
-                        else if ( (LA4_0==FROM) && ((strict == false))) {s = 7;}
-
-                        else if ( (LA4_0==JOIN) && ((strict == false))) {s = 8;}
-
-                        else if ( (LA4_0==INNER) && ((strict == false))) {s = 9;}
-
-                        else if ( (LA4_0==LEFT) && ((strict == false))) {s = 10;}
-
-                        else if ( (LA4_0==OUTER) && ((strict == false))) {s = 11;}
-
-                        else if ( (LA4_0==ON) && ((strict == false))) {s = 12;}
-
-                        else if ( (LA4_0==WHERE) && ((strict == false))) {s = 13;}
-
-                        else if ( (LA4_0==OR) && ((strict == false))) {s = 14;}
-
-                        else if ( (LA4_0==AND) && ((strict == false))) {s = 15;}
-
-                        else if ( (LA4_0==NOT) && ((strict == false))) {s = 16;}
-
-                        else if ( (LA4_0==IN) && ((strict == false))) {s = 17;}
-
-                        else if ( (LA4_0==LIKE) && ((strict == false))) {s = 18;}
-
-                        else if ( (LA4_0==IS) && ((strict == false))) {s = 19;}
-
-                        else if ( (LA4_0==NULL) && ((strict == false))) {s = 20;}
-
-                        else if ( (LA4_0==ANY) && ((strict == false))) {s = 21;}
-
-                        else if ( (LA4_0==CONTAINS) && ((strict == false))) {s = 22;}
-
-                        else if ( (LA4_0==IN_FOLDER) && ((strict == false))) {s = 23;}
-
-                        else if ( (LA4_0==IN_TREE) && ((strict == false))) {s = 24;}
-
-                        else if ( (LA4_0==ORDER) && ((strict == false))) {s = 25;}
-
-                        else if ( (LA4_0==BY) && ((strict == false))) {s = 26;}
-
-                        else if ( (LA4_0==ASC) && ((strict == false))) {s = 27;}
-
-                        else if ( (LA4_0==DESC) && ((strict == false))) {s = 28;}
-
-                        else if ( (LA4_0==TIMESTAMP) && ((strict == false))) {s = 29;}
-
-                        else if ( (LA4_0==TRUE) && ((strict == false))) {s = 30;}
-
-                        else if ( (LA4_0==FALSE) && ((strict == false))) {s = 31;}
-
-                         
-                        input.seek(index4_0);
-                        if ( s>=0 ) return s;
-                        break;
-            }
-            if (state.backtracking>0) {state.failed=true; return -1;}
-            NoViableAltException nvae =
-                new NoViableAltException(getDescription(), 4, _s, input);
-            error(nvae);
-            throw nvae;
-        }
-    }
-    static final String DFA7_eotS =
-        "\114\uffff";
-    static final String DFA7_eofS =
-        "\114\uffff";
-    static final String DFA7_minS =
-        "\1\40\1\42\1\40\44\uffff\35\107\1\42\7\uffff";
-    static final String DFA7_maxS =
-        "\1\115\1\107\1\115\44\uffff\36\107\7\uffff";
-    static final String DFA7_acceptS =
-        "\3\uffff\43\1\1\2\36\uffff\6\1\1\2";
-    static final String DFA7_specialS =
-        "\1\40\1\15\1\2\44\uffff\1\27\1\25\1\17\1\14\1\13\1\10\1\6\1\5\1"+
-        "\1\1\36\1\34\1\31\1\30\1\24\1\22\1\11\1\12\1\16\1\0\1\3\1\7\1\32"+
-        "\1\33\1\35\1\37\1\23\1\26\1\4\1\21\1\20\7\uffff}>";
-    static final String[] DFA7_transitionS = {
-            "\1\4\2\uffff\1\5\4\uffff\1\6\1\7\1\10\1\11\1\12\1\13\1\uffff"+
-            "\1\14\1\15\1\16\1\17\5\uffff\1\20\1\21\1\22\1\23\1\24\1\25\1"+
-            "\26\1\27\1\30\1\31\1\32\1\33\2\uffff\1\1\1\2\2\uffff\1\35\1"+
-            "\36\1\34\1\3",
-            "\1\43\1\40\1\46\1\37\1\45\1\uffff\1\44\35\uffff\1\41\1\42",
-            "\1\47\2\uffff\1\50\4\uffff\1\51\1\52\1\53\1\54\1\55\1\56\1"+
-            "\uffff\1\57\1\60\1\61\1\62\5\uffff\1\63\1\64\1\65\1\66\1\67"+
-            "\1\70\1\71\1\72\1\73\1\74\1\75\1\76\2\uffff\1\103\3\uffff\1"+
-            "\100\1\101\1\77\1\102",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "\1\104",
-            "\1\104",
-            "\1\104",
-            "\1\104",
-            "\1\104",
-            "\1\104",
-            "\1\104",
-            "\1\104",
-            "\1\104",
-            "\1\104",
-            "\1\104",
-            "\1\104",
-            "\1\104",
-            "\1\104",
-            "\1\104",
-            "\1\104",
-            "\1\104",
-            "\1\104",
-            "\1\104",
-            "\1\104",
-            "\1\104",
-            "\1\104",
-            "\1\104",
-            "\1\104",
-            "\1\104",
-            "\1\104",
-            "\1\104",
-            "\1\104",
-            "\1\104",
-            "\1\111\1\106\1\113\1\105\2\uffff\1\112\35\uffff\1\107\1\110",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            ""
-    };
-
-    static final short[] DFA7_eot = DFA.unpackEncodedString(DFA7_eotS);
-    static final short[] DFA7_eof = DFA.unpackEncodedString(DFA7_eofS);
-    static final char[] DFA7_min = DFA.unpackEncodedStringToUnsignedChars(DFA7_minS);
-    static final char[] DFA7_max = DFA.unpackEncodedStringToUnsignedChars(DFA7_maxS);
-    static final short[] DFA7_accept = DFA.unpackEncodedString(DFA7_acceptS);
-    static final short[] DFA7_special = DFA.unpackEncodedString(DFA7_specialS);
-    static final short[][] DFA7_transition;
-
-    static {
-        int numStates = DFA7_transitionS.length;
-        DFA7_transition = new short[numStates][];
-        for (int i=0; i<numStates; i++) {
-            DFA7_transition[i] = DFA.unpackEncodedString(DFA7_transitionS[i]);
-        }
-    }
-
-    class DFA7 extends DFA {
-
-        public DFA7(BaseRecognizer recognizer) {
-            this.recognizer = recognizer;
-            this.decisionNumber = 7;
-            this.eot = DFA7_eot;
-            this.eof = DFA7_eof;
-            this.min = DFA7_min;
-            this.max = DFA7_max;
-            this.accept = DFA7_accept;
-            this.special = DFA7_special;
-            this.transition = DFA7_transition;
-        }
-        public String getDescription() {
-            return "318:1: selectSubList : ( valueExpression ( ( AS )? columnName )? -> ^( COLUMN valueExpression ( columnName )? ) | qualifier DOTSTAR -> ^( ALL_COLUMNS qualifier ) );";
-        }
-        public int specialStateTransition(int s, IntStream _input) throws NoViableAltException {
-            TokenStream input = (TokenStream)_input;
-        	int _s = s;
-            switch ( s ) {
-                    case 0 : 
-                        int LA7_57 = input.LA(1);
-
-                         
-                        int index7_57 = input.index();
-                        input.rewind();
-                        s = -1;
-                        if ( (LA7_57==DOUBLE_QUOTE) && ((strict == false))) {s = 68;}
-
-                         
-                        input.seek(index7_57);
-                        if ( s>=0 ) return s;
-                        break;
-                    case 1 : 
-                        int LA7_47 = input.LA(1);
-
-                         
-                        int index7_47 = input.index();
-                        input.rewind();
-                        s = -1;
-                        if ( (LA7_47==DOUBLE_QUOTE) && ((strict == false))) {s = 68;}
-
-                         
-                        input.seek(index7_47);
-                        if ( s>=0 ) return s;
-                        break;
-                    case 2 : 
-                        int LA7_2 = input.LA(1);
-
-                         
-                        int index7_2 = input.index();
-                        input.rewind();
-                        s = -1;
-                        if ( (LA7_2==SELECT) && ((strict == false))) {s = 39;}
-
-                        else if ( (LA7_2==AS) && ((strict == false))) {s = 40;}
-
-                        else if ( (LA7_2==FROM) && ((strict == false))) {s = 41;}
-
-                        else if ( (LA7_2==JOIN) && ((strict == false))) {s = 42;}
-
-                        else if ( (LA7_2==INNER) && ((strict == false))) {s = 43;}
-
-                        else if ( (LA7_2==LEFT) && ((strict == false))) {s = 44;}
-
-                        else if ( (LA7_2==OUTER) && ((strict == false))) {s = 45;}
-
-                        else if ( (LA7_2==ON) && ((strict == false))) {s = 46;}
-
-                        else if ( (LA7_2==WHERE) && ((strict == false))) {s = 47;}
-
-                        else if ( (LA7_2==OR) && ((strict == false))) {s = 48;}
-
-                        else if ( (LA7_2==AND) && ((strict == false))) {s = 49;}
-
-                        else if ( (LA7_2==NOT) && ((strict == false))) {s = 50;}
-
-                        else if ( (LA7_2==IN) && ((strict == false))) {s = 51;}
-
-                        else if ( (LA7_2==LIKE) && ((strict == false))) {s = 52;}
-
-                        else if ( (LA7_2==IS) && ((strict == false))) {s = 53;}
-
-                        else if ( (LA7_2==NULL) && ((strict == false))) {s = 54;}
-
-                        else if ( (LA7_2==ANY) && ((strict == false))) {s = 55;}
-
-                        else if ( (LA7_2==CONTAINS) && ((strict == false))) {s = 56;}
-
-                        else if ( (LA7_2==IN_FOLDER) && ((strict == false))) {s = 57;}
-
-                        else if ( (LA7_2==IN_TREE) && ((strict == false))) {s = 58;}
-
-                        else if ( (LA7_2==ORDER) && ((strict == false))) {s = 59;}
-
-                        else if ( (LA7_2==BY) && ((strict == false))) {s = 60;}
-
-                        else if ( (LA7_2==ASC) && ((strict == false))) {s = 61;}
-
-                        else if ( (LA7_2==DESC) && ((strict == false))) {s = 62;}
-
-                        else if ( (LA7_2==TIMESTAMP) && ((strict == false))) {s = 63;}
-
-                        else if ( (LA7_2==TRUE) && ((strict == false))) {s = 64;}
-
-                        else if ( (LA7_2==FALSE) && ((strict == false))) {s = 65;}
-
-                        else if ( (LA7_2==SCORE) && ((strict == false))) {s = 66;}
-
-                        else if ( (LA7_2==ID) && ((strict == false))) {s = 67;}
-
-                         
-                        input.seek(index7_2);
-                        if ( s>=0 ) return s;
-                        break;
-                    case 3 : 
-                        int LA7_58 = input.LA(1);
-
-                         
-                        int index7_58 = input.index();
-                        input.rewind();
-                        s = -1;
-                        if ( (LA7_58==DOUBLE_QUOTE) && ((strict == false))) {s = 68;}
-
-                         
-                        input.seek(index7_58);
-                        if ( s>=0 ) return s;
-                        break;
-                    case 4 : 
-                        int LA7_66 = input.LA(1);
-
-                         
-                        int index7_66 = input.index();
-                        input.rewind();
-                        s = -1;
-                        if ( (LA7_66==DOUBLE_QUOTE) && ((strict == false))) {s = 68;}
-
-                         
-                        input.seek(index7_66);
-                        if ( s>=0 ) return s;
-                        break;
-                    case 5 : 
-                        int LA7_46 = input.LA(1);
-
-                         
-                        int index7_46 = input.index();
-                        input.rewind();
-                        s = -1;
-                        if ( (LA7_46==DOUBLE_QUOTE) && ((strict == false))) {s = 68;}
-
-                         
-                        input.seek(index7_46);
-                        if ( s>=0 ) return s;
-                        break;
-                    case 6 : 
-                        int LA7_45 = input.LA(1);
-
-                         
-                        int index7_45 = input.index();
-                        input.rewind();
-                        s = -1;
-                        if ( (LA7_45==DOUBLE_QUOTE) && ((strict == false))) {s = 68;}
-
-                         
-                        input.seek(index7_45);
-                        if ( s>=0 ) return s;
-                        break;
-                    case 7 : 
-                        int LA7_59 = input.LA(1);
-
-                         
-                        int index7_59 = input.index();
-                        input.rewind();
-                        s = -1;
-                        if ( (LA7_59==DOUBLE_QUOTE) && ((strict == false))) {s = 68;}
-
-                         
-                        input.seek(index7_59);
-                        if ( s>=0 ) return s;
-                        break;
-                    case 8 : 
-                        int LA7_44 = input.LA(1);
-
-                         
-                        int index7_44 = input.index();
-                        input.rewind();
-                        s = -1;
-                        if ( (LA7_44==DOUBLE_QUOTE) && ((strict == false))) {s = 68;}
-
-                         
-                        input.seek(index7_44);
-                        if ( s>=0 ) return s;
-                        break;
-                    case 9 : 
-                        int LA7_54 = input.LA(1);
-
-                         
-                        int index7_54 = input.index();
-                        input.rewind();
-                        s = -1;
-                        if ( (LA7_54==DOUBLE_QUOTE) && ((strict == false))) {s = 68;}
-
-                         
-                        input.seek(index7_54);
-                        if ( s>=0 ) return s;
-                        break;
-                    case 10 : 
-                        int LA7_55 = input.LA(1);
-
-                         
-                        int index7_55 = input.index();
-                        input.rewind();
-                        s = -1;
-                        if ( (LA7_55==DOUBLE_QUOTE) && ((strict == false))) {s = 68;}
-
-                         
-                        input.seek(index7_55);
-                        if ( s>=0 ) return s;
-                        break;
-                    case 11 : 
-                        int LA7_43 = input.LA(1);
-
-                         
-                        int index7_43 = input.index();
-                        input.rewind();
-                        s = -1;
-                        if ( (LA7_43==DOUBLE_QUOTE) && ((strict == false))) {s = 68;}
-
-                         
-                        input.seek(index7_43);
-                        if ( s>=0 ) return s;
-                        break;
-                    case 12 : 
-                        int LA7_42 = input.LA(1);
-
-                         
-                        int index7_42 = input.index();
-                        input.rewind();
-                        s = -1;
-                        if ( (LA7_42==DOUBLE_QUOTE) && ((strict == false))) {s = 68;}
-
-                         
-                        input.seek(index7_42);
-                        if ( s>=0 ) return s;
-                        break;
-                    case 13 : 
-                        int LA7_1 = input.LA(1);
-
-                         
-                        int index7_1 = input.index();
-                        input.rewind();
-                        s = -1;
-                        if ( (LA7_1==DOT) ) {s = 31;}
-
-                        else if ( (LA7_1==AS) ) {s = 32;}
-
-                        else if ( (LA7_1==ID) ) {s = 33;}
-
-                        else if ( (LA7_1==DOUBLE_QUOTE) ) {s = 34;}
-
-                        else if ( (LA7_1==COMMA) ) {s = 35;}
-
-                        else if ( (LA7_1==FROM) ) {s = 36;}
-
-                        else if ( (LA7_1==LPAREN) && ((strict == false))) {s = 37;}
-
-                        else if ( (LA7_1==DOTSTAR) ) {s = 38;}
-
-                         
-                        input.seek(index7_1);
-                        if ( s>=0 ) return s;
-                        break;
-                    case 14 : 
-                        int LA7_56 = input.LA(1);
-
-                         
-                        int index7_56 = input.index();
-                        input.rewind();
-                        s = -1;
-                        if ( (LA7_56==DOUBLE_QUOTE) && ((strict == false))) {s = 68;}
-
-                         
-                        input.seek(index7_56);
-                        if ( s>=0 ) return s;
-                        break;
-                    case 15 : 
-                        int LA7_41 = input.LA(1);
-
-                         
-                        int index7_41 = input.index();
-                        input.rewind();
-                        s = -1;
-                        if ( (LA7_41==DOUBLE_QUOTE) && ((strict == false))) {s = 68;}
-
-                         
-                        input.seek(index7_41);
-                        if ( s>=0 ) return s;
-                        break;
-                    case 16 : 
-                        int LA7_68 = input.LA(1);
-
-                         
-                        int index7_68 = input.index();
-                        input.rewind();
-                        s = -1;
-                        if ( (LA7_68==DOT) && ((strict == false))) {s = 69;}
-
-                        else if ( (LA7_68==AS) && ((strict == false))) {s = 70;}
-
-                        else if ( (LA7_68==ID) && ((strict == false))) {s = 71;}
-
-                        else if ( (LA7_68==DOUBLE_QUOTE) && ((strict == false))) {s = 72;}
-
-                        else if ( (LA7_68==COMMA) && ((strict == false))) {s = 73;}
-
-                        else if ( (LA7_68==FROM) && ((strict == false))) {s = 74;}
-
-                        else if ( (LA7_68==DOTSTAR) && ((strict == false))) {s = 75;}
-
-                         
-                        input.seek(index7_68);
-                        if ( s>=0 ) return s;
-                        break;
-                    case 17 : 
-                        int LA7_67 = input.LA(1);
-
-                         
-                        int index7_67 = input.index();
-                        input.rewind();
-                        s = -1;
-                        if ( (LA7_67==DOUBLE_QUOTE) && ((strict == false))) {s = 68;}
-
-                         
-                        input.seek(index7_67);
-                        if ( s>=0 ) return s;
-                        break;
-                    case 18 : 
-                        int LA7_53 = input.LA(1);
-
-                         
-                        int index7_53 = input.index();
-                        input.rewind();
-                        s = -1;
-                        if ( (LA7_53==DOUBLE_QUOTE) && ((strict == false))) {s = 68;}
-
-                         
-                        input.seek(index7_53);
-                        if ( s>=0 ) return s;
-                        break;
-                    case 19 : 
-                        int LA7_64 = input.LA(1);
-
-                         
-                        int index7_64 = input.index();
-                        input.rewind();
-                        s = -1;
-                        if ( (LA7_64==DOUBLE_QUOTE) && ((strict == false))) {s = 68;}
-
-                         
-                        input.seek(index7_64);
-                        if ( s>=0 ) return s;
-                        break;
-                    case 20 : 
-                        int LA7_52 = input.LA(1);
-
-                         
-                        int index7_52 = input.index();
-                        input.rewind();
-                        s = -1;
-                        if ( (LA7_52==DOUBLE_QUOTE) && ((strict == false))) {s = 68;}
-
-                         
-                        input.seek(index7_52);
-                        if ( s>=0 ) return s;
-                        break;
-                    case 21 : 
-                        int LA7_40 = input.LA(1);
-
-                         
-                        int index7_40 = input.index();
-                        input.rewind();
-                        s = -1;
-                        if ( (LA7_40==DOUBLE_QUOTE) && ((strict == false))) {s = 68;}
-
-                         
-                        input.seek(index7_40);
-                        if ( s>=0 ) return s;
-                        break;
-                    case 22 : 
-                        int LA7_65 = input.LA(1);
-
-                         
-                        int index7_65 = input.index();
-                        input.rewind();
-                        s = -1;
-                        if ( (LA7_65==DOUBLE_QUOTE) && ((strict == false))) {s = 68;}
-
-                         
-                        input.seek(index7_65);
-                        if ( s>=0 ) return s;
-                        break;
-                    case 23 : 
-                        int LA7_39 = input.LA(1);
-
-                         
-                        int index7_39 = input.index();
-                        input.rewind();
-                        s = -1;
-                        if ( (LA7_39==DOUBLE_QUOTE) && ((strict == false))) {s = 68;}
-
-                         
-                        input.seek(index7_39);
-                        if ( s>=0 ) return s;
-                        break;
-                    case 24 : 
-                        int LA7_51 = input.LA(1);
-
-                         
-                        int index7_51 = input.index();
-                        input.rewind();
-                        s = -1;
-                        if ( (LA7_51==DOUBLE_QUOTE) && ((strict == false))) {s = 68;}
-
-                         
-                        input.seek(index7_51);
-                        if ( s>=0 ) return s;
-                        break;
-                    case 25 : 
-                        int LA7_50 = input.LA(1);
-
-                         
-                        int index7_50 = input.index();
-                        input.rewind();
-                        s = -1;
-                        if ( (LA7_50==DOUBLE_QUOTE) && ((strict == false))) {s = 68;}
-
-                         
-                        input.seek(index7_50);
-                        if ( s>=0 ) return s;
-                        break;
-                    case 26 : 
-                        int LA7_60 = input.LA(1);
-
-                         
-                        int index7_60 = input.index();
-                        input.rewind();
-                        s = -1;
-                        if ( (LA7_60==DOUBLE_QUOTE) && ((strict == false))) {s = 68;}
-
-                         
-                        input.seek(index7_60);
-                        if ( s>=0 ) return s;
-                        break;
-                    case 27 : 
-                        int LA7_61 = input.LA(1);
-
-                         
-                        int index7_61 = input.index();
-                        input.rewind();
-                        s = -1;
-                        if ( (LA7_61==DOUBLE_QUOTE) && ((strict == false))) {s = 68;}
-
-                         
-                        input.seek(index7_61);
-                        if ( s>=0 ) return s;
-                        break;
-                    case 28 : 
-                        int LA7_49 = input.LA(1);
-
-                         
-                        int index7_49 = input.index();
-                        input.rewind();
-                        s = -1;
-                        if ( (LA7_49==DOUBLE_QUOTE) && ((strict == false))) {s = 68;}
-
-                         
-                        input.seek(index7_49);
-                        if ( s>=0 ) return s;
-                        break;
-                    case 29 : 
-                        int LA7_62 = input.LA(1);
-
-                         
-                        int index7_62 = input.index();
-                        input.rewind();
-                        s = -1;
-                        if ( (LA7_62==DOUBLE_QUOTE) && ((strict == false))) {s = 68;}
-
-                         
-                        input.seek(index7_62);
-                        if ( s>=0 ) return s;
-                        break;
-                    case 30 : 
-                        int LA7_48 = input.LA(1);
-
-                         
-                        int index7_48 = input.index();
-                        input.rewind();
-                        s = -1;
-                        if ( (LA7_48==DOUBLE_QUOTE) && ((strict == false))) {s = 68;}
-
-                         
-                        input.seek(index7_48);
-                        if ( s>=0 ) return s;
-                        break;
-                    case 31 : 
-                        int LA7_63 = input.LA(1);
-
-                         
-                        int index7_63 = input.index();
-                        input.rewind();
-                        s = -1;
-                        if ( (LA7_63==DOUBLE_QUOTE) && ((strict == false))) {s = 68;}
-
-                         
-                        input.seek(index7_63);
-                        if ( s>=0 ) return s;
-                        break;
-                    case 32 : 
-                        int LA7_0 = input.LA(1);
-
-                         
-                        int index7_0 = input.index();
-                        input.rewind();
-                        s = -1;
-                        if ( (LA7_0==ID) ) {s = 1;}
-
-                        else if ( (LA7_0==DOUBLE_QUOTE) && ((strict == false))) {s = 2;}
-
-                        else if ( (LA7_0==SCORE) ) {s = 3;}
-
-                        else if ( (LA7_0==SELECT) && ((strict == false))) {s = 4;}
-
-                        else if ( (LA7_0==AS) && ((strict == false))) {s = 5;}
-
-                        else if ( (LA7_0==FROM) && ((strict == false))) {s = 6;}
-
-                        else if ( (LA7_0==JOIN) && ((strict == false))) {s = 7;}
-
-                        else if ( (LA7_0==INNER) && ((strict == false))) {s = 8;}
-
-                        else if ( (LA7_0==LEFT) && ((strict == false))) {s = 9;}
-
-                        else if ( (LA7_0==OUTER) && ((strict == false))) {s = 10;}
-
-                        else if ( (LA7_0==ON) && ((strict == false))) {s = 11;}
-
-                        else if ( (LA7_0==WHERE) && ((strict == false))) {s = 12;}
-
-                        else if ( (LA7_0==OR) && ((strict == false))) {s = 13;}
-
-                        else if ( (LA7_0==AND) && ((strict == false))) {s = 14;}
-
-                        else if ( (LA7_0==NOT) && ((strict == false))) {s = 15;}
-
-                        else if ( (LA7_0==IN) && ((strict == false))) {s = 16;}
-
-                        else if ( (LA7_0==LIKE) && ((strict == false))) {s = 17;}
-
-                        else if ( (LA7_0==IS) && ((strict == false))) {s = 18;}
-
-                        else if ( (LA7_0==NULL) && ((strict == false))) {s = 19;}
-
-                        else if ( (LA7_0==ANY) && ((strict == false))) {s = 20;}
-
-                        else if ( (LA7_0==CONTAINS) && ((strict == false))) {s = 21;}
-
-                        else if ( (LA7_0==IN_FOLDER) && ((strict == false))) {s = 22;}
-
-                        else if ( (LA7_0==IN_TREE) && ((strict == false))) {s = 23;}
-
-                        else if ( (LA7_0==ORDER) && ((strict == false))) {s = 24;}
-
-                        else if ( (LA7_0==BY) && ((strict == false))) {s = 25;}
-
-                        else if ( (LA7_0==ASC) && ((strict == false))) {s = 26;}
-
-                        else if ( (LA7_0==DESC) && ((strict == false))) {s = 27;}
-
-                        else if ( (LA7_0==TIMESTAMP) && ((strict == false))) {s = 28;}
-
-                        else if ( (LA7_0==TRUE) && ((strict == false))) {s = 29;}
-
-                        else if ( (LA7_0==FALSE) && ((strict == false))) {s = 30;}
-
-                         
-                        input.seek(index7_0);
-                        if ( s>=0 ) return s;
-                        break;
-            }
-            if (state.backtracking>0) {state.failed=true; return -1;}
-            NoViableAltException nvae =
-                new NoViableAltException(getDescription(), 7, _s, input);
-            error(nvae);
-            throw nvae;
-        }
-    }
-    static final String DFA8_eotS =
-        "\47\uffff";
-    static final String DFA8_eofS =
-        "\47\uffff";
-    static final String DFA8_minS =
-        "\1\40\1\42\45\uffff";
-    static final String DFA8_maxS =
-        "\1\115\1\107\45\uffff";
-    static final String DFA8_acceptS =
-        "\2\uffff\1\1\34\2\7\1\1\2";
-    static final String DFA8_specialS =
-        "\1\1\1\0\45\uffff}>";
-    static final String[] DFA8_transitionS = {
-            "\1\4\2\uffff\1\5\4\uffff\1\6\1\7\1\10\1\11\1\12\1\13\1\uffff"+
-            "\1\14\1\15\1\16\1\17\5\uffff\1\20\1\21\1\22\1\23\1\24\1\25\1"+
-            "\26\1\27\1\30\1\31\1\32\1\33\2\uffff\1\1\1\2\2\uffff\1\35\1"+
-            "\36\1\34\1\3",
-            "\1\43\1\40\1\uffff\1\37\1\46\1\uffff\1\44\5\uffff\1\45\4\uffff"+
-            "\5\45\16\uffff\1\41\1\42",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            ""
-    };
-
-    static final short[] DFA8_eot = DFA.unpackEncodedString(DFA8_eotS);
-    static final short[] DFA8_eof = DFA.unpackEncodedString(DFA8_eofS);
-    static final char[] DFA8_min = DFA.unpackEncodedStringToUnsignedChars(DFA8_minS);
-    static final char[] DFA8_max = DFA.unpackEncodedStringToUnsignedChars(DFA8_maxS);
-    static final short[] DFA8_accept = DFA.unpackEncodedString(DFA8_acceptS);
-    static final short[] DFA8_special = DFA.unpackEncodedString(DFA8_specialS);
-    static final short[][] DFA8_transition;
-
-    static {
-        int numStates = DFA8_transitionS.length;
-        DFA8_transition = new short[numStates][];
-        for (int i=0; i<numStates; i++) {
-            DFA8_transition[i] = DFA.unpackEncodedString(DFA8_transitionS[i]);
-        }
-    }
-
-    class DFA8 extends DFA {
-
-        public DFA8(BaseRecognizer recognizer) {
-            this.recognizer = recognizer;
-            this.decisionNumber = 8;
-            this.eot = DFA8_eot;
-            this.eof = DFA8_eof;
-            this.min = DFA8_min;
-            this.max = DFA8_max;
-            this.accept = DFA8_accept;
-            this.special = DFA8_special;
-            this.transition = DFA8_transition;
-        }
-        public String getDescription() {
-            return "328:1: valueExpression : ( columnReference -> columnReference | valueFunction -> valueFunction );";
-        }
-        public int specialStateTransition(int s, IntStream _input) throws NoViableAltException {
-            TokenStream input = (TokenStream)_input;
-        	int _s = s;
-            switch ( s ) {
-                    case 0 : 
-                        int LA8_1 = input.LA(1);
-
-                         
-                        int index8_1 = input.index();
-                        input.rewind();
-                        s = -1;
-                        if ( (LA8_1==DOT) ) {s = 31;}
-
-                        else if ( (LA8_1==AS) ) {s = 32;}
-
-                        else if ( (LA8_1==ID) ) {s = 33;}
-
-                        else if ( (LA8_1==DOUBLE_QUOTE) ) {s = 34;}
-
-                        else if ( (LA8_1==COMMA) ) {s = 35;}
-
-                        else if ( (LA8_1==FROM) ) {s = 36;}
-
-                        else if ( (LA8_1==EQUALS||(LA8_1>=NOTEQUALS && LA8_1<=GREATERTHANOREQUALS)) ) {s = 37;}
-
-                        else if ( (LA8_1==LPAREN) && ((strict == false))) {s = 38;}
-
-                         
-                        input.seek(index8_1);
-                        if ( s>=0 ) return s;
-                        break;
-                    case 1 : 
-                        int LA8_0 = input.LA(1);
-
-                         
-                        int index8_0 = input.index();
-                        input.rewind();
-                        s = -1;
-                        if ( (LA8_0==ID) ) {s = 1;}
-
-                        else if ( (LA8_0==DOUBLE_QUOTE) && ((strict == false))) {s = 2;}
-
-                        else if ( (LA8_0==SCORE) ) {s = 3;}
-
-                        else if ( (LA8_0==SELECT) && ((strict == false))) {s = 4;}
-
-                        else if ( (LA8_0==AS) && ((strict == false))) {s = 5;}
-
-                        else if ( (LA8_0==FROM) && ((strict == false))) {s = 6;}
-
-                        else if ( (LA8_0==JOIN) && ((strict == false))) {s = 7;}
-
-                        else if ( (LA8_0==INNER) && ((strict == false))) {s = 8;}
-
-                        else if ( (LA8_0==LEFT) && ((strict == false))) {s = 9;}
-
-                        else if ( (LA8_0==OUTER) && ((strict == false))) {s = 10;}
-
-                        else if ( (LA8_0==ON) && ((strict == false))) {s = 11;}
-
-                        else if ( (LA8_0==WHERE) && ((strict == false))) {s = 12;}
-
-                        else if ( (LA8_0==OR) && ((strict == false))) {s = 13;}
-
-                        else if ( (LA8_0==AND) && ((strict == false))) {s = 14;}
-
-                        else if ( (LA8_0==NOT) && ((strict == false))) {s = 15;}
-
-                        else if ( (LA8_0==IN) && ((strict == false))) {s = 16;}
-
-                        else if ( (LA8_0==LIKE) && ((strict == false))) {s = 17;}
-
-                        else if ( (LA8_0==IS) && ((strict == false))) {s = 18;}
-
-                        else if ( (LA8_0==NULL) && ((strict == false))) {s = 19;}
-
-                        else if ( (LA8_0==ANY) && ((strict == false))) {s = 20;}
-
-                        else if ( (LA8_0==CONTAINS) && ((strict == false))) {s = 21;}
-
-                        else if ( (LA8_0==IN_FOLDER) && ((strict == false))) {s = 22;}
-
-                        else if ( (LA8_0==IN_TREE) && ((strict == false))) {s = 23;}
-
-                        else if ( (LA8_0==ORDER) && ((strict == false))) {s = 24;}
-
-                        else if ( (LA8_0==BY) && ((strict == false))) {s = 25;}
-
-                        else if ( (LA8_0==ASC) && ((strict == false))) {s = 26;}
-
-                        else if ( (LA8_0==DESC) && ((strict == false))) {s = 27;}
-
-                        else if ( (LA8_0==TIMESTAMP) && ((strict == false))) {s = 28;}
-
-                        else if ( (LA8_0==TRUE) && ((strict == false))) {s = 29;}
-
-                        else if ( (LA8_0==FALSE) && ((strict == false))) {s = 30;}
-
-                         
-                        input.seek(index8_0);
-                        if ( s>=0 ) return s;
-                        break;
-            }
-            if (state.backtracking>0) {state.failed=true; return -1;}
-            NoViableAltException nvae =
-                new NoViableAltException(getDescription(), 8, _s, input);
-            error(nvae);
-            throw nvae;
-        }
-    }
-    static final String DFA9_eotS =
-        "\121\uffff";
-    static final String DFA9_eofS =
-        "\1\uffff\1\15\66\uffff\1\103\30\uffff";
-    static final String DFA9_minS =
-        "\1\106\1\42\1\40\30\uffff\35\107\1\42\30\uffff";
-    static final String DFA9_maxS =
-        "\2\107\1\115\30\uffff\36\107\30\uffff";
-    static final String DFA9_acceptS =
-        "\3\uffff\1\1\27\2\36\uffff\1\1\27\2";
-    static final String DFA9_specialS =
-        "\1\33\1\uffff\1\1\30\uffff\1\15\1\20\1\10\1\11\1\12\1\25\1\27\1"+
-        "\22\1\21\1\23\1\34\1\37\1\35\1\30\1\32\1\2\1\3\1\0\1\6\1\4\1\5\1"+
-        "\13\1\7\1\16\1\17\1\14\1\24\1\31\1\36\1\26\30\uffff}>";
-    static final String[] DFA9_transitionS = {
-            "\1\1\1\2",
-            "\1\7\1\4\1\uffff\1\3\1\uffff\1\22\1\10\1\21\1\17\1\20\1\uffff"+
-            "\1\16\1\11\1\13\1\30\1\27\1\23\5\12\1\24\1\25\1\26\5\uffff\1"+
-            "\14\1\uffff\1\31\1\32\2\uffff\1\5\1\6",
-            "\1\33\2\uffff\1\34\4\uffff\1\35\1\36\1\37\1\40\1\41\1\42\1"+
-            "\uffff\1\43\1\44\1\45\1\46\5\uffff\1\47\1\50\1\51\1\52\1\53"+
-            "\1\54\1\55\1\56\1\57\1\60\1\61\1\62\2\uffff\1\67\3\uffff\1\64"+
-            "\1\65\1\63\1\66",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "\1\70",
-            "\1\70",
-            "\1\70",
-            "\1\70",
-            "\1\70",
-            "\1\70",
-            "\1\70",
-            "\1\70",
-            "\1\70",
-            "\1\70",
-            "\1\70",
-            "\1\70",
-            "\1\70",
-            "\1\70",
-            "\1\70",
-            "\1\70",
-            "\1\70",
-            "\1\70",
-            "\1\70",
-            "\1\70",
-            "\1\70",
-            "\1\70",
-            "\1\70",
-            "\1\70",
-            "\1\70",
-            "\1\70",
-            "\1\70",
-            "\1\70",
-            "\1\70",
-            "\1\75\1\72\1\uffff\1\71\1\uffff\1\110\1\76\1\107\1\105\1\106"+
-            "\1\uffff\1\104\1\77\1\101\1\116\1\115\1\111\5\100\1\112\1\113"+
-            "\1\114\5\uffff\1\102\1\uffff\1\117\1\120\2\uffff\1\73\1\74",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            ""
-    };
-
-    static final short[] DFA9_eot = DFA.unpackEncodedString(DFA9_eotS);
-    static final short[] DFA9_eof = DFA.unpackEncodedString(DFA9_eofS);
-    static final char[] DFA9_min = DFA.unpackEncodedStringToUnsignedChars(DFA9_minS);
-    static final char[] DFA9_max = DFA.unpackEncodedStringToUnsignedChars(DFA9_maxS);
-    static final short[] DFA9_accept = DFA.unpackEncodedString(DFA9_acceptS);
-    static final short[] DFA9_special = DFA.unpackEncodedString(DFA9_specialS);
-    static final short[][] DFA9_transition;
-
-    static {
-        int numStates = DFA9_transitionS.length;
-        DFA9_transition = new short[numStates][];
-        for (int i=0; i<numStates; i++) {
-            DFA9_transition[i] = DFA.unpackEncodedString(DFA9_transitionS[i]);
-        }
-    }
-
-    class DFA9 extends DFA {
-
-        public DFA9(BaseRecognizer recognizer) {
-            this.recognizer = recognizer;
-            this.decisionNumber = 9;
-            this.eot = DFA9_eot;
-            this.eof = DFA9_eof;
-            this.min = DFA9_min;
-            this.max = DFA9_max;
-            this.accept = DFA9_accept;
-            this.special = DFA9_special;
-            this.transition = DFA9_transition;
-        }
-        public String getDescription() {
-            return "354:9: ( qualifier DOT )?";
-        }
-        public int specialStateTransition(int s, IntStream _input) throws NoViableAltException {
-            TokenStream input = (TokenStream)_input;
-        	int _s = s;
-            switch ( s ) {
-                    case 0 : 
-                        int LA9_44 = input.LA(1);
-
-                         
-                        int index9_44 = input.index();
-                        input.rewind();
-                        s = -1;
-                        if ( (LA9_44==DOUBLE_QUOTE) && ((strict == false))) {s = 56;}
-
-                         
-                        input.seek(index9_44);
-                        if ( s>=0 ) return s;
-                        break;
-                    case 1 : 
-                        int LA9_2 = input.LA(1);
-
-                         
-                        int index9_2 = input.index();
-                        input.rewind();
-                        s = -1;
-                        if ( (LA9_2==SELECT) && ((strict == false))) {s = 27;}
-
-                        else if ( (LA9_2==AS) && ((strict == false))) {s = 28;}
-
-                        else if ( (LA9_2==FROM) && ((strict == false))) {s = 29;}
-
-                        else if ( (LA9_2==JOIN) && ((strict == false))) {s = 30;}
-
-                        else if ( (LA9_2==INNER) && ((strict == false))) {s = 31;}
-
-                        else if ( (LA9_2==LEFT) && ((strict == false))) {s = 32;}
-
-                        else if ( (LA9_2==OUTER) && ((strict == false))) {s = 33;}
-
-                        else if ( (LA9_2==ON) && ((strict == false))) {s = 34;}
-
-                        else if ( (LA9_2==WHERE) && ((strict == false))) {s = 35;}
-
-                        else if ( (LA9_2==OR) && ((strict == false))) {s = 36;}
-
-                        else if ( (LA9_2==AND) && ((strict == false))) {s = 37;}
-
-                        else if ( (LA9_2==NOT) && ((strict == false))) {s = 38;}
-
-                        else if ( (LA9_2==IN) && ((strict == false))) {s = 39;}
-
-                        else if ( (LA9_2==LIKE) && ((strict == false))) {s = 40;}
-
-                        else if ( (LA9_2==IS) && ((strict == false))) {s = 41;}
-
-                        else if ( (LA9_2==NULL) && ((strict == false))) {s = 42;}
-
-                        else if ( (LA9_2==ANY) && ((strict == false))) {s = 43;}
-
-                        else if ( (LA9_2==CONTAINS) && ((strict == false))) {s = 44;}
-
-                        else if ( (LA9_2==IN_FOLDER) && ((strict == false))) {s = 45;}
-
-                        else if ( (LA9_2==IN_TREE) && ((strict == false))) {s = 46;}
-
-                        else if ( (LA9_2==ORDER) && ((strict == false))) {s = 47;}
-
-                        else if ( (LA9_2==BY) && ((strict == false))) {s = 48;}
-
-                        else if ( (LA9_2==ASC) && ((strict == false))) {s = 49;}
-
-                        else if ( (LA9_2==DESC) && ((strict == false))) {s = 50;}
-
-                        else if ( (LA9_2==TIMESTAMP) && ((strict == false))) {s = 51;}
-
-                        else if ( (LA9_2==TRUE) && ((strict == false))) {s = 52;}
-
-                        else if ( (LA9_2==FALSE) && ((strict == false))) {s = 53;}
-
-                        else if ( (LA9_2==SCORE) && ((strict == false))) {s = 54;}
-
-                        else if ( (LA9_2==ID) && ((strict == false))) {s = 55;}
-
-                         
-                        input.seek(index9_2);
-                        if ( s>=0 ) return s;
-                        break;
-                    case 2 : 
-                        int LA9_42 = input.LA(1);
-
-                         
-                        int index9_42 = input.index();
-                        input.rewind();
-                        s = -1;
-                        if ( (LA9_42==DOUBLE_QUOTE) && ((strict == false))) {s = 56;}
-
-                         
-                        input.seek(index9_42);
-                        if ( s>=0 ) return s;
-                        break;
-                    case 3 : 
-                        int LA9_43 = input.LA(1);
-
-                         
-                        int index9_43 = input.index();
-                        input.rewind();
-                        s = -1;
-                        if ( (LA9_43==DOUBLE_QUOTE) && ((strict == false))) {s = 56;}
-
-                         
-                        input.seek(index9_43);
-                        if ( s>=0 ) return s;
-                        break;
-                    case 4 : 
-                        int LA9_46 = input.LA(1);
-
-                         
-                        int index9_46 = input.index();
-                        input.rewind();
-                        s = -1;
-                        if ( (LA9_46==DOUBLE_QUOTE) && ((strict == false))) {s = 56;}
-
-                         
-                        input.seek(index9_46);
-                        if ( s>=0 ) return s;
-                        break;
-                    case 5 : 
-                        int LA9_47 = input.LA(1);
-
-                         
-                        int index9_47 = input.index();
-                        input.rewind();
-                        s = -1;
-                        if ( (LA9_47==DOUBLE_QUOTE) && ((strict == false))) {s = 56;}
-
-                         
-                        input.seek(index9_47);
-                        if ( s>=0 ) return s;
-                        break;
-                    case 6 : 
-                        int LA9_45 = input.LA(1);
-
-                         
-                        int index9_45 = input.index();
-                        input.rewind();
-                        s = -1;
-                        if ( (LA9_45==DOUBLE_QUOTE) && ((strict == false))) {s = 56;}
-
-                         
-                        input.seek(index9_45);
-                        if ( s>=0 ) return s;
-                        break;
-                    case 7 : 
-                        int LA9_49 = input.LA(1);
-
-                         
-                        int index9_49 = input.index();
-                        input.rewind();
-                        s = -1;
-                        if ( (LA9_49==DOUBLE_QUOTE) && ((strict == false))) {s = 56;}
-
-                         
-                        input.seek(index9_49);
-                        if ( s>=0 ) return s;
-                        break;
-                    case 8 : 
-                        int LA9_29 = input.LA(1);
-
-                         
-                        int index9_29 = input.index();
-                        input.rewind();
-                        s = -1;
-                        if ( (LA9_29==DOUBLE_QUOTE) && ((strict == false))) {s = 56;}
-
-                         
-                        input.seek(index9_29);
-                        if ( s>=0 ) return s;
-                        break;
-                    case 9 : 
-                        int LA9_30 = input.LA(1);
-
-                         
-                        int index9_30 = input.index();
-                        input.rewind();
-                        s = -1;
-                        if ( (LA9_30==DOUBLE_QUOTE) && ((strict == false))) {s = 56;}
-
-                         
-                        input.seek(index9_30);
-                        if ( s>=0 ) return s;
-                        break;
-                    case 10 : 
-                        int LA9_31 = input.LA(1);
-
-                         
-                        int index9_31 = input.index();
-                        input.rewind();
-                        s = -1;
-                        if ( (LA9_31==DOUBLE_QUOTE) && ((strict == false))) {s = 56;}
-
-                         
-                        input.seek(index9_31);
-                        if ( s>=0 ) return s;
-                        break;
-                    case 11 : 
-                        int LA9_48 = input.LA(1);
-
-                         
-                        int index9_48 = input.index();
-                        input.rewind();
-                        s = -1;
-                        if ( (LA9_48==DOUBLE_QUOTE) && ((strict == false))) {s = 56;}
-
-                         
-                        input.seek(index9_48);
-                        if ( s>=0 ) return s;
-                        break;
-                    case 12 : 
-                        int LA9_52 = input.LA(1);
-
-                         
-                        int index9_52 = input.index();
-                        input.rewind();
-                        s = -1;
-                        if ( (LA9_52==DOUBLE_QUOTE) && ((strict == false))) {s = 56;}
-
-                         
-                        input.seek(index9_52);
-                        if ( s>=0 ) return s;
-                        break;
-                    case 13 : 
-                        int LA9_27 = input.LA(1);
-
-                         
-                        int index9_27 = input.index();
-                        input.rewind();
-                        s = -1;
-                        if ( (LA9_27==DOUBLE_QUOTE) && ((strict == false))) {s = 56;}
-
-                         
-                        input.seek(index9_27);
-                        if ( s>=0 ) return s;
-                        break;
-                    case 14 : 
-                        int LA9_50 = input.LA(1);
-
-                         
-                        int index9_50 = input.index();
-                        input.rewind();
-                        s = -1;
-                        if ( (LA9_50==DOUBLE_QUOTE) && ((strict == false))) {s = 56;}
-
-                         
-                        input.seek(index9_50);
-                        if ( s>=0 ) return s;
-                        break;
-                    case 15 : 
-                        int LA9_51 = input.LA(1);
-
-                         
-                        int index9_51 = input.index();
-                        input.rewind();
-                        s = -1;
-                        if ( (LA9_51==DOUBLE_QUOTE) && ((strict == false))) {s = 56;}
-
-                         
-                        input.seek(index9_51);
-                        if ( s>=0 ) return s;
-                        break;
-                    case 16 : 
-                        int LA9_28 = input.LA(1);
-
-                         
-                        int index9_28 = input.index();
-                        input.rewind();
-                        s = -1;
-                        if ( (LA9_28==DOUBLE_QUOTE) && ((strict == false))) {s = 56;}
-
-                         
-                        input.seek(index9_28);
-                        if ( s>=0 ) return s;
-                        break;
-                    case 17 : 
-                        int LA9_35 = input.LA(1);
-
-                         
-                        int index9_35 = input.index();
-                        input.rewind();
-                        s = -1;
-                        if ( (LA9_35==DOUBLE_QUOTE) && ((strict == false))) {s = 56;}
-
-                         
-                        input.seek(index9_35);
-                        if ( s>=0 ) return s;
-                        break;
-                    case 18 : 
-                        int LA9_34 = input.LA(1);
-
-                         
-                        int index9_34 = input.index();
-                        input.rewind();
-                        s = -1;
-                        if ( (LA9_34==DOUBLE_QUOTE) && ((strict == false))) {s = 56;}
-
-                         
-                        input.seek(index9_34);
-                        if ( s>=0 ) return s;
-                        break;
-                    case 19 : 
-                        int LA9_36 = input.LA(1);
-
-                         
-                        int index9_36 = input.index();
-                        input.rewind();
-                        s = -1;
-                        if ( (LA9_36==DOUBLE_QUOTE) && ((strict == false))) {s = 56;}
-
-                         
-                        input.seek(index9_36);
-                        if ( s>=0 ) return s;
-                        break;
-                    case 20 : 
-                        int LA9_53 = input.LA(1);
-
-                         
-                        int index9_53 = input.index();
-                        input.rewind();
-                        s = -1;
-                        if ( (LA9_53==DOUBLE_QUOTE) && ((strict == false))) {s = 56;}
-
-                         
-                        input.seek(index9_53);
-                        if ( s>=0 ) return s;
-                        break;
-                    case 21 : 
-                        int LA9_32 = input.LA(1);
-
-                         
-                        int index9_32 = input.index();
-                        input.rewind();
-                        s = -1;
-                        if ( (LA9_32==DOUBLE_QUOTE) && ((strict == false))) {s = 56;}
-
-                         
-                        input.seek(index9_32);
-                        if ( s>=0 ) return s;
-                        break;
-                    case 22 : 
-                        int LA9_56 = input.LA(1);
-
-                         
-                        int index9_56 = input.index();
-                        input.rewind();
-                        s = -1;
-                        if ( (LA9_56==DOT) && ((strict == false))) {s = 57;}
-
-                        else if ( (LA9_56==AS) && ((strict == false))) {s = 58;}
-
-                        else if ( (LA9_56==ID) && ((strict == false))) {s = 59;}
-
-                        else if ( (LA9_56==DOUBLE_QUOTE) && ((strict == false))) {s = 60;}
-
-                        else if ( (LA9_56==COMMA) && ((strict == false))) {s = 61;}
-
-                        else if ( (LA9_56==FROM) && ((strict == false))) {s = 62;}
-
-                        else if ( (LA9_56==EQUALS) && ((strict == false))) {s = 63;}
-
-                        else if ( ((LA9_56>=NOTEQUALS && LA9_56<=GREATERTHANOREQUALS)) && ((strict == false))) {s = 64;}
-
-                        else if ( (LA9_56==WHERE) && ((strict == false))) {s = 65;}
-
-                        else if ( (LA9_56==ORDER) && ((strict == false))) {s = 66;}
-
-                        else if ( (LA9_56==EOF) && ((strict == false))) {s = 67;}
-
-                        else if ( (LA9_56==ON) && ((strict == false))) {s = 68;}
-
-                        else if ( (LA9_56==INNER) && ((strict == false))) {s = 69;}
-
-                        else if ( (LA9_56==LEFT) && ((strict == false))) {s = 70;}
-
-                        else if ( (LA9_56==JOIN) && ((strict == false))) {s = 71;}
-
-                        else if ( (LA9_56==RPAREN) && ((strict == false))) {s = 72;}
-
-                        else if ( (LA9_56==NOT) && ((strict == false))) {s = 73;}
-
-                        else if ( (LA9_56==IN) && ((strict == false))) {s = 74;}
-
-                        else if ( (LA9_56==LIKE) && ((strict == false))) {s = 75;}
-
-                        else if ( (LA9_56==IS) && ((strict == false))) {s = 76;}
-
-                        else if ( (LA9_56==AND) && ((strict == false))) {s = 77;}
-
-                        else if ( (LA9_56==OR) && ((strict == false))) {s = 78;}
-
-                        else if ( (LA9_56==ASC) && ((strict == false))) {s = 79;}
-
-                        else if ( (LA9_56==DESC) && ((strict == false))) {s = 80;}
-
-                         
-                        input.seek(index9_56);
-                        if ( s>=0 ) return s;
-                        break;
-                    case 23 : 
-                        int LA9_33 = input.LA(1);
-
-                         
-                        int index9_33 = input.index();
-                        input.rewind();
-                        s = -1;
-                        if ( (LA9_33==DOUBLE_QUOTE) && ((strict == false))) {s = 56;}
-
-                         
-                        input.seek(index9_33);
-                        if ( s>=0 ) return s;
-                        break;
-                    case 24 : 
-                        int LA9_40 = input.LA(1);
-
-                         
-                        int index9_40 = input.index();
-                        input.rewind();
-                        s = -1;
-                        if ( (LA9_40==DOUBLE_QUOTE) && ((strict == false))) {s = 56;}
-
-                         
-                        input.seek(index9_40);
-                        if ( s>=0 ) return s;
-                        break;
-                    case 25 : 
-                        int LA9_54 = input.LA(1);
-
-                         
-                        int index9_54 = input.index();
-                        input.rewind();
-                        s = -1;
-                        if ( (LA9_54==DOUBLE_QUOTE) && ((strict == false))) {s = 56;}
-
-                         
-                        input.seek(index9_54);
-                        if ( s>=0 ) return s;
-                        break;
-                    case 26 : 
-                        int LA9_41 = input.LA(1);
-
-                         
-                        int index9_41 = input.index();
-                        input.rewind();
-                        s = -1;
-                        if ( (LA9_41==DOUBLE_QUOTE) && ((strict == false))) {s = 56;}
-
-                         
-                        input.seek(index9_41);
-                        if ( s>=0 ) return s;
-                        break;
-                    case 27 : 
-                        int LA9_0 = input.LA(1);
-
-                         
-                        int index9_0 = input.index();
-                        input.rewind();
-                        s = -1;
-                        if ( (LA9_0==ID) ) {s = 1;}
-
-                        else if ( (LA9_0==DOUBLE_QUOTE) && ((strict == false))) {s = 2;}
-
-                         
-                        input.seek(index9_0);
-                        if ( s>=0 ) return s;
-                        break;
-                    case 28 : 
-                        int LA9_37 = input.LA(1);
-
-                         
-                        int index9_37 = input.index();
-                        input.rewind();
-                        s = -1;
-                        if ( (LA9_37==DOUBLE_QUOTE) && ((strict == false))) {s = 56;}
-
-                         
-                        input.seek(index9_37);
-                        if ( s>=0 ) return s;
-                        break;
-                    case 29 : 
-                        int LA9_39 = input.LA(1);
-
-                         
-                        int index9_39 = input.index();
-                        input.rewind();
-                        s = -1;
-                        if ( (LA9_39==DOUBLE_QUOTE) && ((strict == false))) {s = 56;}
-
-                         
-                        input.seek(index9_39);
-                        if ( s>=0 ) return s;
-                        break;
-                    case 30 : 
-                        int LA9_55 = input.LA(1);
-
-                         
-                        int index9_55 = input.index();
-                        input.rewind();
-                        s = -1;
-                        if ( (LA9_55==DOUBLE_QUOTE) && ((strict == false))) {s = 56;}
-
-                         
-                        input.seek(index9_55);
-                        if ( s>=0 ) return s;
-                        break;
-                    case 31 : 
-                        int LA9_38 = input.LA(1);
-
-                         
-                        int index9_38 = input.index();
-                        input.rewind();
-                        s = -1;
-                        if ( (LA9_38==DOUBLE_QUOTE) && ((strict == false))) {s = 56;}
-
-                         
-                        input.seek(index9_38);
-                        if ( s>=0 ) return s;
-                        break;
-            }
-            if (state.backtracking>0) {state.failed=true; return -1;}
-            NoViableAltException nvae =
-                new NoViableAltException(getDescription(), 9, _s, input);
-            error(nvae);
-            throw nvae;
-        }
-    }
-    static final String DFA12_eotS =
-        "\u0096\uffff";
-    static final String DFA12_eofS =
-        "\u0096\uffff";
-    static final String DFA12_minS =
-        "\1\40\1\46\34\uffff\1\47\1\45\1\40\5\47\1\105\1\106\1\0\1\106\1"+
-        "\0\35\107\5\0\2\47\1\40\1\uffff\1\47\1\40\1\45\2\0\35\107\1\0\35"+
-        "\107\1\0\2\47\2\0";
-    static final String DFA12_maxS =
-        "\1\115\1\46\34\uffff\2\114\1\115\5\114\1\105\1\107\1\0\1\107\1"+
-        "\0\35\107\5\0\2\114\1\115\1\uffff\1\114\1\115\1\114\2\0\35\107\1"+
-        "\0\35\107\1\0\2\114\2\0";
-    static final String DFA12_acceptS =
-        "\2\uffff\34\2\62\uffff\1\1\105\uffff";
-    static final String DFA12_specialS =
-        "\1\15\47\uffff\1\5\1\uffff\1\4\35\uffff\1\6\1\7\1\10\1\11\1\12"+
-        "\7\uffff\1\13\1\14\35\uffff\1\3\35\uffff\1\2\2\uffff\1\1\1\0}>";
-    static final String[] DFA12_transitionS = {
-            "\1\2\2\uffff\1\3\4\uffff\1\4\1\5\1\6\1\7\1\10\1\11\1\uffff"+
-            "\1\12\1\13\1\14\1\15\5\uffff\1\16\1\17\1\20\1\21\1\22\1\23\1"+
-            "\24\1\25\1\26\1\27\1\30\1\31\2\uffff\1\35\3\uffff\1\33\1\34"+
-            "\1\32\1\1",
-            "\1\36",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "\1\50\34\uffff\1\47\1\43\1\37\1\40\1\41\1\42\1\44\1\45\1\46",
-            "\1\51\1\uffff\1\52\34\uffff\1\47\1\43\1\37\1\40\1\41\1\42"+
-            "\1\44\1\45\1\46",
-            "\1\53\2\uffff\1\54\4\uffff\1\55\1\56\1\57\1\60\1\61\1\62\1"+
-            "\uffff\1\63\1\64\1\65\1\66\5\uffff\1\67\1\70\1\71\1\72\1\73"+
-            "\1\74\1\75\1\76\1\77\1\100\1\101\1\102\2\uffff\1\107\3\uffff"+
-            "\1\104\1\105\1\103\1\106",
-            "\1\110\34\uffff\1\47\1\43\1\37\1\40\1\41\1\42\1\44\1\45\1"+
-            "\46",
-            "\1\111\34\uffff\1\47\1\43\1\37\1\40\1\41\1\42\1\44\1\45\1"+
-            "\46",
-            "\1\112\34\uffff\1\47\1\43\1\37\1\40\1\41\1\42\1\44\1\45\1"+
-            "\46",
-            "\1\113\34\uffff\1\47\1\43\1\37\1\40\1\41\1\42\1\44\1\45\1"+
-            "\46",
-            "\1\114\34\uffff\1\47\1\43\1\37\1\40\1\41\1\42\1\44\1\45\1"+
-            "\46",
-            "\1\115",
-            "\1\116\1\117",
-            "\1\uffff",
-            "\1\121\1\122",
-            "\1\uffff",
-            "\1\123",
-            "\1\123",
-            "\1\123",
-            "\1\123",
-            "\1\123",
-            "\1\123",
-            "\1\123",
-            "\1\123",
-            "\1\123",
-            "\1\123",
-            "\1\123",
-            "\1\123",
-            "\1\123",
-            "\1\123",
-            "\1\123",
-            "\1\123",
-            "\1\123",
-            "\1\123",
-            "\1\123",
-            "\1\123",
-            "\1\123",
-            "\1\123",
-            "\1\123",
-            "\1\123",
-            "\1\123",
-            "\1\123",
-            "\1\123",
-            "\1\123",
-            "\1\123",
-            "\1\uffff",
-            "\1\uffff",
-            "\1\uffff",
-            "\1\uffff",
-            "\1\uffff",
-            "\1\124\34\uffff\1\47\1\43\1\37\1\40\1\41\1\42\1\44\1\45\1"+
-            "\46",
-            "\1\125\34\uffff\1\47\1\43\1\37\1\40\1\41\1\42\1\44\1\45\1"+
-            "\46",
-            "\1\126\2\uffff\1\127\4\uffff\1\130\1\131\1\132\1\133\1\134"+
-            "\1\135\1\uffff\1\136\1\137\1\140\1\141\5\uffff\1\142\1\143\1"+
-            "\144\1\145\1\146\1\147\1\150\1\151\1\152\1\153\1\154\1\155\2"+
-            "\uffff\1\162\3\uffff\1\157\1\160\1\156\1\161",
-            "",
-            "\1\163\34\uffff\1\47\1\43\1\37\1\40\1\41\1\42\1\44\1\45\1"+
-            "\46",
-            "\1\164\2\uffff\1\165\4\uffff\1\166\1\167\1\170\1\171\1\172"+
-            "\1\173\1\uffff\1\174\1\175\1\176\1\177\5\uffff\1\u0080\1\u0081"+
-            "\1\u0082\1\u0083\1\u0084\1\u0085\1\u0086\1\u0087\1\u0088\1\u0089"+
-            "\1\u008a\1\u008b\2\uffff\1\u0090\3\uffff\1\u008d\1\u008e\1\u008c"+
-            "\1\u008f",
-            "\1\51\1\uffff\1\u0091\34\uffff\1\47\1\43\1\37\1\40\1\41\1"+
-            "\42\1\44\1\45\1\46",
-            "\1\uffff",
-            "\1\uffff",
-            "\1\u0092",
-            "\1\u0092",
-            "\1\u0092",
-            "\1\u0092",
-            "\1\u0092",
-            "\1\u0092",
-            "\1\u0092",
-            "\1\u0092",
-            "\1\u0092",
-            "\1\u0092",
-            "\1\u0092",
-            "\1\u0092",
-            "\1\u0092",
-            "\1\u0092",
-            "\1\u0092",
-            "\1\u0092",
-            "\1\u0092",
-            "\1\u0092",
-            "\1\u0092",
-            "\1\u0092",
-            "\1\u0092",
-            "\1\u0092",
-            "\1\u0092",
-            "\1\u0092",
-            "\1\u0092",
-            "\1\u0092",
-            "\1\u0092",
-            "\1\u0092",
-            "\1\u0092",
-            "\1\uffff",
-            "\1\u0093",
-            "\1\u0093",
-            "\1\u0093",
-            "\1\u0093",
-            "\1\u0093",
-            "\1\u0093",
-            "\1\u0093",
-            "\1\u0093",
-            "\1\u0093",
-            "\1\u0093",
-            "\1\u0093",
-            "\1\u0093",
-            "\1\u0093",
-            "\1\u0093",
-            "\1\u0093",
-            "\1\u0093",
-            "\1\u0093",
-            "\1\u0093",
-            "\1\u0093",
-            "\1\u0093",
-            "\1\u0093",
-            "\1\u0093",
-            "\1\u0093",
-            "\1\u0093",
-            "\1\u0093",
-            "\1\u0093",
-            "\1\u0093",
-            "\1\u0093",
-            "\1\u0093",
-            "\1\uffff",
-            "\1\u0094\34\uffff\1\47\1\43\1\37\1\40\1\41\1\42\1\44\1\45"+
-            "\1\46",
-            "\1\u0095\34\uffff\1\47\1\43\1\37\1\40\1\41\1\42\1\44\1\45"+
-            "\1\46",
-            "\1\uffff",
-            "\1\uffff"
-    };
-
-    static final short[] DFA12_eot = DFA.unpackEncodedString(DFA12_eotS);
-    static final short[] DFA12_eof = DFA.unpackEncodedString(DFA12_eofS);
-    static final char[] DFA12_min = DFA.unpackEncodedStringToUnsignedChars(DFA12_minS);
-    static final char[] DFA12_max = DFA.unpackEncodedStringToUnsignedChars(DFA12_maxS);
-    static final short[] DFA12_accept = DFA.unpackEncodedString(DFA12_acceptS);
-    static final short[] DFA12_special = DFA.unpackEncodedString(DFA12_specialS);
-    static final short[][] DFA12_transition;
-
-    static {
-        int numStates = DFA12_transitionS.length;
-        DFA12_transition = new short[numStates][];
-        for (int i=0; i<numStates; i++) {
-            DFA12_transition[i] = DFA.unpackEncodedString(DFA12_transitionS[i]);
-        }
-    }
-
-    class DFA12 extends DFA {
-
-        public DFA12(BaseRecognizer recognizer) {
-            this.recognizer = recognizer;
-            this.decisionNumber = 12;
-            this.eot = DFA12_eot;
-            this.eof = DFA12_eof;
-            this.min = DFA12_min;
-            this.max = DFA12_max;
-            this.accept = DFA12_accept;
-            this.special = DFA12_special;
-            this.transition = DFA12_transition;
-        }
-        public String getDescription() {
-            return "359:1: valueFunction : (cmisFunctionName= cmisFunction LPAREN ( functionArgument )* RPAREN -> ^( FUNCTION $cmisFunctionName LPAREN ( functionArgument )* RPAREN ) | {...}? =>functionName= keyWordOrId LPAREN ( functionArgument )* RPAREN -> ^( FUNCTION $functionName LPAREN ( functionArgument )* RPAREN ) );";
-        }
-        public int specialStateTransition(int s, IntStream _input) throws NoViableAltException {
-            TokenStream input = (TokenStream)_input;
-        	int _s = s;
-            switch ( s ) {
-                    case 0 : 
-                        int LA12_149 = input.LA(1);
-
-                         
-                        int index12_149 = input.index();
-                        input.rewind();
-                        s = -1;
-                        if ( (!(((strict == false)))) ) {s = 80;}
-
-                        else if ( ((strict == false)) ) {s = 29;}
-
-                         
-                        input.seek(index12_149);
-                        if ( s>=0 ) return s;
-                        break;
-                    case 1 : 
-                        int LA12_148 = input.LA(1);
-
-                         
-                        int index12_148 = input.index();
-                        input.rewind();
-                        s = -1;
-                        if ( (!(((strict == false)))) ) {s = 80;}
-
-                        else if ( ((strict == false)) ) {s = 29;}
-
-                         
-                        input.seek(index12_148);
-                        if ( s>=0 ) return s;
-                        break;
-                    case 2 : 
-                        int LA12_145 = input.LA(1);
-
-                         
-                        int index12_145 = input.index();
-                        input.rewind();
-                        s = -1;
-                        if ( (!(((strict == false)))) ) {s = 80;}
-
-                        else if ( ((strict == false)) ) {s = 29;}
-
-                         
-                        input.seek(index12_145);
-                        if ( s>=0 ) return s;
-                        break;
-                    case 3 : 
-                        int LA12_115 = input.LA(1);
-
-                         
-                        int index12_115 = input.index();
-                        input.rewind();
-                        s = -1;
-                        if ( (!(((strict == false)))) ) {s = 80;}
-
-                        else if ( ((strict == false)) ) {s = 29;}
-
-                         
-                        input.seek(index12_115);
-                        if ( s>=0 ) return s;
-                        break;
-                    case 4 : 
-                        int LA12_42 = input.LA(1);
-
-                         
-                        int index12_42 = input.index();
-                        input.rewind();
-                        s = -1;
-                        if ( (!(((strict == false)))) ) {s = 80;}
-
-                        else if ( ((strict == false)) ) {s = 29;}
-
-                         
-                        input.seek(index12_42);
-                        if ( s>=0 ) return s;
-                        break;
-                    case 5 : 
-                        int LA12_40 = input.LA(1);
-
-                         
-                        int index12_40 = input.index();
-                        input.rewind();
-                        s = -1;
-                        if ( (!(((strict == false)))) ) {s = 80;}
-
-                        else if ( ((strict == false)) ) {s = 29;}
-
-                         
-                        input.seek(index12_40);
-                        if ( s>=0 ) return s;
-                        break;
-                    case 6 : 
-                        int LA12_72 = input.LA(1);
-
-                         
-                        int index12_72 = input.index();
-                        input.rewind();
-                        s = -1;
-                        if ( (!(((strict == false)))) ) {s = 80;}
-
-                        else if ( ((strict == false)) ) {s = 29;}
-
-                         
-                        input.seek(index12_72);
-                        if ( s>=0 ) return s;
-                        break;
-                    case 7 : 
-                        int LA12_73 = input.LA(1);
-
-                         
-                        int index12_73 = input.index();
-                        input.rewind();
-                        s = -1;
-                        if ( (!(((strict == false)))) ) {s = 80;}
-
-                        else if ( ((strict == false)) ) {s = 29;}
-
-                         
-                        input.seek(index12_73);
-                        if ( s>=0 ) return s;
-                        break;
-                    case 8 : 
-                        int LA12_74 = input.LA(1);
-
-                         
-                        int index12_74 = input.index();
-                        input.rewind();
-                        s = -1;
-                        if ( (!(((strict == false)))) ) {s = 80;}
-
-                        else if ( ((strict == false)) ) {s = 29;}
-
-                         
-                        input.seek(index12_74);
-                        if ( s>=0 ) return s;
-                        break;
-                    case 9 : 
-                        int LA12_75 = input.LA(1);
-
-                         
-                        int index12_75 = input.index();
-                        input.rewind();
-                        s = -1;
-                        if ( (!(((strict == false)))) ) {s = 80;}
-
-                        else if ( ((strict == false)) ) {s = 29;}
-
-                         
-                        input.seek(index12_75);
-                        if ( s>=0 ) return s;
-                        break;
-                    case 10 : 
-                        int LA12_76 = input.LA(1);
-
-                         
-                        int index12_76 = input.index();
-                        input.rewind();
-                        s = -1;
-                        if ( (!(((strict == false)))) ) {s = 80;}
-
-                        else if ( ((strict == false)) ) {s = 29;}
-
-                         
-                        input.seek(index12_76);
-                        if ( s>=0 ) return s;
-                        break;
-                    case 11 : 
-                        int LA12_84 = input.LA(1);
-
-                         
-                        int index12_84 = input.index();
-                        input.rewind();
-                        s = -1;
-                        if ( (!(((strict == false)))) ) {s = 80;}
-
-                        else if ( ((strict == false)) ) {s = 29;}
-
-                         
-                        input.seek(index12_84);
-                        if ( s>=0 ) return s;
-                        break;
-                    case 12 : 
-                        int LA12_85 = input.LA(1);
-
-                         
-                        int index12_85 = input.index();
-                        input.rewind();
-                        s = -1;
-                        if ( (!(((strict == false)))) ) {s = 80;}
-
-                        else if ( ((strict == false)) ) {s = 29;}
-
-                         
-                        input.seek(index12_85);
-                        if ( s>=0 ) return s;
-                        break;
-                    case 13 : 
-                        int LA12_0 = input.LA(1);
-
-                         
-                        int index12_0 = input.index();
-                        input.rewind();
-                        s = -1;
-                        if ( (LA12_0==SCORE) ) {s = 1;}
-
-                        else if ( (LA12_0==SELECT) && ((strict == false))) {s = 2;}
-
-                        else if ( (LA12_0==AS) && ((strict == false))) {s = 3;}
-
-                        else if ( (LA12_0==FROM) && ((strict == false))) {s = 4;}
-
-                        else if ( (LA12_0==JOIN) && ((strict == false))) {s = 5;}
-
-                        else if ( (LA12_0==INNER) && ((strict == false))) {s = 6;}
-
-                        else if ( (LA12_0==LEFT) && ((strict == false))) {s = 7;}
-
-                        else if ( (LA12_0==OUTER) && ((strict == false))) {s = 8;}
-
-                        else if ( (LA12_0==ON) && ((strict == false))) {s = 9;}
-
-                        else if ( (LA12_0==WHERE) && ((strict == false))) {s = 10;}
-
-                        else if ( (LA12_0==OR) && ((strict == false))) {s = 11;}
-
-                        else if ( (LA12_0==AND) && ((strict == false))) {s = 12;}
-
-                        else if ( (LA12_0==NOT) && ((strict == false))) {s = 13;}
-
-                        else if ( (LA12_0==IN) && ((strict == false))) {s = 14;}
-
-                        else if ( (LA12_0==LIKE) && ((strict == false))) {s = 15;}
-
-                        else if ( (LA12_0==IS) && ((strict == false))) {s = 16;}
-
-                        else if ( (LA12_0==NULL) && ((strict == false))) {s = 17;}
-
-                        else if ( (LA12_0==ANY) && ((strict == false))) {s = 18;}
-
-                        else if ( (LA12_0==CONTAINS) && ((strict == false))) {s = 19;}
-
-                        else if ( (LA12_0==IN_FOLDER) && ((strict == false))) {s = 20;}
-
-                        else if ( (LA12_0==IN_TREE) && ((strict == false))) {s = 21;}
-
-                        else if ( (LA12_0==ORDER) && ((strict == false))) {s = 22;}
-
-                        else if ( (LA12_0==BY) && ((strict == false))) {s = 23;}
-
-                        else if ( (LA12_0==ASC) && ((strict == false))) {s = 24;}
-
-                        else if ( (LA12_0==DESC) && ((strict == false))) {s = 25;}
-
-                        else if ( (LA12_0==TIMESTAMP) && ((strict == false))) {s = 26;}
-
-                        else if ( (LA12_0==TRUE) && ((strict == false))) {s = 27;}
-
-                        else if ( (LA12_0==FALSE) && ((strict == false))) {s = 28;}
-
-                        else if ( (LA12_0==ID) && ((strict == false))) {s = 29;}
-
-                         
-                        input.seek(index12_0);
-                        if ( s>=0 ) return s;
-                        break;
-            }
-            if (state.backtracking>0) {state.failed=true; return -1;}
-            NoViableAltException nvae =
-                new NoViableAltException(getDescription(), 12, _s, input);
-            error(nvae);
-            throw nvae;
-        }
-    }
-    static final String DFA10_eotS =
-        "\13\uffff";
-    static final String DFA10_eofS =
-        "\13\uffff";
-    static final String DFA10_minS =
-        "\1\47\12\uffff";
-    static final String DFA10_maxS =
-        "\1\114\12\uffff";
-    static final String DFA10_acceptS =
-        "\1\uffff\1\2\11\1";
-    static final String DFA10_specialS =
-        "\1\0\12\uffff}>";
-    static final String[] DFA10_transitionS = {
-            "\1\1\34\uffff\1\12\1\6\1\2\1\3\1\4\1\5\1\7\1\10\1\11",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            ""
-    };
-
-    static final short[] DFA10_eot = DFA.unpackEncodedString(DFA10_eotS);
-    static final short[] DFA10_eof = DFA.unpackEncodedString(DFA10_eofS);
-    static final char[] DFA10_min = DFA.unpackEncodedStringToUnsignedChars(DFA10_minS);
-    static final char[] DFA10_max = DFA.unpackEncodedStringToUnsignedChars(DFA10_maxS);
-    static final short[] DFA10_accept = DFA.unpackEncodedString(DFA10_acceptS);
-    static final short[] DFA10_special = DFA.unpackEncodedString(DFA10_specialS);
-    static final short[][] DFA10_transition;
-
-    static {
-        int numStates = DFA10_transitionS.length;
-        DFA10_transition = new short[numStates][];
-        for (int i=0; i<numStates; i++) {
-            DFA10_transition[i] = DFA.unpackEncodedString(DFA10_transitionS[i]);
-        }
-    }
-
-    class DFA10 extends DFA {
-
-        public DFA10(BaseRecognizer recognizer) {
-            this.recognizer = recognizer;
-            this.decisionNumber = 10;
-            this.eot = DFA10_eot;
-            this.eof = DFA10_eof;
-            this.min = DFA10_min;
-            this.max = DFA10_max;
-            this.accept = DFA10_accept;
-            this.special = DFA10_special;
-            this.transition = DFA10_transition;
-        }
-        public String getDescription() {
-            return "()* loopback of 369:46: ( functionArgument )*";
-        }
-        public int specialStateTransition(int s, IntStream _input) throws NoViableAltException {
-            TokenStream input = (TokenStream)_input;
-        	int _s = s;
-            switch ( s ) {
-                    case 0 : 
-                        int LA10_0 = input.LA(1);
-
-                         
-                        int index10_0 = input.index();
-                        input.rewind();
-                        s = -1;
-                        if ( (LA10_0==RPAREN) ) {s = 1;}
-
-                        else if ( (LA10_0==ID) ) {s = 2;}
-
-                        else if ( (LA10_0==DOUBLE_QUOTE) && ((strict == false))) {s = 3;}
-
-                        else if ( (LA10_0==FLOATING_POINT_LITERAL) ) {s = 4;}
-
-                        else if ( (LA10_0==DECIMAL_INTEGER_LITERAL) ) {s = 5;}
-
-                        else if ( (LA10_0==QUOTED_STRING) ) {s = 6;}
-
-                        else if ( (LA10_0==TRUE) ) {s = 7;}
-
-                        else if ( (LA10_0==FALSE) ) {s = 8;}
-
-                        else if ( (LA10_0==TIMESTAMP) ) {s = 9;}
-
-                        else if ( (LA10_0==COLON) && ((strict == false))) {s = 10;}
-
-                         
-                        input.seek(index10_0);
-                        if ( s>=0 ) return s;
-                        break;
-            }
-            if (state.backtracking>0) {state.failed=true; return -1;}
-            NoViableAltException nvae =
-                new NoViableAltException(getDescription(), 10, _s, input);
-            error(nvae);
-            throw nvae;
-        }
-    }
-    static final String DFA11_eotS =
-        "\13\uffff";
-    static final String DFA11_eofS =
-        "\13\uffff";
-    static final String DFA11_minS =
-        "\1\47\12\uffff";
-    static final String DFA11_maxS =
-        "\1\114\12\uffff";
-    static final String DFA11_acceptS =
-        "\1\uffff\1\2\11\1";
-    static final String DFA11_specialS =
-        "\1\0\12\uffff}>";
-    static final String[] DFA11_transitionS = {
-            "\1\1\34\uffff\1\12\1\6\1\2\1\3\1\4\1\5\1\7\1\10\1\11",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            ""
-    };
-
-    static final short[] DFA11_eot = DFA.unpackEncodedString(DFA11_eotS);
-    static final short[] DFA11_eof = DFA.unpackEncodedString(DFA11_eofS);
-    static final char[] DFA11_min = DFA.unpackEncodedStringToUnsignedChars(DFA11_minS);
-    static final char[] DFA11_max = DFA.unpackEncodedStringToUnsignedChars(DFA11_maxS);
-    static final short[] DFA11_accept = DFA.unpackEncodedString(DFA11_acceptS);
-    static final short[] DFA11_special = DFA.unpackEncodedString(DFA11_specialS);
-    static final short[][] DFA11_transition;
-
-    static {
-        int numStates = DFA11_transitionS.length;
-        DFA11_transition = new short[numStates][];
-        for (int i=0; i<numStates; i++) {
-            DFA11_transition[i] = DFA.unpackEncodedString(DFA11_transitionS[i]);
-        }
-    }
-
-    class DFA11 extends DFA {
-
-        public DFA11(BaseRecognizer recognizer) {
-            this.recognizer = recognizer;
-            this.decisionNumber = 11;
-            this.eot = DFA11_eot;
-            this.eof = DFA11_eof;
-            this.min = DFA11_min;
-            this.max = DFA11_max;
-            this.accept = DFA11_accept;
-            this.special = DFA11_special;
-            this.transition = DFA11_transition;
-        }
-        public String getDescription() {
-            return "()* loopback of 372:64: ( functionArgument )*";
-        }
-        public int specialStateTransition(int s, IntStream _input) throws NoViableAltException {
-            TokenStream input = (TokenStream)_input;
-        	int _s = s;
-            switch ( s ) {
-                    case 0 : 
-                        int LA11_0 = input.LA(1);
-
-                         
-                        int index11_0 = input.index();
-                        input.rewind();
-                        s = -1;
-                        if ( (LA11_0==RPAREN) ) {s = 1;}
-
-                        else if ( (LA11_0==ID) ) {s = 2;}
-
-                        else if ( (LA11_0==DOUBLE_QUOTE) && ((strict == false))) {s = 3;}
-
-                        else if ( (LA11_0==FLOATING_POINT_LITERAL) ) {s = 4;}
-
-                        else if ( (LA11_0==DECIMAL_INTEGER_LITERAL) ) {s = 5;}
-
-                        else if ( (LA11_0==QUOTED_STRING) ) {s = 6;}
-
-                        else if ( (LA11_0==TRUE) ) {s = 7;}
-
-                        else if ( (LA11_0==FALSE) ) {s = 8;}
-
-                        else if ( (LA11_0==TIMESTAMP) ) {s = 9;}
-
-                        else if ( (LA11_0==COLON) && ((strict == false))) {s = 10;}
-
-                         
-                        input.seek(index11_0);
-                        if ( s>=0 ) return s;
-                        break;
-            }
-            if (state.backtracking>0) {state.failed=true; return -1;}
-            NoViableAltException nvae =
-                new NoViableAltException(getDescription(), 11, _s, input);
-            error(nvae);
-            throw nvae;
-        }
-    }
-    static final String DFA13_eotS =
-        "\76\uffff";
-    static final String DFA13_eofS =
-        "\76\uffff";
-    static final String DFA13_minS =
-        "\1\104\1\45\1\40\22\uffff\35\107\1\45\13\uffff";
-    static final String DFA13_maxS =
-        "\2\114\1\115\22\uffff\35\107\1\114\13\uffff";
-    static final String DFA13_acceptS =
-        "\3\uffff\7\3\1\1\12\2\36\uffff\1\1\12\2";
-    static final String DFA13_specialS =
-        "\1\7\1\uffff\1\1\22\uffff\1\16\1\21\1\12\1\13\1\14\1\27\1\30\1"+
-        "\24\1\23\1\25\1\34\1\37\1\35\1\31\1\33\1\2\1\3\1\0\1\6\1\4\1\5\1"+
-        "\15\1\10\1\20\1\22\1\17\1\26\1\32\1\36\1\11\13\uffff}>";
-    static final String[] DFA13_transitionS = {
-            "\1\11\1\5\1\1\1\2\1\3\1\4\1\6\1\7\1\10",
-            "\1\12\1\uffff\1\13\34\uffff\1\24\1\20\1\14\1\15\1\16\1\17"+
-            "\1\21\1\22\1\23",
-            "\1\25\2\uffff\1\26\4\uffff\1\27\1\30\1\31\1\32\1\33\1\34\1"+
-            "\uffff\1\35\1\36\1\37\1\40\5\uffff\1\41\1\42\1\43\1\44\1\45"+
-            "\1\46\1\47\1\50\1\51\1\52\1\53\1\54\2\uffff\1\61\3\uffff\1\56"+
-            "\1\57\1\55\1\60",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "\1\62",
-            "\1\62",
-            "\1\62",
-            "\1\62",
-            "\1\62",
-            "\1\62",
-            "\1\62",
-            "\1\62",
-            "\1\62",
-            "\1\62",
-            "\1\62",
-            "\1\62",
-            "\1\62",
-            "\1\62",
-            "\1\62",
-            "\1\62",
-            "\1\62",
-            "\1\62",
-            "\1\62",
-            "\1\62",
-            "\1\62",
-            "\1\62",
-            "\1\62",
-            "\1\62",
-            "\1\62",
-            "\1\62",
-            "\1\62",
-            "\1\62",
-            "\1\62",
-            "\1\63\1\uffff\1\64\34\uffff\1\75\1\71\1\65\1\66\1\67\1\70"+
-            "\1\72\1\73\1\74",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            ""
-    };
-
-    static final short[] DFA13_eot = DFA.unpackEncodedString(DFA13_eotS);
-    static final short[] DFA13_eof = DFA.unpackEncodedString(DFA13_eofS);
-    static final char[] DFA13_min = DFA.unpackEncodedStringToUnsignedChars(DFA13_minS);
-    static final char[] DFA13_max = DFA.unpackEncodedStringToUnsignedChars(DFA13_maxS);
-    static final short[] DFA13_accept = DFA.unpackEncodedString(DFA13_acceptS);
-    static final short[] DFA13_special = DFA.unpackEncodedString(DFA13_specialS);
-    static final short[][] DFA13_transition;
-
-    static {
-        int numStates = DFA13_transitionS.length;
-        DFA13_transition = new short[numStates][];
-        for (int i=0; i<numStates; i++) {
-            DFA13_transition[i] = DFA.unpackEncodedString(DFA13_transitionS[i]);
-        }
-    }
-
-    class DFA13 extends DFA {
-
-        public DFA13(BaseRecognizer recognizer) {
-            this.recognizer = recognizer;
-            this.decisionNumber = 13;
-            this.eot = DFA13_eot;
-            this.eof = DFA13_eof;
-            this.min = DFA13_min;
-            this.max = DFA13_max;
-            this.accept = DFA13_accept;
-            this.special = DFA13_special;
-            this.transition = DFA13_transition;
-        }
-        public String getDescription() {
-            return "377:1: functionArgument : ( qualifier DOT columnName -> ^( COLUMN_REF columnName qualifier ) | identifier | literalOrParameterName );";
-        }
-        public int specialStateTransition(int s, IntStream _input) throws NoViableAltException {
-            TokenStream input = (TokenStream)_input;
-        	int _s = s;
-            switch ( s ) {
-                    case 0 : 
-                        int LA13_38 = input.LA(1);
-
-                         
-                        int index13_38 = input.index();
-                        input.rewind();
-                        s = -1;
-                        if ( (LA13_38==DOUBLE_QUOTE) && ((strict == false))) {s = 50;}
-
-                         
-                        input.seek(index13_38);
-                        if ( s>=0 ) return s;
-                        break;
-                    case 1 : 
-                        int LA13_2 = input.LA(1);
-
-                         
-                        int index13_2 = input.index();
-                        input.rewind();
-                        s = -1;
-                        if ( (LA13_2==SELECT) && ((strict == false))) {s = 21;}
-
-                        else if ( (LA13_2==AS) && ((strict == false))) {s = 22;}
-
-                        else if ( (LA13_2==FROM) && ((strict == false))) {s = 23;}
-
-                        else if ( (LA13_2==JOIN) && ((strict == false))) {s = 24;}
-
-                        else if ( (LA13_2==INNER) && ((strict == false))) {s = 25;}
-
-                        else if ( (LA13_2==LEFT) && ((strict == false))) {s = 26;}
-
-                        else if ( (LA13_2==OUTER) && ((strict == false))) {s = 27;}
-
-                        else if ( (LA13_2==ON) && ((strict == false))) {s = 28;}
-
-                        else if ( (LA13_2==WHERE) && ((strict == false))) {s = 29;}
-
-                        else if ( (LA13_2==OR) && ((strict == false))) {s = 30;}
-
-                        else if ( (LA13_2==AND) && ((strict == false))) {s = 31;}
-
-                        else if ( (LA13_2==NOT) && ((strict == false))) {s = 32;}
-
-                        else if ( (LA13_2==IN) && ((strict == false))) {s = 33;}
-
-                        else if ( (LA13_2==LIKE) && ((strict == false))) {s = 34;}
-
-                        else if ( (LA13_2==IS) && ((strict == false))) {s = 35;}
-
-                        else if ( (LA13_2==NULL) && ((strict == false))) {s = 36;}
-
-                        else if ( (LA13_2==ANY) && ((strict == false))) {s = 37;}
-
-                        else if ( (LA13_2==CONTAINS) && ((strict == false))) {s = 38;}
-
-                        else if ( (LA13_2==IN_FOLDER) && ((strict == false))) {s = 39;}
-
-                        else if ( (LA13_2==IN_TREE) && ((strict == false))) {s = 40;}
-
-                        else if ( (LA13_2==ORDER) && ((strict == false))) {s = 41;}
-
-                        else if ( (LA13_2==BY) && ((strict == false))) {s = 42;}
-
-                        else if ( (LA13_2==ASC) && ((strict == false))) {s = 43;}
-
-                        else if ( (LA13_2==DESC) && ((strict == false))) {s = 44;}
-
-                        else if ( (LA13_2==TIMESTAMP) && ((strict == false))) {s = 45;}
-
-                        else if ( (LA13_2==TRUE) && ((strict == false))) {s = 46;}
-
-                        else if ( (LA13_2==FALSE) && ((strict == false))) {s = 47;}
-
-                        else if ( (LA13_2==SCORE) && ((strict == false))) {s = 48;}
-
-                        else if ( (LA13_2==ID) && ((strict == false))) {s = 49;}
-
-                         
-                        input.seek(index13_2);
-                        if ( s>=0 ) return s;
-                        break;
-                    case 2 : 
-                        int LA13_36 = input.LA(1);
-
-                         
-                        int index13_36 = input.index();
-                        input.rewind();
-                        s = -1;
-                        if ( (LA13_36==DOUBLE_QUOTE) && ((strict == false))) {s = 50;}
-
-                         
-                        input.seek(index13_36);
-                        if ( s>=0 ) return s;
-                        break;
-                    case 3 : 
-                        int LA13_37 = input.LA(1);
-
-                         
-                        int index13_37 = input.index();
-                        input.rewind();
-                        s = -1;
-                        if ( (LA13_37==DOUBLE_QUOTE) && ((strict == false))) {s = 50;}
-
-                         
-                        input.seek(index13_37);
-                        if ( s>=0 ) return s;
-                        break;
-                    case 4 : 
-                        int LA13_40 = input.LA(1);
-
-                         
-                        int index13_40 = input.index();
-                        input.rewind();
-                        s = -1;
-                        if ( (LA13_40==DOUBLE_QUOTE) && ((strict == false))) {s = 50;}
-
-                         
-                        input.seek(index13_40);
-                        if ( s>=0 ) return s;
-                        break;
-                    case 5 : 
-                        int LA13_41 = input.LA(1);
-
-                         
-                        int index13_41 = input.index();
-                        input.rewind();
-                        s = -1;
-                        if ( (LA13_41==DOUBLE_QUOTE) && ((strict == false))) {s = 50;}
-
-                         
-                        input.seek(index13_41);
-                        if ( s>=0 ) return s;
-                        break;
-                    case 6 : 
-                        int LA13_39 = input.LA(1);
-
-                         
-                        int index13_39 = input.index();
-                        input.rewind();
-                        s = -1;
-                        if ( (LA13_39==DOUBLE_QUOTE) && ((strict == false))) {s = 50;}
-
-                         
-                        input.seek(index13_39);
-                        if ( s>=0 ) return s;
-                        break;
-                    case 7 : 
-                        int LA13_0 = input.LA(1);
-
-                         
-                        int index13_0 = input.index();
-                        input.rewind();
-                        s = -1;
-                        if ( (LA13_0==ID) ) {s = 1;}
-
-                        else if ( (LA13_0==DOUBLE_QUOTE) && ((strict == false))) {s = 2;}
-
-                        else if ( (LA13_0==FLOATING_POINT_LITERAL) ) {s = 3;}
-
-                        else if ( (LA13_0==DECIMAL_INTEGER_LITERAL) ) {s = 4;}
-
-                        else if ( (LA13_0==QUOTED_STRING) ) {s = 5;}
-
-                        else if ( (LA13_0==TRUE) ) {s = 6;}
-
-                        else if ( (LA13_0==FALSE) ) {s = 7;}
-
-                        else if ( (LA13_0==TIMESTAMP) ) {s = 8;}
-
-                        else if ( (LA13_0==COLON) && ((strict == false))) {s = 9;}
-
-                         
-                        input.seek(index13_0);
-                        if ( s>=0 ) return s;
-                        break;
-                    case 8 : 
-                        int LA13_43 = input.LA(1);
-
-                         
-                        int index13_43 = input.index();
-                        input.rewind();
-                        s = -1;
-                        if ( (LA13_43==DOUBLE_QUOTE) && ((strict == false))) {s = 50;}
-
-                         
-                        input.seek(index13_43);
-                        if ( s>=0 ) return s;
-                        break;
-                    case 9 : 
-                        int LA13_50 = input.LA(1);
-
-                         
-                        int index13_50 = input.index();
-                        input.rewind();
-                        s = -1;
-                        if ( (LA13_50==DOT) && ((strict == false))) {s = 51;}
-
-                        else if ( (LA13_50==RPAREN) && ((strict == false))) {s = 52;}
-
-                        else if ( (LA13_50==ID) && ((strict == false))) {s = 53;}
-
-                        else if ( (LA13_50==DOUBLE_QUOTE) && ((strict == false))) {s = 54;}
-
-                        else if ( (LA13_50==FLOATING_POINT_LITERAL) && ((strict == false))) {s = 55;}
-
-                        else if ( (LA13_50==DECIMAL_INTEGER_LITERAL) && ((strict == false))) {s = 56;}
-
-                        else if ( (LA13_50==QUOTED_STRING) && ((strict == false))) {s = 57;}
-
-                        else if ( (LA13_50==TRUE) && ((strict == false))) {s = 58;}
-
-                        else if ( (LA13_50==FALSE) && ((strict == false))) {s = 59;}
-
-                        else if ( (LA13_50==TIMESTAMP) && ((strict == false))) {s = 60;}
-
-                        else if ( (LA13_50==COLON) && ((strict == false))) {s = 61;}
-
-                         
-                        input.seek(index13_50);
-                        if ( s>=0 ) return s;
-                        break;
-                    case 10 : 
-                        int LA13_23 = input.LA(1);
-
-                         
-                        int index13_23 = input.index();
-                        input.rewind();
-                        s = -1;
-                        if ( (LA13_23==DOUBLE_QUOTE) && ((strict == false))) {s = 50;}
-
-                         
-                        input.seek(index13_23);
-                        if ( s>=0 ) return s;
-                        break;
-                    case 11 : 
-                        int LA13_24 = input.LA(1);
-
-                         
-                        int index13_24 = input.index();
-                        input.rewind();
-                        s = -1;
-                        if ( (LA13_24==DOUBLE_QUOTE) && ((strict == false))) {s = 50;}
-
-                         
-                        input.seek(index13_24);
-                        if ( s>=0 ) return s;
-                        break;
-                    case 12 : 
-                        int LA13_25 = input.LA(1);
-
-                         
-                        int index13_25 = input.index();
-                        input.rewind();
-                        s = -1;
-                        if ( (LA13_25==DOUBLE_QUOTE) && ((strict == false))) {s = 50;}
-
-                         
-                        input.seek(index13_25);
-                        if ( s>=0 ) return s;
-                        break;
-                    case 13 : 
-                        int LA13_42 = input.LA(1);
-
-                         
-                        int index13_42 = input.index();
-                        input.rewind();
-                        s = -1;
-                        if ( (LA13_42==DOUBLE_QUOTE) && ((strict == false))) {s = 50;}
-
-                         
-                        input.seek(index13_42);
-                        if ( s>=0 ) return s;
-                        break;
-                    case 14 : 
-                        int LA13_21 = input.LA(1);
-
-                         
-                        int index13_21 = input.index();
-                        input.rewind();
-                        s = -1;
-                        if ( (LA13_21==DOUBLE_QUOTE) && ((strict == false))) {s = 50;}
-
-                         
-                        input.seek(index13_21);
-                        if ( s>=0 ) return s;
-                        break;
-                    case 15 : 
-                        int LA13_46 = input.LA(1);
-
-                         
-                        int index13_46 = input.index();
-                        input.rewind();
-                        s = -1;
-                        if ( (LA13_46==DOUBLE_QUOTE) && ((strict == false))) {s = 50;}
-
-                         
-                        input.seek(index13_46);
-                        if ( s>=0 ) return s;
-                        break;
-                    case 16 : 
-                        int LA13_44 = input.LA(1);
-
-                         
-                        int index13_44 = input.index();
-                        input.rewind();
-                        s = -1;
-                        if ( (LA13_44==DOUBLE_QUOTE) && ((strict == false))) {s = 50;}
-
-                         
-                        input.seek(index13_44);
-                        if ( s>=0 ) return s;
-                        break;
-                    case 17 : 
-                        int LA13_22 = input.LA(1);
-
-                         
-                        int index13_22 = input.index();
-                        input.rewind();
-                        s = -1;
-                        if ( (LA13_22==DOUBLE_QUOTE) && ((strict == false))) {s = 50;}
-
-                         
-                        input.seek(index13_22);
-                        if ( s>=0 ) return s;
-                        break;
-                    case 18 : 
-                        int LA13_45 = input.LA(1);
-
-                         
-                        int index13_45 = input.index();
-                        input.rewind();
-                        s = -1;
-                        if ( (LA13_45==DOUBLE_QUOTE) && ((strict == false))) {s = 50;}
-
-                         
-                        input.seek(index13_45);
-                        if ( s>=0 ) return s;
-                        break;
-                    case 19 : 
-                        int LA13_29 = input.LA(1);
-
-                         
-                        int index13_29 = input.index();
-                        input.rewind();
-                        s = -1;
-                        if ( (LA13_29==DOUBLE_QUOTE) && ((strict == false))) {s = 50;}
-
-                         
-                        input.seek(index13_29);
-                        if ( s>=0 ) return s;
-                        break;
-                    case 20 : 
-                        int LA13_28 = input.LA(1);
-
-                         
-                        int index13_28 = input.index();
-                        input.rewind();
-                        s = -1;
-                        if ( (LA13_28==DOUBLE_QUOTE) && ((strict == false))) {s = 50;}
-
-                         
-                        input.seek(index13_28);
-                        if ( s>=0 ) return s;
-                        break;
-                    case 21 : 
-                        int LA13_30 = input.LA(1);
-
-                         
-                        int index13_30 = input.index();
-                        input.rewind();
-                        s = -1;
-                        if ( (LA13_30==DOUBLE_QUOTE) && ((strict == false))) {s = 50;}
-
-                         
-                        input.seek(index13_30);
-                        if ( s>=0 ) return s;
-                        break;
-                    case 22 : 
-                        int LA13_47 = input.LA(1);
-
-                         
-                        int index13_47 = input.index();
-                        input.rewind();
-                        s = -1;
-                        if ( (LA13_47==DOUBLE_QUOTE) && ((strict == false))) {s = 50;}
-
-                         
-                        input.seek(index13_47);
-                        if ( s>=0 ) return s;
-                        break;
-                    case 23 : 
-                        int LA13_26 = input.LA(1);
-
-                         
-                        int index13_26 = input.index();
-                        input.rewind();
-                        s = -1;
-                        if ( (LA13_26==DOUBLE_QUOTE) && ((strict == false))) {s = 50;}
-
-                         
-                        input.seek(index13_26);
-                        if ( s>=0 ) return s;
-                        break;
-                    case 24 : 
-                        int LA13_27 = input.LA(1);
-
-                         
-                        int index13_27 = input.index();
-                        input.rewind();
-                        s = -1;
-                        if ( (LA13_27==DOUBLE_QUOTE) && ((strict == false))) {s = 50;}
-
-                         
-                        input.seek(index13_27);
-                        if ( s>=0 ) return s;
-                        break;
-                    case 25 : 
-                        int LA13_34 = input.LA(1);
-
-                         
-                        int index13_34 = input.index();
-                        input.rewind();
-                        s = -1;
-                        if ( (LA13_34==DOUBLE_QUOTE) && ((strict == false))) {s = 50;}
-
-                         
-                        input.seek(index13_34);
-                        if ( s>=0 ) return s;
-                        break;
-                    case 26 : 
-                        int LA13_48 = input.LA(1);
-
-                         
-                        int index13_48 = input.index();
-                        input.rewind();
-                        s = -1;
-                        if ( (LA13_48==DOUBLE_QUOTE) && ((strict == false))) {s = 50;}
-
-                         
-                        input.seek(index13_48);
-                        if ( s>=0 ) return s;
-                        break;
-                    case 27 : 
-                        int LA13_35 = input.LA(1);
-
-                         
-                        int index13_35 = input.index();
-                        input.rewind();
-                        s = -1;
-                        if ( (LA13_35==DOUBLE_QUOTE) && ((strict == false))) {s = 50;}
-
-                         
-                        input.seek(index13_35);
-                        if ( s>=0 ) return s;
-                        break;
-                    case 28 : 
-                        int LA13_31 = input.LA(1);
-
-                         
-                        int index13_31 = input.index();
-                        input.rewind();
-                        s = -1;
-                        if ( (LA13_31==DOUBLE_QUOTE) && ((strict == false))) {s = 50;}
-
-                         
-                        input.seek(index13_31);
-                        if ( s>=0 ) return s;
-                        break;
-                    case 29 : 
-                        int LA13_33 = input.LA(1);
-
-                         
-                        int index13_33 = input.index();
-                        input.rewind();
-                        s = -1;
-                        if ( (LA13_33==DOUBLE_QUOTE) && ((strict == false))) {s = 50;}
-
-                         
-                        input.seek(index13_33);
-                        if ( s>=0 ) return s;
-                        break;
-                    case 30 : 
-                        int LA13_49 = input.LA(1);
-
-                         
-                        int index13_49 = input.index();
-                        input.rewind();
-                        s = -1;
-                        if ( (LA13_49==DOUBLE_QUOTE) && ((strict == false))) {s = 50;}
-
-                         
-                        input.seek(index13_49);
-                        if ( s>=0 ) return s;
-                        break;
-                    case 31 : 
-                        int LA13_32 = input.LA(1);
-
-                         
-                        int index13_32 = input.index();
-                        input.rewind();
-                        s = -1;
-                        if ( (LA13_32==DOUBLE_QUOTE) && ((strict == false))) {s = 50;}
-
-                         
-                        input.seek(index13_32);
-                        if ( s>=0 ) return s;
-                        break;
-            }
-            if (state.backtracking>0) {state.failed=true; return -1;}
-            NoViableAltException nvae =
-                new NoViableAltException(getDescription(), 13, _s, input);
-            error(nvae);
-            throw nvae;
-        }
-    }
-    static final String DFA14_eotS =
-        "\43\uffff";
-    static final String DFA14_eofS =
-        "\43\uffff";
-    static final String DFA14_minS =
-        "\1\106\1\0\1\40\2\uffff\35\107\1\0";
-    static final String DFA14_maxS =
-        "\1\107\1\0\1\115\2\uffff\35\107\1\0";
-    static final String DFA14_acceptS =
-        "\3\uffff\1\1\1\2\36\uffff";
-    static final String DFA14_specialS =
-        "\1\2\1\25\1\40\2\uffff\1\23\1\26\1\24\1\32\1\30\1\37\1\34\1\4\1"+
-        "\1\1\10\1\6\1\14\1\12\1\21\1\16\1\22\1\17\1\15\1\13\1\11\1\5\1\3"+
-        "\1\0\1\36\1\33\1\31\1\27\1\35\1\7\1\20}>";
-    static final String[] DFA14_transitionS = {
-            "\1\1\1\2",
-            "\1\uffff",
-            "\1\5\2\uffff\1\6\4\uffff\1\7\1\10\1\11\1\12\1\13\1\14\1\uffff"+
-            "\1\15\1\16\1\17\1\20\5\uffff\1\21\1\22\1\23\1\24\1\25\1\26\1"+
-            "\27\1\30\1\31\1\32\1\33\1\34\2\uffff\1\41\3\uffff\1\36\1\37"+
-            "\1\35\1\40",
-            "",
-            "",
-            "\1\42",
-            "\1\42",
-            "\1\42",
-            "\1\42",
-            "\1\42",
-            "\1\42",
-            "\1\42",
-            "\1\42",
-            "\1\42",
-            "\1\42",
-            "\1\42",
-            "\1\42",
-            "\1\42",
-            "\1\42",
-            "\1\42",
-            "\1\42",
-            "\1\42",
-            "\1\42",
-            "\1\42",
-            "\1\42",
-            "\1\42",
-            "\1\42",
-            "\1\42",
-            "\1\42",
-            "\1\42",
-            "\1\42",
-            "\1\42",
-            "\1\42",
-            "\1\42",
-            "\1\uffff"
-    };
-
-    static final short[] DFA14_eot = DFA.unpackEncodedString(DFA14_eotS);
-    static final short[] DFA14_eof = DFA.unpackEncodedString(DFA14_eofS);
-    static final char[] DFA14_min = DFA.unpackEncodedStringToUnsignedChars(DFA14_minS);
-    static final char[] DFA14_max = DFA.unpackEncodedStringToUnsignedChars(DFA14_maxS);
-    static final short[] DFA14_accept = DFA.unpackEncodedString(DFA14_acceptS);
-    static final short[] DFA14_special = DFA.unpackEncodedString(DFA14_specialS);
-    static final short[][] DFA14_transition;
-
-    static {
-        int numStates = DFA14_transitionS.length;
-        DFA14_transition = new short[numStates][];
-        for (int i=0; i<numStates; i++) {
-            DFA14_transition[i] = DFA.unpackEncodedString(DFA14_transitionS[i]);
-        }
-    }
-
-    class DFA14 extends DFA {
-
-        public DFA14(BaseRecognizer recognizer) {
-            this.recognizer = recognizer;
-            this.decisionNumber = 14;
-            this.eot = DFA14_eot;
-            this.eof = DFA14_eof;
-            this.min = DFA14_min;
-            this.max = DFA14_max;
-            this.accept = DFA14_accept;
-            this.special = DFA14_special;
-            this.transition = DFA14_transition;
-        }
-        public String getDescription() {
-            return "386:1: qualifier : ( ( tableName )=> tableName -> tableName | correlationName -> correlationName );";
-        }
-        public int specialStateTransition(int s, IntStream _input) throws NoViableAltException {
-            TokenStream input = (TokenStream)_input;
-        	int _s = s;
-            switch ( s ) {
-                    case 0 : 
-                        int LA14_27 = input.LA(1);
-
-                         
-                        int index14_27 = input.index();
-                        input.rewind();
-                        s = -1;
-                        if ( (LA14_27==DOUBLE_QUOTE) && ((strict == false))) {s = 34;}
-
-                         
-                        input.seek(index14_27);
-                        if ( s>=0 ) return s;
-                        break;
-                    case 1 : 
-                        int LA14_13 = input.LA(1);
-
-                         
-                        int index14_13 = input.index();
-                        input.rewind();
-                        s = -1;
-                        if ( (LA14_13==DOUBLE_QUOTE) && ((strict == false))) {s = 34;}
-
-                         
-                        input.seek(index14_13);
-                        if ( s>=0 ) return s;
-                        break;
-                    case 2 : 
-                        int LA14_0 = input.LA(1);
-
-                         
-                        int index14_0 = input.index();
-                        input.rewind();
-                        s = -1;
-                        if ( (LA14_0==ID) ) {s = 1;}
-
-                        else if ( (LA14_0==DOUBLE_QUOTE) && ((strict == false))) {s = 2;}
-
-                         
-                        input.seek(index14_0);
-                        if ( s>=0 ) return s;
-                        break;
-                    case 3 : 
-                        int LA14_26 = input.LA(1);
-
-                         
-                        int index14_26 = input.index();
-                        input.rewind();
-                        s = -1;
-                        if ( (LA14_26==DOUBLE_QUOTE) && ((strict == false))) {s = 34;}
-
-                         
-                        input.seek(index14_26);
-                        if ( s>=0 ) return s;
-                        break;
-                    case 4 : 
-                        int LA14_12 = input.LA(1);
-
-                         
-                        int index14_12 = input.index();
-                        input.rewind();
-                        s = -1;
-                        if ( (LA14_12==DOUBLE_QUOTE) && ((strict == false))) {s = 34;}
-
-                         
-                        input.seek(index14_12);
-                        if ( s>=0 ) return s;
-                        break;
-                    case 5 : 
-                        int LA14_25 = input.LA(1);
-
-                         
-                        int index14_25 = input.index();
-                        input.rewind();
-                        s = -1;
-                        if ( (LA14_25==DOUBLE_QUOTE) && ((strict == false))) {s = 34;}
-
-                         
-                        input.seek(index14_25);
-                        if ( s>=0 ) return s;
-                        break;
-                    case 6 : 
-                        int LA14_15 = input.LA(1);
-
-                         
-                        int index14_15 = input.index();
-                        input.rewind();
-                        s = -1;
-                        if ( (LA14_15==DOUBLE_QUOTE) && ((strict == false))) {s = 34;}
-
-                         
-                        input.seek(index14_15);
-                        if ( s>=0 ) return s;
-                        break;
-                    case 7 : 
-                        int LA14_33 = input.LA(1);
-
-                         
-                        int index14_33 = input.index();
-                        input.rewind();
-                        s = -1;
-                        if ( (LA14_33==DOUBLE_QUOTE) && ((strict == false))) {s = 34;}
-
-                         
-                        input.seek(index14_33);
-                        if ( s>=0 ) return s;
-                        break;
-                    case 8 : 
-                        int LA14_14 = input.LA(1);
-
-                         
-                        int index14_14 = input.index();
-                        input.rewind();
-                        s = -1;
-                        if ( (LA14_14==DOUBLE_QUOTE) && ((strict == false))) {s = 34;}
-
-                         
-                        input.seek(index14_14);
-                        if ( s>=0 ) return s;
-                        break;
-                    case 9 : 
-                        int LA14_24 = input.LA(1);
-
-                         
-                        int index14_24 = input.index();
-                        input.rewind();
-                        s = -1;
-                        if ( (LA14_24==DOUBLE_QUOTE) && ((strict == false))) {s = 34;}
-
-                         
-                        input.seek(index14_24);
-                        if ( s>=0 ) return s;
-                        break;
-                    case 10 : 
-                        int LA14_17 = input.LA(1);
-
-                         
-                        int index14_17 = input.index();
-                        input.rewind();
-                        s = -1;
-                        if ( (LA14_17==DOUBLE_QUOTE) && ((strict == false))) {s = 34;}
-
-                         
-                        input.seek(index14_17);
-                        if ( s>=0 ) return s;
-                        break;
-                    case 11 : 
-                        int LA14_23 = input.LA(1);
-
-                         
-                        int index14_23 = input.index();
-                        input.rewind();
-                        s = -1;
-                        if ( (LA14_23==DOUBLE_QUOTE) && ((strict == false))) {s = 34;}
-
-                         
-                        input.seek(index14_23);
-                        if ( s>=0 ) return s;
-                        break;
-                    case 12 : 
-                        int LA14_16 = input.LA(1);
-
-                         
-                        int index14_16 = input.index();
-                        input.rewind();
-                        s = -1;
-                        if ( (LA14_16==DOUBLE_QUOTE) && ((strict == false))) {s = 34;}
-
-                         
-                        input.seek(index14_16);
-                        if ( s>=0 ) return s;
-                        break;
-                    case 13 : 
-                        int LA14_22 = input.LA(1);
-
-                         
-                        int index14_22 = input.index();
-                        input.rewind();
-                        s = -1;
-                        if ( (LA14_22==DOUBLE_QUOTE) && ((strict == false))) {s = 34;}
-
-                         
-                        input.seek(index14_22);
-                        if ( s>=0 ) return s;
-                        break;
-                    case 14 : 
-                        int LA14_19 = input.LA(1);
-
-                         
-                        int index14_19 = input.index();
-                        input.rewind();
-                        s = -1;
-                        if ( (LA14_19==DOUBLE_QUOTE) && ((strict == false))) {s = 34;}
-
-                         
-                        input.seek(index14_19);
-                        if ( s>=0 ) return s;
-                        break;
-                    case 15 : 
-                        int LA14_21 = input.LA(1);
-
-                         
-                        int index14_21 = input.index();
-                        input.rewind();
-                        s = -1;
-                        if ( (LA14_21==DOUBLE_QUOTE) && ((strict == false))) {s = 34;}
-
-                         
-                        input.seek(index14_21);
-                        if ( s>=0 ) return s;
-                        break;
-                    case 16 : 
-                        int LA14_34 = input.LA(1);
-
-                         
-                        int index14_34 = input.index();
-                        input.rewind();
-                        s = -1;
-                        if ( ((synpred1_CMIS()&&(strict == false))) ) {s = 3;}
-
-                        else if ( ((strict == false)) ) {s = 4;}
-
-                         
-                        input.seek(index14_34);
-                        if ( s>=0 ) return s;
-                        break;
-                    case 17 : 
-                        int LA14_18 = input.LA(1);
-
-                         
-                        int index14_18 = input.index();
-                        input.rewind();
-                        s = -1;
-                        if ( (LA14_18==DOUBLE_QUOTE) && ((strict == false))) {s = 34;}
-
-                         
-                        input.seek(index14_18);
-                        if ( s>=0 ) return s;
-                        break;
-                    case 18 : 
-                        int LA14_20 = input.LA(1);
-
-                         
-                        int index14_20 = input.index();
-                        input.rewind();
-                        s = -1;
-                        if ( (LA14_20==DOUBLE_QUOTE) && ((strict == false))) {s = 34;}
-
-                         
-                        input.seek(index14_20);
-                        if ( s>=0 ) return s;
-                        break;
-                    case 19 : 
-                        int LA14_5 = input.LA(1);
-
-                         
-                        int index14_5 = input.index();
-                        input.rewind();
-                        s = -1;
-                        if ( (LA14_5==DOUBLE_QUOTE) && ((strict == false))) {s = 34;}
-
-                         
-                        input.seek(index14_5);
-                        if ( s>=0 ) return s;
-                        break;
-                    case 20 : 
-                        int LA14_7 = input.LA(1);
-
-                         
-                        int index14_7 = input.index();
-                        input.rewind();
-                        s = -1;
-                        if ( (LA14_7==DOUBLE_QUOTE) && ((strict == false))) {s = 34;}
-
-                         
-                        input.seek(index14_7);
-                        if ( s>=0 ) return s;
-                        break;
-                    case 21 : 
-                        int LA14_1 = input.LA(1);
-
-                         
-                        int index14_1 = input.index();
-                        input.rewind();
-                        s = -1;
-                        if ( (synpred1_CMIS()) ) {s = 3;}
-
-                        else if ( (true) ) {s = 4;}
-
-                         
-                        input.seek(index14_1);
-                        if ( s>=0 ) return s;
-                        break;
-                    case 22 : 
-                        int LA14_6 = input.LA(1);
-
-                         
-                        int index14_6 = input.index();
-                        input.rewind();
-                        s = -1;
-                        if ( (LA14_6==DOUBLE_QUOTE) && ((strict == false))) {s = 34;}
-
-                         
-                        input.seek(index14_6);
-                        if ( s>=0 ) return s;
-                        break;
-                    case 23 : 
-                        int LA14_31 = input.LA(1);
-
-                         
-                        int index14_31 = input.index();
-                        input.rewind();
-                        s = -1;
-                        if ( (LA14_31==DOUBLE_QUOTE) && ((strict == false))) {s = 34;}
-
-                         
-                        input.seek(index14_31);
-                        if ( s>=0 ) return s;
-                        break;
-                    case 24 : 
-                        int LA14_9 = input.LA(1);
-
-                         
-                        int index14_9 = input.index();
-                        input.rewind();
-                        s = -1;
-                        if ( (LA14_9==DOUBLE_QUOTE) && ((strict == false))) {s = 34;}
-
-                         
-                        input.seek(index14_9);
-                        if ( s>=0 ) return s;
-                        break;
-                    case 25 : 
-                        int LA14_30 = input.LA(1);
-
-                         
-                        int index14_30 = input.index();
-                        input.rewind();
-                        s = -1;
-                        if ( (LA14_30==DOUBLE_QUOTE) && ((strict == false))) {s = 34;}
-
-                         
-                        input.seek(index14_30);
-                        if ( s>=0 ) return s;
-                        break;
-                    case 26 : 
-                        int LA14_8 = input.LA(1);
-
-                         
-                        int index14_8 = input.index();
-                        input.rewind();
-                        s = -1;
-                        if ( (LA14_8==DOUBLE_QUOTE) && ((strict == false))) {s = 34;}
-
-                         
-                        input.seek(index14_8);
-                        if ( s>=0 ) return s;
-                        break;
-                    case 27 : 
-                        int LA14_29 = input.LA(1);
-
-                         
-                        int index14_29 = input.index();
-                        input.rewind();
-                        s = -1;
-                        if ( (LA14_29==DOUBLE_QUOTE) && ((strict == false))) {s = 34;}
-
-                         
-                        input.seek(index14_29);
-                        if ( s>=0 ) return s;
-                        break;
-                    case 28 : 
-                        int LA14_11 = input.LA(1);
-
-                         
-                        int index14_11 = input.index();
-                        input.rewind();
-                        s = -1;
-                        if ( (LA14_11==DOUBLE_QUOTE) && ((strict == false))) {s = 34;}
-
-                         
-                        input.seek(index14_11);
-                        if ( s>=0 ) return s;
-                        break;
-                    case 29 : 
-                        int LA14_32 = input.LA(1);
-
-                         
-                        int index14_32 = input.index();
-                        input.rewind();
-                        s = -1;
-                        if ( (LA14_32==DOUBLE_QUOTE) && ((strict == false))) {s = 34;}
-
-                         
-                        input.seek(index14_32);
-                        if ( s>=0 ) return s;
-                        break;
-                    case 30 : 
-                        int LA14_28 = input.LA(1);
-
-                         
-                        int index14_28 = input.index();
-                        input.rewind();
-                        s = -1;
-                        if ( (LA14_28==DOUBLE_QUOTE) && ((strict == false))) {s = 34;}
-
-                         
-                        input.seek(index14_28);
-                        if ( s>=0 ) return s;
-                        break;
-                    case 31 : 
-                        int LA14_10 = input.LA(1);
-
-                         
-                        int index14_10 = input.index();
-                        input.rewind();
-                        s = -1;
-                        if ( (LA14_10==DOUBLE_QUOTE) && ((strict == false))) {s = 34;}
-
-                         
-                        input.seek(index14_10);
-                        if ( s>=0 ) return s;
-                        break;
-                    case 32 : 
-                        int LA14_2 = input.LA(1);
-
-                         
-                        int index14_2 = input.index();
-                        input.rewind();
-                        s = -1;
-                        if ( (LA14_2==SELECT) && ((strict == false))) {s = 5;}
-
-                        else if ( (LA14_2==AS) && ((strict == false))) {s = 6;}
-
-                        else if ( (LA14_2==FROM) && ((strict == false))) {s = 7;}
-
-                        else if ( (LA14_2==JOIN) && ((strict == false))) {s = 8;}
-
-                        else if ( (LA14_2==INNER) && ((strict == false))) {s = 9;}
-
-                        else if ( (LA14_2==LEFT) && ((strict == false))) {s = 10;}
-
-                        else if ( (LA14_2==OUTER) && ((strict == false))) {s = 11;}
-
-                        else if ( (LA14_2==ON) && ((strict == false))) {s = 12;}
-
-                        else if ( (LA14_2==WHERE) && ((strict == false))) {s = 13;}
-
-                        else if ( (LA14_2==OR) && ((strict == false))) {s = 14;}
-
-                        else if ( (LA14_2==AND) && ((strict == false))) {s = 15;}
-
-                        else if ( (LA14_2==NOT) && ((strict == false))) {s = 16;}
-
-                        else if ( (LA14_2==IN) && ((strict == false))) {s = 17;}
-
-                        else if ( (LA14_2==LIKE) && ((strict == false))) {s = 18;}
-
-                        else if ( (LA14_2==IS) && ((strict == false))) {s = 19;}
-
-                        else if ( (LA14_2==NULL) && ((strict == false))) {s = 20;}
-
-                        else if ( (LA14_2==ANY) && ((strict == false))) {s = 21;}
-
-                        else if ( (LA14_2==CONTAINS) && ((strict == false))) {s = 22;}
-
-                        else if ( (LA14_2==IN_FOLDER) && ((strict == false))) {s = 23;}
-
-                        else if ( (LA14_2==IN_TREE) && ((strict == false))) {s = 24;}
-
-                        else if ( (LA14_2==ORDER) && ((strict == false))) {s = 25;}
-
-                        else if ( (LA14_2==BY) && ((strict == false))) {s = 26;}
-
-                        else if ( (LA14_2==ASC) && ((strict == false))) {s = 27;}
-
-                        else if ( (LA14_2==DESC) && ((strict == false))) {s = 28;}
-
-                        else if ( (LA14_2==TIMESTAMP) && ((strict == false))) {s = 29;}
-
-                        else if ( (LA14_2==TRUE) && ((strict == false))) {s = 30;}
-
-                        else if ( (LA14_2==FALSE) && ((strict == false))) {s = 31;}
-
-                        else if ( (LA14_2==SCORE) && ((strict == false))) {s = 32;}
-
-                        else if ( (LA14_2==ID) && ((strict == false))) {s = 33;}
-
-                         
-                        input.seek(index14_2);
-                        if ( s>=0 ) return s;
-                        break;
-            }
-            if (state.backtracking>0) {state.failed=true; return -1;}
-            NoViableAltException nvae =
-                new NoViableAltException(getDescription(), 14, _s, input);
-            error(nvae);
-            throw nvae;
-        }
-    }
-    static final String DFA18_eotS =
-        "\13\uffff";
-    static final String DFA18_eofS =
-        "\1\11\12\uffff";
-    static final String DFA18_minS =
-        "\1\43\12\uffff";
-    static final String DFA18_maxS =
-        "\1\107\12\uffff";
-    static final String DFA18_acceptS =
-        "\1\uffff\3\1\7\2";
-    static final String DFA18_specialS =
-        "\1\0\12\uffff}>";
-    static final String[] DFA18_transitionS = {
-            "\1\1\5\uffff\1\6\1\4\1\5\1\uffff\1\12\1\uffff\1\7\20\uffff"+
-            "\1\10\5\uffff\1\2\1\3",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            ""
-    };
-
-    static final short[] DFA18_eot = DFA.unpackEncodedString(DFA18_eotS);
-    static final short[] DFA18_eof = DFA.unpackEncodedString(DFA18_eofS);
-    static final char[] DFA18_min = DFA.unpackEncodedStringToUnsignedChars(DFA18_minS);
-    static final char[] DFA18_max = DFA.unpackEncodedStringToUnsignedChars(DFA18_maxS);
-    static final short[] DFA18_accept = DFA.unpackEncodedString(DFA18_acceptS);
-    static final short[] DFA18_special = DFA.unpackEncodedString(DFA18_specialS);
-    static final short[][] DFA18_transition;
-
-    static {
-        int numStates = DFA18_transitionS.length;
-        DFA18_transition = new short[numStates][];
-        for (int i=0; i<numStates; i++) {
-            DFA18_transition[i] = DFA.unpackEncodedString(DFA18_transitionS[i]);
-        }
-    }
-
-    class DFA18 extends DFA {
-
-        public DFA18(BaseRecognizer recognizer) {
-            this.recognizer = recognizer;
-            this.decisionNumber = 18;
-            this.eot = DFA18_eot;
-            this.eof = DFA18_eof;
-            this.min = DFA18_min;
-            this.max = DFA18_max;
-            this.accept = DFA18_accept;
-            this.special = DFA18_special;
-            this.transition = DFA18_transition;
-        }
-        public String getDescription() {
-            return "454:19: ( ( AS )? correlationName )?";
-        }
-        public int specialStateTransition(int s, IntStream _input) throws NoViableAltException {
-            TokenStream input = (TokenStream)_input;
-        	int _s = s;
-            switch ( s ) {
-                    case 0 : 
-                        int LA18_0 = input.LA(1);
-
-                         
-                        int index18_0 = input.index();
-                        input.rewind();
-                        s = -1;
-                        if ( (LA18_0==AS) ) {s = 1;}
-
-                        else if ( (LA18_0==ID) ) {s = 2;}
-
-                        else if ( (LA18_0==DOUBLE_QUOTE) && ((strict == false))) {s = 3;}
-
-                        else if ( (LA18_0==INNER) ) {s = 4;}
-
-                        else if ( (LA18_0==LEFT) ) {s = 5;}
-
-                        else if ( (LA18_0==JOIN) ) {s = 6;}
-
-                        else if ( (LA18_0==WHERE) ) {s = 7;}
-
-                        else if ( (LA18_0==ORDER) ) {s = 8;}
-
-                        else if ( (LA18_0==EOF) ) {s = 9;}
-
-                        else if ( (LA18_0==ON) ) {s = 10;}
-
-                         
-                        input.seek(index18_0);
-                        if ( s>=0 ) return s;
-                        break;
-            }
-            if (state.backtracking>0) {state.failed=true; return -1;}
-            NoViableAltException nvae =
-                new NoViableAltException(getDescription(), 18, _s, input);
-            error(nvae);
-            throw nvae;
-        }
-    }
-    static final String DFA26_eotS =
-        "\u00db\uffff";
-    static final String DFA26_eofS =
-        "\u00db\uffff";
-    static final String DFA26_minS =
-        "\2\40\104\uffff\1\40\1\uffff\1\45\1\40\30\uffff\3\46\3\47\1\106"+
-        "\2\uffff\1\106\17\uffff\35\107\1\47\1\uffff\1\47\1\40\1\47\1\40"+
-        "\1\45\72\107\2\47";
-    static final String DFA26_maxS =
-        "\2\115\104\uffff\1\115\1\uffff\1\114\1\115\30\uffff\1\105\5\114"+
-        "\1\107\2\uffff\1\107\17\uffff\35\107\1\114\1\uffff\1\114\1\115\1"+
-        "\114\1\115\1\114\72\107\2\114";
-    static final String DFA26_acceptS =
-        "\2\uffff\42\2\42\1\1\uffff\1\1\2\uffff\30\1\7\uffff\1\1\1\2\1\uffff"+
-        "\6\1\11\2\36\uffff\1\1\101\uffff";
-    static final String DFA26_specialS =
-        "\1\1\105\uffff\1\7\1\uffff\1\15\32\uffff\1\12\1\13\1\4\1\5\1\3"+
-        "\60\uffff\1\2\1\uffff\1\10\1\uffff\1\0\1\uffff\1\14\72\uffff\1\11"+
-        "\1\6}>";
-    static final String[] DFA26_transitionS = {
-            "\1\5\2\uffff\1\6\2\uffff\1\43\1\uffff\1\7\1\10\1\11\1\12\1"+
-            "\13\1\14\1\uffff\1\15\1\16\1\17\1\1\5\uffff\1\20\1\21\1\22\1"+
-            "\23\1\24\1\25\1\26\1\27\1\30\1\31\1\32\1\33\1\42\1\41\1\2\1"+
-            "\3\1\37\1\40\1\35\1\36\1\34\1\4",
-            "\1\47\2\uffff\1\50\2\uffff\1\106\1\uffff\1\51\1\52\1\53\1"+
-            "\54\1\55\1\56\1\uffff\1\57\1\60\1\61\1\62\5\uffff\1\63\1\64"+
-            "\1\65\1\66\1\67\1\70\1\71\1\72\1\73\1\74\1\75\1\76\1\105\1\104"+
-            "\1\44\1\45\1\102\1\103\1\100\1\101\1\77\1\46",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "\1\113\2\uffff\1\114\2\uffff\1\151\1\152\1\115\1\116\1\117"+
-            "\1\120\1\121\1\122\1\uffff\1\123\1\124\1\125\1\107\5\uffff\1"+
-            "\126\1\127\1\130\1\131\1\132\1\133\1\134\1\135\1\136\1\137\1"+
-            "\140\1\141\1\150\1\147\1\110\1\111\1\145\1\146\1\143\1\144\1"+
-            "\142\1\112",
-            "",
-            "\1\153\1\155\1\152\6\uffff\1\154\3\uffff\1\156\5\154\1\157"+
-            "\1\160\1\161\11\uffff\1\172\1\166\1\162\1\163\1\164\1\165\1"+
-            "\167\1\170\1\171",
-            "\1\173\2\uffff\1\174\4\uffff\1\175\1\176\1\177\1\u0080\1\u0081"+
-            "\1\u0082\1\uffff\1\u0083\1\u0084\1\u0085\1\u0086\5\uffff\1\u0087"+
-            "\1\u0088\1\u0089\1\u008a\1\u008b\1\u008c\1\u008d\1\u008e\1\u008f"+
-            "\1\u0090\1\u0091\1\u0092\2\uffff\1\u0097\3\uffff\1\u0094\1\u0095"+
-            "\1\u0093\1\u0096",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "\1\155\36\uffff\1\u0098",
-            "\1\155\1\152\6\uffff\1\u0099\4\uffff\5\u0099\14\uffff\1\172"+
-            "\1\166\1\162\1\163\1\164\1\165\1\167\1\170\1\171",
-            "\1\155\1\152\6\uffff\1\u0099\4\uffff\5\u0099\14\uffff\1\172"+
-            "\1\166\1\162\1\163\1\164\1\165\1\167\1\170\1\171",
-            "\1\152\6\uffff\1\u0099\4\uffff\5\u0099\14\uffff\1\172\1\166"+
-            "\1\162\1\163\1\164\1\165\1\167\1\170\1\171",
-            "\1\152\6\uffff\1\u0099\4\uffff\5\u0099\14\uffff\1\172\1\166"+
-            "\1\162\1\163\1\164\1\165\1\167\1\170\1\171",
-            "\1\152\6\uffff\1\u0099\4\uffff\5\u0099\14\uffff\1\172\1\166"+
-            "\1\162\1\163\1\164\1\165\1\167\1\170\1\171",
-            "\1\u009a\1\u009b",
-            "",
-            "",
-            "\1\u009c\1\u009d",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "\1\u009e",
-            "\1\u009e",
-            "\1\u009e",
-            "\1\u009e",
-            "\1\u009e",
-            "\1\u009e",
-            "\1\u009e",
-            "\1\u009e",
-            "\1\u009e",
-            "\1\u009e",
-            "\1\u009e",
-            "\1\u009e",
-            "\1\u009e",
-            "\1\u009e",
-            "\1\u009e",
-            "\1\u009e",
-            "\1\u009e",
-            "\1\u009e",
-            "\1\u009e",
-            "\1\u009e",
-            "\1\u009e",
-            "\1\u009e",
-            "\1\u009e",
-            "\1\u009e",
-            "\1\u009e",
-            "\1\u009e",
-            "\1\u009e",
-            "\1\u009e",
-            "\1\u009e",
-            "\1\152\6\uffff\1\u0099\4\uffff\5\u0099\14\uffff\1\172\1\166"+
-            "\1\162\1\163\1\164\1\165\1\167\1\170\1\171",
-            "",
-            "\1\152\6\uffff\1\u0099\4\uffff\5\u0099\14\uffff\1\172\1\166"+
-            "\1\162\1\163\1\164\1\165\1\167\1\170\1\171",
-            "\1\u009f\2\uffff\1\u00a0\4\uffff\1\u00a1\1\u00a2\1\u00a3\1"+
-            "\u00a4\1\u00a5\1\u00a6\1\uffff\1\u00a7\1\u00a8\1\u00a9\1\u00aa"+
-            "\5\uffff\1\u00ab\1\u00ac\1\u00ad\1\u00ae\1\u00af\1\u00b0\1\u00b1"+
-            "\1\u00b2\1\u00b3\1\u00b4\1\u00b5\1\u00b6\2\uffff\1\u00bb\3\uffff"+
-            "\1\u00b8\1\u00b9\1\u00b7\1\u00ba",
-            "\1\152\6\uffff\1\154\3\uffff\1\156\5\154\1\157\1\160\1\161"+
-            "\11\uffff\1\172\1\166\1\162\1\163\1\164\1\165\1\167\1\170\1"+
-            "\171",
-            "\1\u00bc\2\uffff\1\u00bd\4\uffff\1\u00be\1\u00bf\1\u00c0\1"+
-            "\u00c1\1\u00c2\1\u00c3\1\uffff\1\u00c4\1\u00c5\1\u00c6\1\u00c7"+
-            "\5\uffff\1\u00c8\1\u00c9\1\u00ca\1\u00cb\1\u00cc\1\u00cd\1\u00ce"+
-            "\1\u00cf\1\u00d0\1\u00d1\1\u00d2\1\u00d3\2\uffff\1\u00d8\3\uffff"+
-            "\1\u00d5\1\u00d6\1\u00d4\1\u00d7",
-            "\1\153\1\uffff\1\152\6\uffff\1\154\3\uffff\1\156\5\154\1\157"+
-            "\1\160\1\161\11\uffff\1\172\1\166\1\162\1\163\1\164\1\165\1"+
-            "\167\1\170\1\171",
-            "\1\u00d9",
-            "\1\u00d9",
-            "\1\u00d9",
-            "\1\u00d9",
-            "\1\u00d9",
-            "\1\u00d9",
-            "\1\u00d9",
-            "\1\u00d9",
-            "\1\u00d9",
-            "\1\u00d9",
-            "\1\u00d9",
-            "\1\u00d9",
-            "\1\u00d9",
-            "\1\u00d9",
-            "\1\u00d9",
-            "\1\u00d9",
-            "\1\u00d9",
-            "\1\u00d9",
-            "\1\u00d9",
-            "\1\u00d9",
-            "\1\u00d9",
-            "\1\u00d9",
-            "\1\u00d9",
-            "\1\u00d9",
-            "\1\u00d9",
-            "\1\u00d9",
-            "\1\u00d9",
-            "\1\u00d9",
-            "\1\u00d9",
-            "\1\u00da",
-            "\1\u00da",
-            "\1\u00da",
-            "\1\u00da",
-            "\1\u00da",
-            "\1\u00da",
-            "\1\u00da",
-            "\1\u00da",
-            "\1\u00da",
-            "\1\u00da",
-            "\1\u00da",
-            "\1\u00da",
-            "\1\u00da",
-            "\1\u00da",
-            "\1\u00da",
-            "\1\u00da",
-            "\1\u00da",
-            "\1\u00da",
-            "\1\u00da",
-            "\1\u00da",
-            "\1\u00da",
-            "\1\u00da",
-            "\1\u00da",
-            "\1\u00da",
-            "\1\u00da",
-            "\1\u00da",
-            "\1\u00da",
-            "\1\u00da",
-            "\1\u00da",
-            "\1\152\6\uffff\1\u0099\4\uffff\5\u0099\14\uffff\1\172\1\166"+
-            "\1\162\1\163\1\164\1\165\1\167\1\170\1\171",
-            "\1\152\6\uffff\1\154\3\uffff\1\156\5\154\1\157\1\160\1\161"+
-            "\11\uffff\1\172\1\166\1\162\1\163\1\164\1\165\1\167\1\170\1"+
-            "\171"
-    };
-
-    static final short[] DFA26_eot = DFA.unpackEncodedString(DFA26_eotS);
-    static final short[] DFA26_eof = DFA.unpackEncodedString(DFA26_eofS);
-    static final char[] DFA26_min = DFA.unpackEncodedStringToUnsignedChars(DFA26_minS);
-    static final char[] DFA26_max = DFA.unpackEncodedStringToUnsignedChars(DFA26_maxS);
-    static final short[] DFA26_accept = DFA.unpackEncodedString(DFA26_acceptS);
-    static final short[] DFA26_special = DFA.unpackEncodedString(DFA26_specialS);
-    static final short[][] DFA26_transition;
-
-    static {
-        int numStates = DFA26_transitionS.length;
-        DFA26_transition = new short[numStates][];
-        for (int i=0; i<numStates; i++) {
-            DFA26_transition[i] = DFA.unpackEncodedString(DFA26_transitionS[i]);
-        }
-    }
-
-    class DFA26 extends DFA {
-
-        public DFA26(BaseRecognizer recognizer) {
-            this.recognizer = recognizer;
-            this.decisionNumber = 26;
-            this.eot = DFA26_eot;
-            this.eof = DFA26_eof;
-            this.min = DFA26_min;
-            this.max = DFA26_max;
-            this.accept = DFA26_accept;
-            this.special = DFA26_special;
-            this.transition = DFA26_transition;
-        }
-        public String getDescription() {
-            return "552:1: searchNotCondition : ( NOT searchTest -> ^( NEGATION searchTest ) | searchTest -> searchTest );";
-        }
-        public int specialStateTransition(int s, IntStream _input) throws NoViableAltException {
-            TokenStream input = (TokenStream)_input;
-        	int _s = s;
-            switch ( s ) {
-                    case 0 : 
-                        int LA26_156 = input.LA(1);
-
-                         
-                        int index26_156 = input.index();
-                        input.rewind();
-                        s = -1;
-                        if ( (LA26_156==EQUALS||(LA26_156>=NOTEQUALS && LA26_156<=GREATERTHANOREQUALS)) ) {s = 108;}
-
-                        else if ( (LA26_156==NOT) ) {s = 110;}
-
-                        else if ( (LA26_156==IN) ) {s = 111;}
-
-                        else if ( (LA26_156==LIKE) ) {s = 112;}
-
-                        else if ( (LA26_156==IS) ) {s = 113;}
-
-                        else if ( (LA26_156==RPAREN) && ((strict == false))) {s = 106;}
-
-                        else if ( (LA26_156==ID) && ((strict == false))) {s = 114;}
-
-                        else if ( (LA26_156==DOUBLE_QUOTE) && ((strict == false))) {s = 115;}
-
-                        else if ( (LA26_156==FLOATING_POINT_LITERAL) && ((strict == false))) {s = 116;}
-
-                        else if ( (LA26_156==DECIMAL_INTEGER_LITERAL) && ((strict == false))) {s = 117;}
-
-                        else if ( (LA26_156==QUOTED_STRING) && ((strict == false))) {s = 118;}
-
-                        else if ( (LA26_156==TRUE) && ((strict == false))) {s = 119;}
-
-                        else if ( (LA26_156==FALSE) && ((strict == false))) {s = 120;}
-
-                        else if ( (LA26_156==TIMESTAMP) && ((strict == false))) {s = 121;}
-
-                        else if ( (LA26_156==COLON) && ((strict == false))) {s = 122;}
-
-                         
-                        input.seek(index26_156);
-                        if ( s>=0 ) return s;
-                        break;
-                    case 1 : 
-                        int LA26_0 = input.LA(1);
-
-                         
-                        int index26_0 = input.index();
-                        input.rewind();
-                        s = -1;
-                        if ( (LA26_0==NOT) ) {s = 1;}
-
-                        else if ( (LA26_0==ID) ) {s = 2;}
-
-                        else if ( (LA26_0==DOUBLE_QUOTE) && ((strict == false))) {s = 3;}
-
-                        else if ( (LA26_0==SCORE) ) {s = 4;}
-
-                        else if ( (LA26_0==SELECT) && ((strict == false))) {s = 5;}
-
-                        else if ( (LA26_0==AS) && ((strict == false))) {s = 6;}
-
-                        else if ( (LA26_0==FROM) && ((strict == false))) {s = 7;}
-
-                        else if ( (LA26_0==JOIN) && ((strict == false))) {s = 8;}
-
-                        else if ( (LA26_0==INNER) && ((strict == false))) {s = 9;}
-
-                        else if ( (LA26_0==LEFT) && ((strict == false))) {s = 10;}
-
-                        else if ( (LA26_0==OUTER) && ((strict == false))) {s = 11;}
-
-                        else if ( (LA26_0==ON) && ((strict == false))) {s = 12;}
-
-                        else if ( (LA26_0==WHERE) && ((strict == false))) {s = 13;}
-
-                        else if ( (LA26_0==OR) && ((strict == false))) {s = 14;}
-
-                        else if ( (LA26_0==AND) && ((strict == false))) {s = 15;}
-
-                        else if ( (LA26_0==IN) && ((strict == false))) {s = 16;}
-
-                        else if ( (LA26_0==LIKE) && ((strict == false))) {s = 17;}
-
-                        else if ( (LA26_0==IS) && ((strict == false))) {s = 18;}
-
-                        else if ( (LA26_0==NULL) && ((strict == false))) {s = 19;}
-
-                        else if ( (LA26_0==ANY) ) {s = 20;}
-
-                        else if ( (LA26_0==CONTAINS) ) {s = 21;}
-
-                        else if ( (LA26_0==IN_FOLDER) ) {s = 22;}
-
-                        else if ( (LA26_0==IN_TREE) ) {s = 23;}
-
-                        else if ( (LA26_0==ORDER) && ((strict == false))) {s = 24;}
-
-                        else if ( (LA26_0==BY) && ((strict == false))) {s = 25;}
-
-                        else if ( (LA26_0==ASC) && ((strict == false))) {s = 26;}
-
-                        else if ( (LA26_0==DESC) && ((strict == false))) {s = 27;}
-
-                        else if ( (LA26_0==TIMESTAMP) ) {s = 28;}
-
-                        else if ( (LA26_0==TRUE) ) {s = 29;}
-
-                        else if ( (LA26_0==FALSE) ) {s = 30;}
-
-                        else if ( (LA26_0==FLOATING_POINT_LITERAL) ) {s = 31;}
-
-                        else if ( (LA26_0==DECIMAL_INTEGER_LITERAL) ) {s = 32;}
-
-                        else if ( (LA26_0==QUOTED_STRING) ) {s = 33;}
-
-                        else if ( (LA26_0==COLON) && ((strict == false))) {s = 34;}
-
-                        else if ( (LA26_0==LPAREN) ) {s = 35;}
-
-                         
-                        input.seek(index26_0);
-                        if ( s>=0 ) return s;
-                        break;
-                    case 2 : 
-                        int LA26_152 = input.LA(1);
-
-                         
-                        int index26_152 = input.index();
-                        input.rewind();
-                        s = -1;
-                        if ( (LA26_152==EQUALS||(LA26_152>=NOTEQUALS && LA26_152<=GREATERTHANOREQUALS)) ) {s = 153;}
-
-                        else if ( (LA26_152==RPAREN) && ((strict == false))) {s = 106;}
-
-                        else if ( (LA26_152==ID) && ((strict == false))) {s = 114;}
-
-                        else if ( (LA26_152==DOUBLE_QUOTE) && ((strict == false))) {s = 115;}
-
-                        else if ( (LA26_152==FLOATING_POINT_LITERAL) && ((strict == false))) {s = 116;}
-
-                        else if ( (LA26_152==DECIMAL_INTEGER_LITERAL) && ((strict == false))) {s = 117;}
-
-                        else if ( (LA26_152==QUOTED_STRING) && ((strict == false))) {s = 118;}
-
-                        else if ( (LA26_152==TRUE) && ((strict == false))) {s = 119;}
-
-                        else if ( (LA26_152==FALSE) && ((strict == false))) {s = 120;}
-
-                        else if ( (LA26_152==TIMESTAMP) && ((strict == false))) {s = 121;}
-
-                        else if ( (LA26_152==COLON) && ((strict == false))) {s = 122;}
-
-                         
-                        input.seek(index26_152);
-                        if ( s>=0 ) return s;
-                        break;
-                    case 3 : 
-                        int LA26_103 = input.LA(1);
-
-                         
-                        int index26_103 = input.index();
-                        input.rewind();
-                        s = -1;
-                        if ( (LA26_103==EQUALS||(LA26_103>=NOTEQUALS && LA26_103<=GREATERTHANOREQUALS)) ) {s = 153;}
-
-                        else if ( (LA26_103==RPAREN) && ((strict == false))) {s = 106;}
-
-                        else if ( (LA26_103==ID) && ((strict == false))) {s = 114;}
-
-                        else if ( (LA26_103==DOUBLE_QUOTE) && ((strict == false))) {s = 115;}
-
-                        else if ( (LA26_103==FLOATING_POINT_LITERAL) && ((strict == false))) {s = 116;}
-
-                        else if ( (LA26_103==DECIMAL_INTEGER_LITERAL) && ((strict == false))) {s = 117;}
-
-                        else if ( (LA26_103==QUOTED_STRING) && ((strict == false))) {s = 118;}
-
-                        else if ( (LA26_103==TRUE) && ((strict == false))) {s = 119;}
-
-                        else if ( (LA26_103==FALSE) && ((strict == false))) {s = 120;}
-
-                        else if ( (LA26_103==TIMESTAMP) && ((strict == false))) {s = 121;}
-
-                        else if ( (LA26_103==COLON) && ((strict == false))) {s = 122;}
-
-                         
-                        input.seek(index26_103);
-                        if ( s>=0 ) return s;
-                        break;
-                    case 4 : 
-                        int LA26_101 = input.LA(1);
-
-                         
-                        int index26_101 = input.index();
-                        input.rewind();
-                        s = -1;
-                        if ( (LA26_101==EQUALS||(LA26_101>=NOTEQUALS && LA26_101<=GREATERTHANOREQUALS)) ) {s = 153;}
-
-                        else if ( (LA26_101==RPAREN) && ((strict == false))) {s = 106;}
-
-                        else if ( (LA26_101==ID) && ((strict == false))) {s = 114;}
-
-                        else if ( (LA26_101==DOUBLE_QUOTE) && ((strict == false))) {s = 115;}
-
-                        else if ( (LA26_101==FLOATING_POINT_LITERAL) && ((strict == false))) {s = 116;}
-
-                        else if ( (LA26_101==DECIMAL_INTEGER_LITERAL) && ((strict == false))) {s = 117;}
-
-                        else if ( (LA26_101==QUOTED_STRING) && ((strict == false))) {s = 118;}
-
-                        else if ( (LA26_101==TRUE) && ((strict == false))) {s = 119;}
-
-                        else if ( (LA26_101==FALSE) && ((strict == false))) {s = 120;}
-
-                        else if ( (LA26_101==TIMESTAMP) && ((strict == false))) {s = 121;}
-
-                        else if ( (LA26_101==COLON) && ((strict == false))) {s = 122;}
-
-                         
-                        input.seek(index26_101);
-                        if ( s>=0 ) return s;
-                        break;
-                    case 5 : 
-                        int LA26_102 = input.LA(1);
-
-                         
-                        int index26_102 = input.index();
-                        input.rewind();
-                        s = -1;
-                        if ( (LA26_102==EQUALS||(LA26_102>=NOTEQUALS && LA26_102<=GREATERTHANOREQUALS)) ) {s = 153;}
-
-                        else if ( (LA26_102==RPAREN) && ((strict == false))) {s = 106;}
-
-                        else if ( (LA26_102==ID) && ((strict == false))) {s = 114;}
-
-                        else if ( (LA26_102==DOUBLE_QUOTE) && ((strict == false))) {s = 115;}
-
-                        else if ( (LA26_102==FLOATING_POINT_LITERAL) && ((strict == false))) {s = 116;}
-
-                        else if ( (LA26_102==DECIMAL_INTEGER_LITERAL) && ((strict == false))) {s = 117;}
-
-                        else if ( (LA26_102==QUOTED_STRING) && ((strict == false))) {s = 118;}
-
-                        else if ( (LA26_102==TRUE) && ((strict == false))) {s = 119;}
-
-                        else if ( (LA26_102==FALSE) && ((strict == false))) {s = 120;}
-
-                        else if ( (LA26_102==TIMESTAMP) && ((strict == false))) {s = 121;}
-
-                        else if ( (LA26_102==COLON) && ((strict == false))) {s = 122;}
-
-                         
-                        input.seek(index26_102);
-                        if ( s>=0 ) return s;
-                        break;
-                    case 6 : 
-                        int LA26_218 = input.LA(1);
-
-                         
-                        int index26_218 = input.index();
-                        input.rewind();
-                        s = -1;
-                        if ( (LA26_218==EQUALS||(LA26_218>=NOTEQUALS && LA26_218<=GREATERTHANOREQUALS)) ) {s = 108;}
-
-                        else if ( (LA26_218==NOT) ) {s = 110;}
-
-                        else if ( (LA26_218==IN) ) {s = 111;}
-
-                        else if ( (LA26_218==LIKE) ) {s = 112;}
-
-                        else if ( (LA26_218==IS) ) {s = 113;}
-
-                        else if ( (LA26_218==RPAREN) && ((strict == false))) {s = 106;}
-
-                        else if ( (LA26_218==ID) && ((strict == false))) {s = 114;}
-
-                        else if ( (LA26_218==DOUBLE_QUOTE) && ((strict == false))) {s = 115;}
-
-                        else if ( (LA26_218==FLOATING_POINT_LITERAL) && ((strict == false))) {s = 116;}
-
-                        else if ( (LA26_218==DECIMAL_INTEGER_LITERAL) && ((strict == false))) {s = 117;}
-
-                        else if ( (LA26_218==QUOTED_STRING) && ((strict == false))) {s = 118;}
-
-                        else if ( (LA26_218==TRUE) && ((strict == false))) {s = 119;}
-
-                        else if ( (LA26_218==FALSE) && ((strict == false))) {s = 120;}
-
-                        else if ( (LA26_218==TIMESTAMP) && ((strict == false))) {s = 121;}
-
-                        else if ( (LA26_218==COLON) && ((strict == false))) {s = 122;}
-
-                         
-                        input.seek(index26_218);
-                        if ( s>=0 ) return s;
-                        break;
-                    case 7 : 
-                        int LA26_70 = input.LA(1);
-
-                         
-                        int index26_70 = input.index();
-                        input.rewind();
-                        s = -1;
-                        if ( (LA26_70==NOT) ) {s = 71;}
-
-                        else if ( (LA26_70==ID) ) {s = 72;}
-
-                        else if ( (LA26_70==DOUBLE_QUOTE) ) {s = 73;}
-
-                        else if ( (LA26_70==SCORE) ) {s = 74;}
-
-                        else if ( (LA26_70==SELECT) ) {s = 75;}
-
-                        else if ( (LA26_70==AS) ) {s = 76;}
-
-                        else if ( (LA26_70==FROM) ) {s = 77;}
-
-                        else if ( (LA26_70==JOIN) ) {s = 78;}
-
-                        else if ( (LA26_70==INNER) ) {s = 79;}
-
-                        else if ( (LA26_70==LEFT) ) {s = 80;}
-
-                        else if ( (LA26_70==OUTER) ) {s = 81;}
-
-                        else if ( (LA26_70==ON) ) {s = 82;}
-
-                        else if ( (LA26_70==WHERE) ) {s = 83;}
-
-                        else if ( (LA26_70==OR) ) {s = 84;}
-
-                        else if ( (LA26_70==AND) ) {s = 85;}
-
-                        else if ( (LA26_70==IN) ) {s = 86;}
-
-                        else if ( (LA26_70==LIKE) ) {s = 87;}
-
-                        else if ( (LA26_70==IS) ) {s = 88;}
-
-                        else if ( (LA26_70==NULL) ) {s = 89;}
-
-                        else if ( (LA26_70==ANY) ) {s = 90;}
-
-                        else if ( (LA26_70==CONTAINS) ) {s = 91;}
-
-                        else if ( (LA26_70==IN_FOLDER) ) {s = 92;}
-
-                        else if ( (LA26_70==IN_TREE) ) {s = 93;}
-
-                        else if ( (LA26_70==ORDER) ) {s = 94;}
-
-                        else if ( (LA26_70==BY) ) {s = 95;}
-
-                        else if ( (LA26_70==ASC) ) {s = 96;}
-
-                        else if ( (LA26_70==DESC) ) {s = 97;}
-
-                        else if ( (LA26_70==TIMESTAMP) ) {s = 98;}
-
-                        else if ( (LA26_70==TRUE) ) {s = 99;}
-
-                        else if ( (LA26_70==FALSE) ) {s = 100;}
-
-                        else if ( (LA26_70==FLOATING_POINT_LITERAL) ) {s = 101;}
-
-                        else if ( (LA26_70==DECIMAL_INTEGER_LITERAL) ) {s = 102;}
-
-                        else if ( (LA26_70==QUOTED_STRING) ) {s = 103;}
-
-                        else if ( (LA26_70==COLON) ) {s = 104;}
-
-                        else if ( (LA26_70==LPAREN) ) {s = 105;}
-
-                        else if ( (LA26_70==RPAREN) && ((strict == false))) {s = 106;}
-
-                         
-                        input.seek(index26_70);
-                        if ( s>=0 ) return s;
-                        break;
-                    case 8 : 
-                        int LA26_154 = input.LA(1);
-
-                         
-                        int index26_154 = input.index();
-                        input.rewind();
-                        s = -1;
-                        if ( (LA26_154==EQUALS||(LA26_154>=NOTEQUALS && LA26_154<=GREATERTHANOREQUALS)) ) {s = 153;}
-
-                        else if ( (LA26_154==RPAREN) && ((strict == false))) {s = 106;}
-
-                        else if ( (LA26_154==ID) && ((strict == false))) {s = 114;}
-
-                        else if ( (LA26_154==DOUBLE_QUOTE) && ((strict == false))) {s = 115;}
-
-                        else if ( (LA26_154==FLOATING_POINT_LITERAL) && ((strict == false))) {s = 116;}
-
-                        else if ( (LA26_154==DECIMAL_INTEGER_LITERAL) && ((strict == false))) {s = 117;}
-
-                        else if ( (LA26_154==QUOTED_STRING) && ((strict == false))) {s = 118;}
-
-                        else if ( (LA26_154==TRUE) && ((strict == false))) {s = 119;}
-
-                        else if ( (LA26_154==FALSE) && ((strict == false))) {s = 120;}
-
-                        else if ( (LA26_154==TIMESTAMP) && ((strict == false))) {s = 121;}
-
-                        else if ( (LA26_154==COLON) && ((strict == false))) {s = 122;}
-
-                         
-                        input.seek(index26_154);
-                        if ( s>=0 ) return s;
-                        break;
-                    case 9 : 
-                        int LA26_217 = input.LA(1);
-
-                         
-                        int index26_217 = input.index();
-                        input.rewind();
-                        s = -1;
-                        if ( (LA26_217==EQUALS||(LA26_217>=NOTEQUALS && LA26_217<=GREATERTHANOREQUALS)) ) {s = 153;}
-
-                        else if ( (LA26_217==RPAREN) && ((strict == false))) {s = 106;}
-
-                        else if ( (LA26_217==ID) && ((strict == false))) {s = 114;}
-
-                        else if ( (LA26_217==DOUBLE_QUOTE) && ((strict == false))) {s = 115;}
-
-                        else if ( (LA26_217==FLOATING_POINT_LITERAL) && ((strict == false))) {s = 116;}
-
-                        else if ( (LA26_217==DECIMAL_INTEGER_LITERAL) && ((strict == false))) {s = 117;}
-
-                        else if ( (LA26_217==QUOTED_STRING) && ((strict == false))) {s = 118;}
-
-                        else if ( (LA26_217==TRUE) && ((strict == false))) {s = 119;}
-
-                        else if ( (LA26_217==FALSE) && ((strict == false))) {s = 120;}
-
-                        else if ( (LA26_217==TIMESTAMP) && ((strict == false))) {s = 121;}
-
-                        else if ( (LA26_217==COLON) && ((strict == false))) {s = 122;}
-
-                         
-                        input.seek(index26_217);
-                        if ( s>=0 ) return s;
-                        break;
-                    case 10 : 
-                        int LA26_99 = input.LA(1);
-
-                         
-                        int index26_99 = input.index();
-                        input.rewind();
-                        s = -1;
-                        if ( (LA26_99==LPAREN) ) {s = 109;}
-
-                        else if ( (LA26_99==EQUALS||(LA26_99>=NOTEQUALS && LA26_99<=GREATERTHANOREQUALS)) ) {s = 153;}
-
-                        else if ( (LA26_99==RPAREN) && ((strict == false))) {s = 106;}
-
-                        else if ( (LA26_99==ID) && ((strict == false))) {s = 114;}
-
-                        else if ( (LA26_99==DOUBLE_QUOTE) && ((strict == false))) {s = 115;}
-
-                        else if ( (LA26_99==FLOATING_POINT_LITERAL) && ((strict == false))) {s = 116;}
-
-                        else if ( (LA26_99==DECIMAL_INTEGER_LITERAL) && ((strict == false))) {s = 117;}
-
-                        else if ( (LA26_99==QUOTED_STRING) && ((strict == false))) {s = 118;}
-
-                        else if ( (LA26_99==TRUE) && ((strict == false))) {s = 119;}
-
-                        else if ( (LA26_99==FALSE) && ((strict == false))) {s = 120;}
-
-                        else if ( (LA26_99==TIMESTAMP) && ((strict == false))) {s = 121;}
-
-                        else if ( (LA26_99==COLON) && ((strict == false))) {s = 122;}
-
-                         
-                        input.seek(index26_99);
-                        if ( s>=0 ) return s;
-                        break;
-                    case 11 : 
-                        int LA26_100 = input.LA(1);
-
-                         
-                        int index26_100 = input.index();
-                        input.rewind();
-                        s = -1;
-                        if ( (LA26_100==LPAREN) ) {s = 109;}
-
-                        else if ( (LA26_100==EQUALS||(LA26_100>=NOTEQUALS && LA26_100<=GREATERTHANOREQUALS)) ) {s = 153;}
-
-                        else if ( (LA26_100==RPAREN) && ((strict == false))) {s = 106;}
-
-                        else if ( (LA26_100==ID) && ((strict == false))) {s = 114;}
-
-                        else if ( (LA26_100==DOUBLE_QUOTE) && ((strict == false))) {s = 115;}
-
-                        else if ( (LA26_100==FLOATING_POINT_LITERAL) && ((strict == false))) {s = 116;}
-
-                        else if ( (LA26_100==DECIMAL_INTEGER_LITERAL) && ((strict == false))) {s = 117;}
-
-                        else if ( (LA26_100==QUOTED_STRING) && ((strict == false))) {s = 118;}
-
-                        else if ( (LA26_100==TRUE) && ((strict == false))) {s = 119;}
-
-                        else if ( (LA26_100==FALSE) && ((strict == false))) {s = 120;}
-
-                        else if ( (LA26_100==TIMESTAMP) && ((strict == false))) {s = 121;}
-
-                        else if ( (LA26_100==COLON) && ((strict == false))) {s = 122;}
-
-                         
-                        input.seek(index26_100);
-                        if ( s>=0 ) return s;
-                        break;
-                    case 12 : 
-                        int LA26_158 = input.LA(1);
-
-                         
-                        int index26_158 = input.index();
-                        input.rewind();
-                        s = -1;
-                        if ( (LA26_158==DOT) ) {s = 107;}
-
-                        else if ( (LA26_158==EQUALS||(LA26_158>=NOTEQUALS && LA26_158<=GREATERTHANOREQUALS)) ) {s = 108;}
-
-                        else if ( (LA26_158==NOT) ) {s = 110;}
-
-                        else if ( (LA26_158==IN) ) {s = 111;}
-
-                        else if ( (LA26_158==LIKE) ) {s = 112;}
-
-                        else if ( (LA26_158==IS) ) {s = 113;}
-
-                        else if ( (LA26_158==RPAREN) && ((strict == false))) {s = 106;}
-
-                        else if ( (LA26_158==ID) && ((strict == false))) {s = 114;}
-
-                        else if ( (LA26_158==DOUBLE_QUOTE) && ((strict == false))) {s = 115;}
-
-                        else if ( (LA26_158==FLOATING_POINT_LITERAL) && ((strict == false))) {s = 116;}
-
-                        else if ( (LA26_158==DECIMAL_INTEGER_LITERAL) && ((strict == false))) {s = 117;}
-
-                        else if ( (LA26_158==QUOTED_STRING) && ((strict == false))) {s = 118;}
-
-                        else if ( (LA26_158==TRUE) && ((strict == false))) {s = 119;}
-
-                        else if ( (LA26_158==FALSE) && ((strict == false))) {s = 120;}
-
-                        else if ( (LA26_158==TIMESTAMP) && ((strict == false))) {s = 121;}
-
-                        else if ( (LA26_158==COLON) && ((strict == false))) {s = 122;}
-
-                         
-                        input.seek(index26_158);
-                        if ( s>=0 ) return s;
-                        break;
-                    case 13 : 
-                        int LA26_72 = input.LA(1);
-
-                         
-                        int index26_72 = input.index();
-                        input.rewind();
-                        s = -1;
-                        if ( (LA26_72==DOT) ) {s = 107;}
-
-                        else if ( (LA26_72==EQUALS||(LA26_72>=NOTEQUALS && LA26_72<=GREATERTHANOREQUALS)) ) {s = 108;}
-
-                        else if ( (LA26_72==LPAREN) ) {s = 109;}
-
-                        else if ( (LA26_72==NOT) ) {s = 110;}
-
-                        else if ( (LA26_72==IN) ) {s = 111;}
-
-                        else if ( (LA26_72==LIKE) ) {s = 112;}
-
-                        else if ( (LA26_72==IS) ) {s = 113;}
-
-                        else if ( (LA26_72==RPAREN) && ((strict == false))) {s = 106;}
-
-                        else if ( (LA26_72==ID) && ((strict == false))) {s = 114;}
-
-                        else if ( (LA26_72==DOUBLE_QUOTE) && ((strict == false))) {s = 115;}
-
-                        else if ( (LA26_72==FLOATING_POINT_LITERAL) && ((strict == false))) {s = 116;}
-
-                        else if ( (LA26_72==DECIMAL_INTEGER_LITERAL) && ((strict == false))) {s = 117;}
-
-                        else if ( (LA26_72==QUOTED_STRING) && ((strict == false))) {s = 118;}
-
-                        else if ( (LA26_72==TRUE) && ((strict == false))) {s = 119;}
-
-                        else if ( (LA26_72==FALSE) && ((strict == false))) {s = 120;}
-
-                        else if ( (LA26_72==TIMESTAMP) && ((strict == false))) {s = 121;}
-
-                        else if ( (LA26_72==COLON) && ((strict == false))) {s = 122;}
-
-                         
-                        input.seek(index26_72);
-                        if ( s>=0 ) return s;
-                        break;
-            }
-            if (state.backtracking>0) {state.failed=true; return -1;}
-            NoViableAltException nvae =
-                new NoViableAltException(getDescription(), 26, _s, input);
-            error(nvae);
-            throw nvae;
-        }
-    }
-    static final String DFA27_eotS =
-        "\44\uffff";
-    static final String DFA27_eofS =
-        "\44\uffff";
-    static final String DFA27_minS =
-        "\1\40\43\uffff";
-    static final String DFA27_maxS =
-        "\1\115\43\uffff";
-    static final String DFA27_acceptS =
-        "\1\uffff\42\1\1\2";
-    static final String DFA27_specialS =
-        "\1\0\43\uffff}>";
-    static final String[] DFA27_transitionS = {
-            "\1\4\2\uffff\1\5\2\uffff\1\43\1\uffff\1\6\1\7\1\10\1\11\1\12"+
-            "\1\13\1\uffff\1\14\1\15\1\16\1\17\5\uffff\1\20\1\21\1\22\1\23"+
-            "\1\24\1\25\1\26\1\27\1\30\1\31\1\32\1\33\1\42\1\41\1\1\1\2\1"+
-            "\37\1\40\1\35\1\36\1\34\1\3",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            ""
-    };
-
-    static final short[] DFA27_eot = DFA.unpackEncodedString(DFA27_eotS);
-    static final short[] DFA27_eof = DFA.unpackEncodedString(DFA27_eofS);
-    static final char[] DFA27_min = DFA.unpackEncodedStringToUnsignedChars(DFA27_minS);
-    static final char[] DFA27_max = DFA.unpackEncodedStringToUnsignedChars(DFA27_maxS);
-    static final short[] DFA27_accept = DFA.unpackEncodedString(DFA27_acceptS);
-    static final short[] DFA27_special = DFA.unpackEncodedString(DFA27_specialS);
-    static final short[][] DFA27_transition;
-
-    static {
-        int numStates = DFA27_transitionS.length;
-        DFA27_transition = new short[numStates][];
-        for (int i=0; i<numStates; i++) {
-            DFA27_transition[i] = DFA.unpackEncodedString(DFA27_transitionS[i]);
-        }
-    }
-
-    class DFA27 extends DFA {
-
-        public DFA27(BaseRecognizer recognizer) {
-            this.recognizer = recognizer;
-            this.decisionNumber = 27;
-            this.eot = DFA27_eot;
-            this.eof = DFA27_eof;
-            this.min = DFA27_min;
-            this.max = DFA27_max;
-            this.accept = DFA27_accept;
-            this.special = DFA27_special;
-            this.transition = DFA27_transition;
-        }
-        public String getDescription() {
-            return "561:1: searchTest : ( predicate -> predicate | LPAREN searchOrCondition RPAREN -> searchOrCondition );";
-        }
-        public int specialStateTransition(int s, IntStream _input) throws NoViableAltException {
-            TokenStream input = (TokenStream)_input;
-        	int _s = s;
-            switch ( s ) {
-                    case 0 : 
-                        int LA27_0 = input.LA(1);
-
-                         
-                        int index27_0 = input.index();
-                        input.rewind();
-                        s = -1;
-                        if ( (LA27_0==ID) ) {s = 1;}
-
-                        else if ( (LA27_0==DOUBLE_QUOTE) && ((strict == false))) {s = 2;}
-
-                        else if ( (LA27_0==SCORE) ) {s = 3;}
-
-                        else if ( (LA27_0==SELECT) && ((strict == false))) {s = 4;}
-
-                        else if ( (LA27_0==AS) && ((strict == false))) {s = 5;}
-
-                        else if ( (LA27_0==FROM) && ((strict == false))) {s = 6;}
-
-                        else if ( (LA27_0==JOIN) && ((strict == false))) {s = 7;}
-
-                        else if ( (LA27_0==INNER) && ((strict == false))) {s = 8;}
-
-                        else if ( (LA27_0==LEFT) && ((strict == false))) {s = 9;}
-
-                        else if ( (LA27_0==OUTER) && ((strict == false))) {s = 10;}
-
-                        else if ( (LA27_0==ON) && ((strict == false))) {s = 11;}
-
-                        else if ( (LA27_0==WHERE) && ((strict == false))) {s = 12;}
-
-                        else if ( (LA27_0==OR) && ((strict == false))) {s = 13;}
-
-                        else if ( (LA27_0==AND) && ((strict == false))) {s = 14;}
-
-                        else if ( (LA27_0==NOT) && ((strict == false))) {s = 15;}
-
-                        else if ( (LA27_0==IN) && ((strict == false))) {s = 16;}
-
-                        else if ( (LA27_0==LIKE) && ((strict == false))) {s = 17;}
-
-                        else if ( (LA27_0==IS) && ((strict == false))) {s = 18;}
-
-                        else if ( (LA27_0==NULL) && ((strict == false))) {s = 19;}
-
-                        else if ( (LA27_0==ANY) ) {s = 20;}
-
-                        else if ( (LA27_0==CONTAINS) ) {s = 21;}
-
-                        else if ( (LA27_0==IN_FOLDER) ) {s = 22;}
-
-                        else if ( (LA27_0==IN_TREE) ) {s = 23;}
-
-                        else if ( (LA27_0==ORDER) && ((strict == false))) {s = 24;}
-
-                        else if ( (LA27_0==BY) && ((strict == false))) {s = 25;}
-
-                        else if ( (LA27_0==ASC) && ((strict == false))) {s = 26;}
-
-                        else if ( (LA27_0==DESC) && ((strict == false))) {s = 27;}
-
-                        else if ( (LA27_0==TIMESTAMP) ) {s = 28;}
-
-                        else if ( (LA27_0==TRUE) ) {s = 29;}
-
-                        else if ( (LA27_0==FALSE) ) {s = 30;}
-
-                        else if ( (LA27_0==FLOATING_POINT_LITERAL) ) {s = 31;}
-
-                        else if ( (LA27_0==DECIMAL_INTEGER_LITERAL) ) {s = 32;}
-
-                        else if ( (LA27_0==QUOTED_STRING) ) {s = 33;}
-
-                        else if ( (LA27_0==COLON) && ((strict == false))) {s = 34;}
-
-                        else if ( (LA27_0==LPAREN) ) {s = 35;}
-
-                         
-                        input.seek(index27_0);
-                        if ( s>=0 ) return s;
-                        break;
-            }
-            if (state.backtracking>0) {state.failed=true; return -1;}
-            NoViableAltException nvae =
-                new NoViableAltException(getDescription(), 27, _s, input);
-            error(nvae);
-            throw nvae;
-        }
-    }
-    static final String DFA28_eotS =
-        "\u0113\uffff";
-    static final String DFA28_eofS =
-        "\u00a6\uffff\1\u00ec\36\uffff\1\u00f2\36\uffff\1\u00f2\56\uffff";
-    static final String DFA28_minS =
-        "\1\40\1\45\1\40\21\uffff\4\46\4\uffff\3\46\4\uffff\1\106\2\uffff"+
-        "\1\70\3\uffff\35\107\2\uffff\3\47\2\uffff\1\56\1\40\1\45\1\42\1"+
-        "\40\1\47\7\uffff\1\42\1\40\1\47\1\42\1\40\1\47\35\107\1\106\1\uffff"+
-        "\1\70\10\uffff\35\107\1\47\1\uffff\35\107\1\47\1\uffff\35\107\1"+
-        "\47\2\56\1\40\1\42\5\uffff\1\42\5\uffff\1\42\35\107\1\56";
-    static final String DFA28_maxS =
-        "\1\115\1\72\1\115\21\uffff\1\107\3\46\4\uffff\1\105\2\67\4\uffff"+
-        "\1\107\2\uffff\1\71\3\uffff\35\107\2\uffff\3\114\2\uffff\1\72\1"+
-        "\115\1\72\1\114\1\115\1\114\7\uffff\1\114\1\115\2\114\1\115\1\114"+
-        "\36\107\1\uffff\1\71\10\uffff\35\107\1\100\1\uffff\35\107\1\100"+
-        "\1\uffff\35\107\1\100\2\72\1\115\1\114\5\uffff\1\114\5\uffff\1\114"+
-        "\35\107\1\72";
-    static final String DFA28_acceptS =
-        "\3\uffff\21\1\4\uffff\4\1\3\uffff\4\5\1\uffff\2\1\1\uffff\1\2\1"+
-        "\3\1\4\35\uffff\2\6\3\uffff\2\5\6\uffff\7\1\44\uffff\1\1\1\uffff"+
-        "\1\2\1\3\1\4\1\7\4\1\36\uffff\1\10\36\uffff\1\10\42\uffff\5\7\1"+
-        "\uffff\5\10\37\uffff";
-    static final String DFA28_specialS =
-        "\1\42\1\102\1\72\21\uffff\1\2\7\uffff\1\51\1\12\1\14\13\uffff\1"+
-        "\104\1\112\1\117\1\124\1\106\1\113\1\73\1\75\1\50\1\56\1\34\1\43"+
-        "\1\20\1\25\1\10\1\5\1\13\1\0\1\4\1\125\1\121\1\114\1\105\1\76\1"+
-        "\70\1\57\1\47\1\67\1\115\2\uffff\1\120\1\40\1\37\4\uffff\1\123\1"+
-        "\1\1\uffff\1\64\7\uffff\1\27\1\uffff\1\7\1\26\1\uffff\1\6\35\uffff"+
-        "\1\60\1\uffff\1\62\45\uffff\1\122\36\uffff\1\22\36\uffff\1\32\1"+
-        "\uffff\1\53\1\3\1\31\5\uffff\1\24\5\uffff\1\23\1\21\1\17\1\16\1"+
-        "\15\1\44\1\41\1\36\1\35\1\33\1\30\1\55\1\61\1\63\1\45\1\46\1\52"+
-        "\1\54\1\77\1\100\1\101\1\66\1\71\1\74\1\110\1\107\1\111\1\103\1"+
-        "\116\1\11\1\65}>";
-    static final String[] DFA28_transitionS = {
-            "\1\4\2\uffff\1\5\4\uffff\1\6\1\7\1\10\1\11\1\12\1\13\1\uffff"+
-            "\1\14\1\15\1\16\1\17\5\uffff\1\20\1\21\1\22\1\23\1\24\1\25\1"+
-            "\26\1\27\1\30\1\31\1\32\1\33\1\42\1\41\1\1\1\2\1\37\1\40\1\35"+
-            "\1\36\1\34\1\3",
-            "\1\43\1\45\7\uffff\1\44\3\uffff\1\46\5\44\1\47\1\50\1\51",
-            "\1\52\2\uffff\1\53\4\uffff\1\54\1\55\1\56\1\57\1\60\1\61\1"+
-            "\uffff\1\62\1\63\1\64\1\65\5\uffff\1\66\1\67\1\70\1\71\1\72"+
-            "\1\73\1\74\1\75\1\76\1\77\1\100\1\101\2\uffff\1\106\3\uffff"+
-            "\1\103\1\104\1\102\1\105",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "\1\45\37\uffff\1\107\1\110",
-            "\1\111",
-            "\1\112",
-            "\1\113",
-            "",
-            "",
-            "",
-            "",
-            "\1\45\36\uffff\1\114",
-            "\1\45\7\uffff\1\115\4\uffff\5\115",
-            "\1\45\7\uffff\1\115\4\uffff\5\115",
-            "",
-            "",
-            "",
-            "",
-            "\1\116\1\117",
-            "",
-            "",
-            "\1\47\1\50",
-            "",
-            "",
-            "",
-            "\1\120",
-            "\1\120",
-            "\1\120",
-            "\1\120",
-            "\1\120",
-            "\1\120",
-            "\1\120",
-            "\1\120",
-            "\1\120",
-            "\1\120",
-            "\1\120",
-            "\1\120",
-            "\1\120",
-            "\1\120",
-            "\1\120",
-            "\1\120",
-            "\1\120",
-            "\1\120",
-            "\1\120",
-            "\1\120",
-            "\1\120",
-            "\1\120",
-            "\1\120",
-            "\1\120",
-            "\1\120",
-            "\1\120",
-            "\1\120",
-            "\1\120",
-            "\1\120",
-            "",
-            "",
-            "\1\132\34\uffff\1\131\1\123\1\121\1\122\1\124\1\125\1\126"+
-            "\1\127\1\130",
-            "\1\132\34\uffff\1\131\1\135\1\133\1\134\1\124\1\125\1\126"+
-            "\1\127\1\130",
-            "\1\132\34\uffff\1\131\1\140\1\136\1\137\1\124\1\125\1\126"+
-            "\1\127\1\130",
-            "",
-            "",
-            "\1\44\3\uffff\1\46\5\44\1\47\1\50\1\51",
-            "\1\141\2\uffff\1\142\4\uffff\1\143\1\144\1\145\1\146\1\147"+
-            "\1\150\1\uffff\1\151\1\152\1\153\1\154\5\uffff\1\155\1\156\1"+
-            "\157\1\160\1\161\1\162\1\163\1\164\1\165\1\166\1\167\1\170\2"+
-            "\uffff\1\175\3\uffff\1\172\1\173\1\171\1\174",
-            "\1\176\10\uffff\1\177\3\uffff\1\u0080\5\177\1\u0081\1\u0082"+
-            "\1\u0083",
-            "\1\u0084\2\uffff\1\u0085\1\uffff\1\132\34\uffff\1\131\1\u0088"+
-            "\1\u0086\1\u0087\1\124\1\125\1\126\1\127\1\130",
-            "\1\u0089\2\uffff\1\u008a\4\uffff\1\u008b\1\u008c\1\u008d\1"+
-            "\u008e\1\u008f\1\u0090\1\uffff\1\u0091\1\u0092\1\u0093\1\u0094"+
-            "\5\uffff\1\u0095\1\u0096\1\u0097\1\u0098\1\u0099\1\u009a\1\u009b"+
-            "\1\u009c\1\u009d\1\u009e\1\u009f\1\u00a0\2\uffff\1\u00a5\3\uffff"+
-            "\1\u00a2\1\u00a3\1\u00a1\1\u00a4",
-            "\1\u00a6\34\uffff\1\131\1\u0088\1\u0086\1\u0087\1\124\1\125"+
-            "\1\126\1\127\1\130",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "\1\u00a7\2\uffff\1\u0085\1\uffff\1\132\34\uffff\1\131\1\u0088"+
-            "\1\u0086\1\u0087\1\124\1\125\1\126\1\127\1\130",
-            "\1\u00a8\2\uffff\1\u00a9\4\uffff\1\u00aa\1\u00ab\1\u00ac\1"+
-            "\u00ad\1\u00ae\1\u00af\1\uffff\1\u00b0\1\u00b1\1\u00b2\1\u00b3"+
-            "\5\uffff\1\u00b4\1\u00b5\1\u00b6\1\u00b7\1\u00b8\1\u00b9\1\u00ba"+
-            "\1\u00bb\1\u00bc\1\u00bd\1\u00be\1\u00bf\2\uffff\1\u00c4\3\uffff"+
-            "\1\u00c1\1\u00c2\1\u00c0\1\u00c3",
-            "\1\u00c5\34\uffff\1\131\1\u0088\1\u0086\1\u0087\1\124\1\125"+
-            "\1\126\1\127\1\130",
-            "\1\u00c6\2\uffff\1\u0085\1\uffff\1\132\34\uffff\1\131\1\u0088"+
-            "\1\u0086\1\u0087\1\124\1\125\1\126\1\127\1\130",
-            "\1\u00c7\2\uffff\1\u00c8\4\uffff\1\u00c9\1\u00ca\1\u00cb\1"+
-            "\u00cc\1\u00cd\1\u00ce\1\uffff\1\u00cf\1\u00d0\1\u00d1\1\u00d2"+
-            "\5\uffff\1\u00d3\1\u00d4\1\u00d5\1\u00d6\1\u00d7\1\u00d8\1\u00d9"+
-            "\1\u00da\1\u00db\1\u00dc\1\u00dd\1\u00de\2\uffff\1\u00e3\3\uffff"+
-            "\1\u00e0\1\u00e1\1\u00df\1\u00e2",
-            "\1\u00e4\34\uffff\1\131\1\u0088\1\u0086\1\u0087\1\124\1\125"+
-            "\1\126\1\127\1\130",
-            "\1\u00e5",
-            "\1\u00e5",
-            "\1\u00e5",
-            "\1\u00e5",
-            "\1\u00e5",
-            "\1\u00e5",
-            "\1\u00e5",
-            "\1\u00e5",
-            "\1\u00e5",
-            "\1\u00e5",
-            "\1\u00e5",
-            "\1\u00e5",
-            "\1\u00e5",
-            "\1\u00e5",
-            "\1\u00e5",
-            "\1\u00e5",
-            "\1\u00e5",
-            "\1\u00e5",
-            "\1\u00e5",
-            "\1\u00e5",
-            "\1\u00e5",
-            "\1\u00e5",
-            "\1\u00e5",
-            "\1\u00e5",
-            "\1\u00e5",
-            "\1\u00e5",
-            "\1\u00e5",
-            "\1\u00e5",
-            "\1\u00e5",
-            "\1\u00e6\1\u00e7",
-            "",
-            "\1\u0081\1\u0082",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "\1\u00e8",
-            "\1\u00e8",
-            "\1\u00e8",
-            "\1\u00e8",
-            "\1\u00e8",
-            "\1\u00e8",
-            "\1\u00e8",
-            "\1\u00e8",
-            "\1\u00e8",
-            "\1\u00e8",
-            "\1\u00e8",
-            "\1\u00e8",
-            "\1\u00e8",
-            "\1\u00e8",
-            "\1\u00e8",
-            "\1\u00e8",
-            "\1\u00e8",
-            "\1\u00e8",
-            "\1\u00e8",
-            "\1\u00e8",
-            "\1\u00e8",
-            "\1\u00e8",
-            "\1\u00e8",
-            "\1\u00e8",
-            "\1\u00e8",
-            "\1\u00e8",
-            "\1\u00e8",
-            "\1\u00e8",
-            "\1\u00e8",
-            "\1\u00ed\6\uffff\1\177\1\uffff\1\u00ea\1\u00e9\1\uffff\5\177"+
-            "\10\uffff\1\u00eb",
-            "",
-            "\1\u00ee",
-            "\1\u00ee",
-            "\1\u00ee",
-            "\1\u00ee",
-            "\1\u00ee",
-            "\1\u00ee",
-            "\1\u00ee",
-            "\1\u00ee",
-            "\1\u00ee",
-            "\1\u00ee",
-            "\1\u00ee",
-            "\1\u00ee",
-            "\1\u00ee",
-            "\1\u00ee",
-            "\1\u00ee",
-            "\1\u00ee",
-            "\1\u00ee",
-            "\1\u00ee",
-            "\1\u00ee",
-            "\1\u00ee",
-            "\1\u00ee",
-            "\1\u00ee",
-            "\1\u00ee",
-            "\1\u00ee",
-            "\1\u00ee",
-            "\1\u00ee",
-            "\1\u00ee",
-            "\1\u00ee",
-            "\1\u00ee",
-            "\1\u00f3\6\uffff\1\177\1\uffff\1\u00f0\1\u00ef\1\uffff\5\177"+
-            "\10\uffff\1\u00f1",
-            "",
-            "\1\u00f4",
-            "\1\u00f4",
-            "\1\u00f4",
-            "\1\u00f4",
-            "\1\u00f4",
-            "\1\u00f4",
-            "\1\u00f4",
-            "\1\u00f4",
-            "\1\u00f4",
-            "\1\u00f4",
-            "\1\u00f4",
-            "\1\u00f4",
-            "\1\u00f4",
-            "\1\u00f4",
-            "\1\u00f4",
-            "\1\u00f4",
-            "\1\u00f4",
-            "\1\u00f4",
-            "\1\u00f4",
-            "\1\u00f4",
-            "\1\u00f4",
-            "\1\u00f4",
-            "\1\u00f4",
-            "\1\u00f4",
-            "\1\u00f4",
-            "\1\u00f4",
-            "\1\u00f4",
-            "\1\u00f4",
-            "\1\u00f4",
-            "\1\u00f3\6\uffff\1\177\1\uffff\1\u00f0\1\u00ef\1\uffff\5\177"+
-            "\10\uffff\1\u00f1",
-            "\1\44\3\uffff\1\46\5\44\1\47\1\50\1\51",
-            "\1\177\3\uffff\1\u0080\5\177\1\u0081\1\u0082\1\u0083",
-            "\1\u00f5\2\uffff\1\u00f6\4\uffff\1\u00f7\1\u00f8\1\u00f9\1"+
-            "\u00fa\1\u00fb\1\u00fc\1\uffff\1\u00fd\1\u00fe\1\u00ff\1\u0100"+
-            "\5\uffff\1\u0101\1\u0102\1\u0103\1\u0104\1\u0105\1\u0106\1\u0107"+
-            "\1\u0108\1\u0109\1\u010a\1\u010b\1\u010c\2\uffff\1\u0111\3\uffff"+
-            "\1\u010e\1\u010f\1\u010d\1\u0110",
-            "\1\u0084\2\uffff\1\u0085\1\uffff\1\132\34\uffff\1\131\1\u0088"+
-            "\1\u0086\1\u0087\1\124\1\125\1\126\1\127\1\130",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "\1\u00a7\2\uffff\1\u0085\1\uffff\1\132\34\uffff\1\131\1\u0088"+
-            "\1\u0086\1\u0087\1\124\1\125\1\126\1\127\1\130",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "\1\u00c6\2\uffff\1\u0085\1\uffff\1\132\34\uffff\1\131\1\u0088"+
-            "\1\u0086\1\u0087\1\124\1\125\1\126\1\127\1\130",
-            "\1\u0112",
-            "\1\u0112",
-            "\1\u0112",
-            "\1\u0112",
-            "\1\u0112",
-            "\1\u0112",
-            "\1\u0112",
-            "\1\u0112",
-            "\1\u0112",
-            "\1\u0112",
-            "\1\u0112",
-            "\1\u0112",
-            "\1\u0112",
-            "\1\u0112",
-            "\1\u0112",
-            "\1\u0112",
-            "\1\u0112",
-            "\1\u0112",
-            "\1\u0112",
-            "\1\u0112",
-            "\1\u0112",
-            "\1\u0112",
-            "\1\u0112",
-            "\1\u0112",
-            "\1\u0112",
-            "\1\u0112",
-            "\1\u0112",
-            "\1\u0112",
-            "\1\u0112",
-            "\1\177\3\uffff\1\u0080\5\177\1\u0081\1\u0082\1\u0083"
-    };
-
-    static final short[] DFA28_eot = DFA.unpackEncodedString(DFA28_eotS);
-    static final short[] DFA28_eof = DFA.unpackEncodedString(DFA28_eofS);
-    static final char[] DFA28_min = DFA.unpackEncodedStringToUnsignedChars(DFA28_minS);
-    static final char[] DFA28_max = DFA.unpackEncodedStringToUnsignedChars(DFA28_maxS);
-    static final short[] DFA28_accept = DFA.unpackEncodedString(DFA28_acceptS);
-    static final short[] DFA28_special = DFA.unpackEncodedString(DFA28_specialS);
-    static final short[][] DFA28_transition;
-
-    static {
-        int numStates = DFA28_transitionS.length;
-        DFA28_transition = new short[numStates][];
-        for (int i=0; i<numStates; i++) {
-            DFA28_transition[i] = DFA.unpackEncodedString(DFA28_transitionS[i]);
-        }
-    }
-
-    class DFA28 extends DFA {
-
-        public DFA28(BaseRecognizer recognizer) {
-            this.recognizer = recognizer;
-            this.decisionNumber = 28;
-            this.eot = DFA28_eot;
-            this.eof = DFA28_eof;
-            this.min = DFA28_min;
-            this.max = DFA28_max;
-            this.accept = DFA28_accept;
-            this.special = DFA28_special;
-            this.transition = DFA28_transition;
-        }
-        public String getDescription() {
-            return "569:1: predicate : ( comparisonPredicate | inPredicate | likePredicate | nullPredicate | quantifiedComparisonPredicate | quantifiedInPredicate | textSearchPredicate | folderPredicate );";
-        }
-        public int specialStateTransition(int s, IntStream _input) throws NoViableAltException {
-            TokenStream input = (TokenStream)_input;
-        	int _s = s;
-            switch ( s ) {
-                    case 0 : 
-                        int LA28_59 = input.LA(1);
-
-                         
-                        int index28_59 = input.index();
-                        input.rewind();
-                        s = -1;
-                        if ( (LA28_59==DOUBLE_QUOTE) && ((strict == false))) {s = 80;}
-
-                         
-                        input.seek(index28_59);
-                        if ( s>=0 ) return s;
-                        break;
-                    case 1 : 
-                        int LA28_81 = input.LA(1);
-
-                         
-                        int index28_81 = input.index();
-                        input.rewind();
-                        s = -1;
-                        if ( (LA28_81==COMMA) ) {s = 132;}
-
-                        else if ( (LA28_81==DOT) && ((strict == false))) {s = 133;}
-
-                        else if ( (LA28_81==RPAREN) && ((strict == false))) {s = 90;}
-
-                        else if ( (LA28_81==ID) && ((strict == false))) {s = 134;}
-
-                        else if ( (LA28_81==DOUBLE_QUOTE) && ((strict == false))) {s = 135;}
-
-                        else if ( (LA28_81==FLOATING_POINT_LITERAL) && ((strict == false))) {s = 84;}
-
-                        else if ( (LA28_81==DECIMAL_INTEGER_LITERAL) && ((strict == false))) {s = 85;}
-
-                        else if ( (LA28_81==QUOTED_STRING) && ((strict == false))) {s = 136;}
-
-                        else if ( (LA28_81==TRUE) && ((strict == false))) {s = 86;}
-
-                        else if ( (LA28_81==FALSE) && ((strict == false))) {s = 87;}
-
-                        else if ( (LA28_81==TIMESTAMP) && ((strict == false))) {s = 88;}
-
-                        else if ( (LA28_81==COLON) && ((strict == false))) {s = 89;}
-
-                         
-                        input.seek(index28_81);
-                        if ( s>=0 ) return s;
-                        break;
-                    case 2 : 
-                        int LA28_20 = input.LA(1);
-
-                         
-                        int index28_20 = input.index();
-                        input.rewind();
-                        s = -1;
-                        if ( (LA28_20==LPAREN) && ((strict == false))) {s = 37;}
-
-                        else if ( (LA28_20==ID) ) {s = 71;}
-
-                        else if ( (LA28_20==DOUBLE_QUOTE) ) {s = 72;}
-
-                         
-                        input.seek(index28_20);
-                        if ( s>=0 ) return s;
-                        break;
-                    case 3 : 
-                        int LA28_231 = input.LA(1);
-
-                         
-                        int index28_231 = input.index();
-                        input.rewind();
-                        s = -1;
-                        if ( (LA28_231==SELECT) && ((strict == false))) {s = 245;}
-
-                        else if ( (LA28_231==AS) && ((strict == false))) {s = 246;}
-
-                        else if ( (LA28_231==FROM) && ((strict == false))) {s = 247;}
-
-                        else if ( (LA28_231==JOIN) && ((strict == false))) {s = 248;}
-
-                        else if ( (LA28_231==INNER) && ((strict == false))) {s = 249;}
-
-                        else if ( (LA28_231==LEFT) && ((strict == false))) {s = 250;}
-
-                        else if ( (LA28_231==OUTER) && ((strict == false))) {s = 251;}
-
-                        else if ( (LA28_231==ON) && ((strict == false))) {s = 252;}
-
-                        else if ( (LA28_231==WHERE) && ((strict == false))) {s = 253;}
-
-                        else if ( (LA28_231==OR) && ((strict == false))) {s = 254;}
-
-                        else if ( (LA28_231==AND) && ((strict == false))) {s = 255;}
-
-                        else if ( (LA28_231==NOT) && ((strict == false))) {s = 256;}
-
-                        else if ( (LA28_231==IN) && ((strict == false))) {s = 257;}
-
-                        else if ( (LA28_231==LIKE) && ((strict == false))) {s = 258;}
-
-                        else if ( (LA28_231==IS) && ((strict == false))) {s = 259;}
-
-                        else if ( (LA28_231==NULL) && ((strict == false))) {s = 260;}
-
-                        else if ( (LA28_231==ANY) && ((strict == false))) {s = 261;}
-
-                        else if ( (LA28_231==CONTAINS) && ((strict == false))) {s = 262;}
-
-                        else if ( (LA28_231==IN_FOLDER) && ((strict == false))) {s = 263;}
-
-                        else if ( (LA28_231==IN_TREE) && ((strict == false))) {s = 264;}
-
-                        else if ( (LA28_231==ORDER) && ((strict == false))) {s = 265;}
-
-                        else if ( (LA28_231==BY) && ((strict == false))) {s = 266;}
-
-                        else if ( (LA28_231==ASC) && ((strict == false))) {s = 267;}
-
-                        else if ( (LA28_231==DESC) && ((strict == false))) {s = 268;}
-
-                        else if ( (LA28_231==TIMESTAMP) && ((strict == false))) {s = 269;}
-
-                        else if ( (LA28_231==TRUE) && ((strict == false))) {s = 270;}
-
-                        else if ( (LA28_231==FALSE) && ((strict == false))) {s = 271;}
-
-                        else if ( (LA28_231==SCORE) && ((strict == false))) {s = 272;}
-
-                        else if ( (LA28_231==ID) && ((strict == false))) {s = 273;}
-
-                         
-                        input.seek(index28_231);
-                        if ( s>=0 ) return s;
-                        break;
-                    case 4 : 
-                        int LA28_60 = input.LA(1);
-
-                         
-                        int index28_60 = input.index();
-                        input.rewind();
-                        s = -1;
-                        if ( (LA28_60==DOUBLE_QUOTE) && ((strict == false))) {s = 80;}
-
-                         
-                        input.seek(index28_60);
-                        if ( s>=0 ) return s;
-                        break;
-                    case 5 : 
-                        int LA28_57 = input.LA(1);
-
-                         
-                        int index28_57 = input.index();
-                        input.rewind();
-                        s = -1;
-                        if ( (LA28_57==DOUBLE_QUOTE) && ((strict == false))) {s = 80;}
-
-                         
-                        input.seek(index28_57);
-                        if ( s>=0 ) return s;
-                        break;
-                    case 6 : 
-                        int LA28_96 = input.LA(1);
-
-                         
-                        int index28_96 = input.index();
-                        input.rewind();
-                        s = -1;
-                        if ( (LA28_96==RPAREN) ) {s = 228;}
-
-                        else if ( (LA28_96==ID) && ((strict == false))) {s = 134;}
-
-                        else if ( (LA28_96==DOUBLE_QUOTE) && ((strict == false))) {s = 135;}
-
-                        else if ( (LA28_96==FLOATING_POINT_LITERAL) && ((strict == false))) {s = 84;}
-
-                        else if ( (LA28_96==DECIMAL_INTEGER_LITERAL) && ((strict == false))) {s = 85;}
-
-                        else if ( (LA28_96==QUOTED_STRING) && ((strict == false))) {s = 136;}
-
-                        else if ( (LA28_96==TRUE) && ((strict == false))) {s = 86;}
-
-                        else if ( (LA28_96==FALSE) && ((strict == false))) {s = 87;}
-
-                        else if ( (LA28_96==TIMESTAMP) && ((strict == false))) {s = 88;}
-
-                        else if ( (LA28_96==COLON) && ((strict == false))) {s = 89;}
-
-                         
-                        input.seek(index28_96);
-                        if ( s>=0 ) return s;
-                        break;
-                    case 7 : 
-                        int LA28_93 = input.LA(1);
-
-                         
-                        int index28_93 = input.index();
-                        input.rewind();
-                        s = -1;
-                        if ( (LA28_93==RPAREN) ) {s = 197;}
-
-                        else if ( (LA28_93==ID) && ((strict == false))) {s = 134;}
-
-                        else if ( (LA28_93==DOUBLE_QUOTE) && ((strict == false))) {s = 135;}
-
-                        else if ( (LA28_93==FLOATING_POINT_LITERAL) && ((strict == false))) {s = 84;}
-
-                        else if ( (LA28_93==DECIMAL_INTEGER_LITERAL) && ((strict == false))) {s = 85;}
-
-                        else if ( (LA28_93==QUOTED_STRING) && ((strict == false))) {s = 136;}
-
-                        else if ( (LA28_93==TRUE) && ((strict == false))) {s = 86;}
-
-                        else if ( (LA28_93==FALSE) && ((strict == false))) {s = 87;}
-
-                        else if ( (LA28_93==TIMESTAMP) && ((strict == false))) {s = 88;}
-
-                        else if ( (LA28_93==COLON) && ((strict == false))) {s = 89;}
-
-                         
-                        input.seek(index28_93);
-                        if ( s>=0 ) return s;
-                        break;
-                    case 8 : 
-                        int LA28_56 = input.LA(1);
-
-                         
-                        int index28_56 = input.index();
-                        input.rewind();
-                        s = -1;
-                        if ( (LA28_56==DOUBLE_QUOTE) && ((strict == false))) {s = 80;}
-
-                         
-                        input.seek(index28_56);
-                        if ( s>=0 ) return s;
-                        break;
-                    case 9 : 
-                        int LA28_273 = input.LA(1);
-
-                         
-                        int index28_273 = input.index();
-                        input.rewind();
-                        s = -1;
-                        if ( (LA28_273==DOUBLE_QUOTE) && ((strict == false))) {s = 274;}
-
-                         
-                        input.seek(index28_273);
-                        if ( s>=0 ) return s;
-                        break;
-                    case 10 : 
-                        int LA28_29 = input.LA(1);
-
-                         
-                        int index28_29 = input.index();
-                        input.rewind();
-                        s = -1;
-                        if ( (LA28_29==LPAREN) && ((strict == false))) {s = 37;}
-
-                        else if ( (LA28_29==EQUALS||(LA28_29>=NOTEQUALS && LA28_29<=GREATERTHANOREQUALS)) ) {s = 77;}
-
-                         
-                        input.seek(index28_29);
-                        if ( s>=0 ) return s;
-                        break;
-                    case 11 : 
-                        int LA28_58 = input.LA(1);
-
-                         
-                        int index28_58 = input.index();
-                        input.rewind();
-                        s = -1;
-                        if ( (LA28_58==DOUBLE_QUOTE) && ((strict == false))) {s = 80;}
-
-                         
-                        input.seek(index28_58);
-                        if ( s>=0 ) return s;
-                        break;
-                    case 12 : 
-                        int LA28_30 = input.LA(1);
-
-                         
-                        int index28_30 = input.index();
-                        input.rewind();
-                        s = -1;
-                        if ( (LA28_30==LPAREN) && ((strict == false))) {s = 37;}
-
-                        else if ( (LA28_30==EQUALS||(LA28_30>=NOTEQUALS && LA28_30<=GREATERTHANOREQUALS)) ) {s = 77;}
-
-                         
-                        input.seek(index28_30);
-                        if ( s>=0 ) return s;
-                        break;
-                    case 13 : 
-                        int LA28_248 = input.LA(1);
-
-                         
-                        int index28_248 = input.index();
-                        input.rewind();
-                        s = -1;
-                        if ( (LA28_248==DOUBLE_QUOTE) && ((strict == false))) {s = 274;}
-
-                         
-                        input.seek(index28_248);
-                        if ( s>=0 ) return s;
-                        break;
-                    case 14 : 
-                        int LA28_247 = input.LA(1);
-
-                         
-                        int index28_247 = input.index();
-                        input.rewind();
-                        s = -1;
-                        if ( (LA28_247==DOUBLE_QUOTE) && ((strict == false))) {s = 274;}
-
-                         
-                        input.seek(index28_247);
-                        if ( s>=0 ) return s;
-                        break;
-                    case 15 : 
-                        int LA28_246 = input.LA(1);
-
-                         
-                        int index28_246 = input.index();
-                        input.rewind();
-                        s = -1;
-                        if ( (LA28_246==DOUBLE_QUOTE) && ((strict == false))) {s = 274;}
-
-                         
-                        input.seek(index28_246);
-                        if ( s>=0 ) return s;
-                        break;
-                    case 16 : 
-                        int LA28_54 = input.LA(1);
-
-                         
-                        int index28_54 = input.index();
-                        input.rewind();
-                        s = -1;
-                        if ( (LA28_54==DOUBLE_QUOTE) && ((strict == false))) {s = 80;}
-
-                         
-                        input.seek(index28_54);
-                        if ( s>=0 ) return s;
-                        break;
-                    case 17 : 
-                        int LA28_245 = input.LA(1);
-
-                         
-                        int index28_245 = input.index();
-                        input.rewind();
-                        s = -1;
-                        if ( (LA28_245==DOUBLE_QUOTE) && ((strict == false))) {s = 274;}
-
-                         
-                        input.seek(index28_245);
-                        if ( s>=0 ) return s;
-                        break;
-                    case 18 : 
-                        int LA28_197 = input.LA(1);
-
-                         
-                        int index28_197 = input.index();
-                        input.rewind();
-                        s = -1;
-                        if ( (LA28_197==EQUALS||(LA28_197>=NOTEQUALS && LA28_197<=GREATERTHANOREQUALS)) && ((strict == false))) {s = 127;}
-
-                        else if ( (LA28_197==AND) ) {s = 239;}
-
-                        else if ( (LA28_197==OR) ) {s = 240;}
-
-                        else if ( (LA28_197==ORDER) ) {s = 241;}
-
-                        else if ( (LA28_197==EOF) ) {s = 242;}
-
-                        else if ( (LA28_197==RPAREN) ) {s = 243;}
-
-                         
-                        input.seek(index28_197);
-                        if ( s>=0 ) return s;
-                        break;
-                    case 19 : 
-                        int LA28_244 = input.LA(1);
-
-                         
-                        int index28_244 = input.index();
-                        input.rewind();
-                        s = -1;
-                        if ( (LA28_244==DOT) && ((strict == false))) {s = 133;}
-
-                        else if ( (LA28_244==RPAREN) && ((strict == false))) {s = 90;}
-
-                        else if ( (LA28_244==ID) && ((strict == false))) {s = 134;}
-
-                        else if ( (LA28_244==DOUBLE_QUOTE) && ((strict == false))) {s = 135;}
-
-                        else if ( (LA28_244==FLOATING_POINT_LITERAL) && ((strict == false))) {s = 84;}
-
-                        else if ( (LA28_244==DECIMAL_INTEGER_LITERAL) && ((strict == false))) {s = 85;}
-
-                        else if ( (LA28_244==QUOTED_STRING) && ((strict == false))) {s = 136;}
-
-                        else if ( (LA28_244==TRUE) && ((strict == false))) {s = 86;}
-
-                        else if ( (LA28_244==FALSE) && ((strict == false))) {s = 87;}
-
-                        else if ( (LA28_244==TIMESTAMP) && ((strict == false))) {s = 88;}
-
-                        else if ( (LA28_244==COLON) && ((strict == false))) {s = 89;}
-
-                        else if ( (LA28_244==COMMA) ) {s = 198;}
-
-                         
-                        input.seek(index28_244);
-                        if ( s>=0 ) return s;
-                        break;
-                    case 20 : 
-                        int LA28_238 = input.LA(1);
-
-                         
-                        int index28_238 = input.index();
-                        input.rewind();
-                        s = -1;
-                        if ( (LA28_238==DOT) && ((strict == false))) {s = 133;}
-
-                        else if ( (LA28_238==RPAREN) && ((strict == false))) {s = 90;}
-
-                        else if ( (LA28_238==ID) && ((strict == false))) {s = 134;}
-
-                        else if ( (LA28_238==DOUBLE_QUOTE) && ((strict == false))) {s = 135;}
-
-                        else if ( (LA28_238==FLOATING_POINT_LITERAL) && ((strict == false))) {s = 84;}
-
-                        else if ( (LA28_238==DECIMAL_INTEGER_LITERAL) && ((strict == false))) {s = 85;}
-
-                        else if ( (LA28_238==QUOTED_STRING) && ((strict == false))) {s = 136;}
-
-                        else if ( (LA28_238==TRUE) && ((strict == false))) {s = 86;}
-
-                        else if ( (LA28_238==FALSE) && ((strict == false))) {s = 87;}
-
-                        else if ( (LA28_238==TIMESTAMP) && ((strict == false))) {s = 88;}
-
-                        else if ( (LA28_238==COLON) && ((strict == false))) {s = 89;}
-
-                        else if ( (LA28_238==COMMA) ) {s = 167;}
-
-                         
-                        input.seek(index28_238);
-                        if ( s>=0 ) return s;
-                        break;
-                    case 21 : 
-                        int LA28_55 = input.LA(1);
-
-                         
-                        int index28_55 = input.index();
-                        input.rewind();
-                        s = -1;
-                        if ( (LA28_55==DOUBLE_QUOTE) && ((strict == false))) {s = 80;}
-
-                         
-                        input.seek(index28_55);
-                        if ( s>=0 ) return s;
-                        break;
-                    case 22 : 
-                        int LA28_94 = input.LA(1);
-
-                         
-                        int index28_94 = input.index();
-                        input.rewind();
-                        s = -1;
-                        if ( (LA28_94==DOT) && ((strict == false))) {s = 133;}
-
-                        else if ( (LA28_94==RPAREN) && ((strict == false))) {s = 90;}
-
-                        else if ( (LA28_94==ID) && ((strict == false))) {s = 134;}
-
-                        else if ( (LA28_94==DOUBLE_QUOTE) && ((strict == false))) {s = 135;}
-
-                        else if ( (LA28_94==FLOATING_POINT_LITERAL) && ((strict == false))) {s = 84;}
-
-                        else if ( (LA28_94==DECIMAL_INTEGER_LITERAL) && ((strict == false))) {s = 85;}
-
-                        else if ( (LA28_94==QUOTED_STRING) && ((strict == false))) {s = 136;}
-
-                        else if ( (LA28_94==TRUE) && ((strict == false))) {s = 86;}
-
-                        else if ( (LA28_94==FALSE) && ((strict == false))) {s = 87;}
-
-                        else if ( (LA28_94==TIMESTAMP) && ((strict == false))) {s = 88;}
-
-                        else if ( (LA28_94==COLON) && ((strict == false))) {s = 89;}
-
-                        else if ( (LA28_94==COMMA) ) {s = 198;}
-
-                         
-                        input.seek(index28_94);
-                        if ( s>=0 ) return s;
-                        break;
-                    case 23 : 
-                        int LA28_91 = input.LA(1);
-
-                         
-                        int index28_91 = input.index();
-                        input.rewind();
-                        s = -1;
-                        if ( (LA28_91==DOT) && ((strict == false))) {s = 133;}
-
-                        else if ( (LA28_91==RPAREN) && ((strict == false))) {s = 90;}
-
-                        else if ( (LA28_91==ID) && ((strict == false))) {s = 134;}
-
-                        else if ( (LA28_91==DOUBLE_QUOTE) && ((strict == false))) {s = 135;}
-
-                        else if ( (LA28_91==FLOATING_POINT_LITERAL) && ((strict == false))) {s = 84;}
-
-                        else if ( (LA28_91==DECIMAL_INTEGER_LITERAL) && ((strict == false))) {s = 85;}
-
-                        else if ( (LA28_91==QUOTED_STRING) && ((strict == false))) {s = 136;}
-
-                        else if ( (LA28_91==TRUE) && ((strict == false))) {s = 86;}
-
-                        else if ( (LA28_91==FALSE) && ((strict == false))) {s = 87;}
-
-                        else if ( (LA28_91==TIMESTAMP) && ((strict == false))) {s = 88;}
-
-                        else if ( (LA28_91==COLON) && ((strict == false))) {s = 89;}
-
-                        else if ( (LA28_91==COMMA) ) {s = 167;}
-
-                         
-                        input.seek(index28_91);
-                        if ( s>=0 ) return s;
-                        break;
-                    case 24 : 
-                        int LA28_254 = input.LA(1);
-
-                         
-                        int index28_254 = input.index();
-                        input.rewind();
-                        s = -1;
-                        if ( (LA28_254==DOUBLE_QUOTE) && ((strict == false))) {s = 274;}
-
-                         
-                        input.seek(index28_254);
-                        if ( s>=0 ) return s;
-                        break;
-                    case 25 : 
-                        int LA28_232 = input.LA(1);
-
-                         
-                        int index28_232 = input.index();
-                        input.rewind();
-                        s = -1;
-                        if ( (LA28_232==COMMA) ) {s = 132;}
-
-                        else if ( (LA28_232==DOT) && ((strict == false))) {s = 133;}
-
-                        else if ( (LA28_232==RPAREN) && ((strict == false))) {s = 90;}
-
-                        else if ( (LA28_232==ID) && ((strict == false))) {s = 134;}
-
-                        else if ( (LA28_232==DOUBLE_QUOTE) && ((strict == false))) {s = 135;}
-
-                        else if ( (LA28_232==FLOATING_POINT_LITERAL) && ((strict == false))) {s = 84;}
-
-                        else if ( (LA28_232==DECIMAL_INTEGER_LITERAL) && ((strict == false))) {s = 85;}
-
-                        else if ( (LA28_232==QUOTED_STRING) && ((strict == false))) {s = 136;}
-
-                        else if ( (LA28_232==TRUE) && ((strict == false))) {s = 86;}
-
-                        else if ( (LA28_232==FALSE) && ((strict == false))) {s = 87;}
-
-                        else if ( (LA28_232==TIMESTAMP) && ((strict == false))) {s = 88;}
-
-                        else if ( (LA28_232==COLON) && ((strict == false))) {s = 89;}
-
-                         
-                        input.seek(index28_232);
-                        if ( s>=0 ) return s;
-                        break;
-                    case 26 : 
-                        int LA28_228 = input.LA(1);
-
-                         
-                        int index28_228 = input.index();
-                        input.rewind();
-                        s = -1;
-                        if ( (LA28_228==EQUALS||(LA28_228>=NOTEQUALS && LA28_228<=GREATERTHANOREQUALS)) && ((strict == false))) {s = 127;}
-
-                        else if ( (LA28_228==AND) ) {s = 239;}
-
-                        else if ( (LA28_228==OR) ) {s = 240;}
-
-                        else if ( (LA28_228==ORDER) ) {s = 241;}
-
-                        else if ( (LA28_228==EOF) ) {s = 242;}
-
-                        else if ( (LA28_228==RPAREN) ) {s = 243;}
-
-                         
-                        input.seek(index28_228);
-                        if ( s>=0 ) return s;
-                        break;
-                    case 27 : 
-                        int LA28_253 = input.LA(1);
-
-                         
-                        int index28_253 = input.index();
-                        input.rewind();
-                        s = -1;
-                        if ( (LA28_253==DOUBLE_QUOTE) && ((strict == false))) {s = 274;}
-
-                         
-                        input.seek(index28_253);
-                        if ( s>=0 ) return s;
-                        break;
-                    case 28 : 
-                        int LA28_52 = input.LA(1);
-
-                         
-                        int index28_52 = input.index();
-                        input.rewind();
-                        s = -1;
-                        if ( (LA28_52==DOUBLE_QUOTE) && ((strict == false))) {s = 80;}
-
-                         
-                        input.seek(index28_52);
-                        if ( s>=0 ) return s;
-                        break;
-                    case 29 : 
-                        int LA28_252 = input.LA(1);
-
-                         
-                        int index28_252 = input.index();
-                        input.rewind();
-                        s = -1;
-                        if ( (LA28_252==DOUBLE_QUOTE) && ((strict == false))) {s = 274;}
-
-                         
-                        input.seek(index28_252);
-                        if ( s>=0 ) return s;
-                        break;
-                    case 30 : 
-                        int LA28_251 = input.LA(1);
-
-                         
-                        int index28_251 = input.index();
-                        input.rewind();
-                        s = -1;
-                        if ( (LA28_251==DOUBLE_QUOTE) && ((strict == false))) {s = 274;}
-
-                         
-                        input.seek(index28_251);
-                        if ( s>=0 ) return s;
-                        break;
-                    case 31 : 
-                        int LA28_75 = input.LA(1);
-
-                         
-                        int index28_75 = input.index();
-                        input.rewind();
-                        s = -1;
-                        if ( (LA28_75==ID) ) {s = 94;}
-
-                        else if ( (LA28_75==DOUBLE_QUOTE) ) {s = 95;}
-
-                        else if ( (LA28_75==FLOATING_POINT_LITERAL) && ((strict == false))) {s = 84;}
-
-                        else if ( (LA28_75==DECIMAL_INTEGER_LITERAL) && ((strict == false))) {s = 85;}
-
-                        else if ( (LA28_75==QUOTED_STRING) ) {s = 96;}
-
-                        else if ( (LA28_75==TRUE) && ((strict == false))) {s = 86;}
-
-                        else if ( (LA28_75==FALSE) && ((strict == false))) {s = 87;}
-
-                        else if ( (LA28_75==TIMESTAMP) && ((strict == false))) {s = 88;}
-
-                        else if ( (LA28_75==COLON) && ((strict == false))) {s = 89;}
-
-                        else if ( (LA28_75==RPAREN) && ((strict == false))) {s = 90;}
-
-                         
-                        input.seek(index28_75);
-                        if ( s>=0 ) return s;
-                        break;
-                    case 32 : 
-                        int LA28_74 = input.LA(1);
-
-                         
-                        int index28_74 = input.index();
-                        input.rewind();
-                        s = -1;
-                        if ( (LA28_74==ID) ) {s = 91;}
-
-                        else if ( (LA28_74==DOUBLE_QUOTE) ) {s = 92;}
-
-                        else if ( (LA28_74==FLOATING_POINT_LITERAL) && ((strict == false))) {s = 84;}
-
-                        else if ( (LA28_74==DECIMAL_INTEGER_LITERAL) && ((strict == false))) {s = 85;}
-
-                        else if ( (LA28_74==QUOTED_STRING) ) {s = 93;}
-
-                        else if ( (LA28_74==TRUE) && ((strict == false))) {s = 86;}
-
-                        else if ( (LA28_74==FALSE) && ((strict == false))) {s = 87;}
-
-                        else if ( (LA28_74==TIMESTAMP) && ((strict == false))) {s = 88;}
-
-                        else if ( (LA28_74==COLON) && ((strict == false))) {s = 89;}
-
-                        else if ( (LA28_74==RPAREN) && ((strict == false))) {s = 90;}
-
-                         
-                        input.seek(index28_74);
-                        if ( s>=0 ) return s;
-                        break;
-                    case 33 : 
-                        int LA28_250 = input.LA(1);
-
-                         
-                        int index28_250 = input.index();
-                        input.rewind();
-                        s = -1;
-                        if ( (LA28_250==DOUBLE_QUOTE) && ((strict == false))) {s = 274;}
-
-                         
-                        input.seek(index28_250);
-                        if ( s>=0 ) return s;
-                        break;
-                    case 34 : 
-                        int LA28_0 = input.LA(1);
-
-                         
-                        int index28_0 = input.index();
-                        input.rewind();
-                        s = -1;
-                        if ( (LA28_0==ID) ) {s = 1;}
-
-                        else if ( (LA28_0==DOUBLE_QUOTE) && ((strict == false))) {s = 2;}
-
-                        else if ( (LA28_0==SCORE) ) {s = 3;}
-
-                        else if ( (LA28_0==SELECT) && ((strict == false))) {s = 4;}
-
-                        else if ( (LA28_0==AS) && ((strict == false))) {s = 5;}
-
-                        else if ( (LA28_0==FROM) && ((strict == false))) {s = 6;}
-
-                        else if ( (LA28_0==JOIN) && ((strict == false))) {s = 7;}
-
-                        else if ( (LA28_0==INNER) && ((strict == false))) {s = 8;}
-
-                        else if ( (LA28_0==LEFT) && ((strict == false))) {s = 9;}
-
-                        else if ( (LA28_0==OUTER) && ((strict == false))) {s = 10;}
-
-                        else if ( (LA28_0==ON) && ((strict == false))) {s = 11;}
-
-                        else if ( (LA28_0==WHERE) && ((strict == false))) {s = 12;}
-
-                        else if ( (LA28_0==OR) && ((strict == false))) {s = 13;}
-
-                        else if ( (LA28_0==AND) && ((strict == false))) {s = 14;}
-
-                        else if ( (LA28_0==NOT) && ((strict == false))) {s = 15;}
-
-                        else if ( (LA28_0==IN) && ((strict == false))) {s = 16;}
-
-                        else if ( (LA28_0==LIKE) && ((strict == false))) {s = 17;}
-
-                        else if ( (LA28_0==IS) && ((strict == false))) {s = 18;}
-
-                        else if ( (LA28_0==NULL) && ((strict == false))) {s = 19;}
-
-                        else if ( (LA28_0==ANY) ) {s = 20;}
-
-                        else if ( (LA28_0==CONTAINS) ) {s = 21;}
-
-                        else if ( (LA28_0==IN_FOLDER) ) {s = 22;}
-
-                        else if ( (LA28_0==IN_TREE) ) {s = 23;}
-
-                        else if ( (LA28_0==ORDER) && ((strict == false))) {s = 24;}
-
-                        else if ( (LA28_0==BY) && ((strict == false))) {s = 25;}
-
-                        else if ( (LA28_0==ASC) && ((strict == false))) {s = 26;}
-
-                        else if ( (LA28_0==DESC) && ((strict == false))) {s = 27;}
-
-                        else if ( (LA28_0==TIMESTAMP) ) {s = 28;}
-
-                        else if ( (LA28_0==TRUE) ) {s = 29;}
-
-                        else if ( (LA28_0==FALSE) ) {s = 30;}
-
-                        else if ( (LA28_0==FLOATING_POINT_LITERAL) ) {s = 31;}
-
-                        else if ( (LA28_0==DECIMAL_INTEGER_LITERAL) ) {s = 32;}
-
-                        else if ( (LA28_0==QUOTED_STRING) ) {s = 33;}
-
-                        else if ( (LA28_0==COLON) && ((strict == false))) {s = 34;}
-
-                         
-                        input.seek(index28_0);
-                        if ( s>=0 ) return s;
-                        break;
-                    case 35 : 
-                        int LA28_53 = input.LA(1);
-
-                         
-                        int index28_53 = input.index();
-                        input.rewind();
-                        s = -1;
-                        if ( (LA28_53==DOUBLE_QUOTE) && ((strict == false))) {s = 80;}
-
-                         
-                        input.seek(index28_53);
-                        if ( s>=0 ) return s;
-                        break;
-                    case 36 : 
-                        int LA28_249 = input.LA(1);
-
-                         
-                        int index28_249 = input.index();
-                        input.rewind();
-                        s = -1;
-                        if ( (LA28_249==DOUBLE_QUOTE) && ((strict == false))) {s = 274;}
-
-                         
-                        input.seek(index28_249);
-                        if ( s>=0 ) return s;
-                        break;
-                    case 37 : 
-                        int LA28_258 = input.LA(1);
-
-                         
-                        int index28_258 = input.index();
-                        input.rewind();
-                        s = -1;
-                        if ( (LA28_258==DOUBLE_QUOTE) && ((strict == false))) {s = 274;}
-
-                         
-                        input.seek(index28_258);
-                        if ( s>=0 ) return s;
-                        break;
-                    case 38 : 
-                        int LA28_259 = input.LA(1);
-
-                         
-                        int index28_259 = input.index();
-                        input.rewind();
-                        s = -1;
-                        if ( (LA28_259==DOUBLE_QUOTE) && ((strict == false))) {s = 274;}
-
-                         
-                        input.seek(index28_259);
-                        if ( s>=0 ) return s;
-                        break;
-                    case 39 : 
-                        int LA28_68 = input.LA(1);
-
-                         
-                        int index28_68 = input.index();
-                        input.rewind();
-                        s = -1;
-                        if ( (LA28_68==DOUBLE_QUOTE) && ((strict == false))) {s = 80;}
-
-                         
-                        input.seek(index28_68);
-                        if ( s>=0 ) return s;
-                        break;
-                    case 40 : 
-                        int LA28_50 = input.LA(1);
-
-                         
-                        int index28_50 = input.index();
-                        input.rewind();
-                        s = -1;
-                        if ( (LA28_50==DOUBLE_QUOTE) && ((strict == false))) {s = 80;}
-
-                         
-                        input.seek(index28_50);
-                        if ( s>=0 ) return s;
-                        break;
-                    case 41 : 
-                        int LA28_28 = input.LA(1);
-
-                         
-                        int index28_28 = input.index();
-                        input.rewind();
-                        s = -1;
-                        if ( (LA28_28==QUOTED_STRING) ) {s = 76;}
-
-                        else if ( (LA28_28==LPAREN) && ((strict == false))) {s = 37;}
-
-                         
-                        input.seek(index28_28);
-                        if ( s>=0 ) return s;
-                        break;
-                    case 42 : 
-                        int LA28_260 = input.LA(1);
-
-                         
-                        int index28_260 = input.index();
-                        input.rewind();
-                        s = -1;
-                        if ( (LA28_260==DOUBLE_QUOTE) && ((strict == false))) {s = 274;}
-
-                         
-                        input.seek(index28_260);
-                        if ( s>=0 ) return s;
-                        break;
-                    case 43 : 
-                        int LA28_230 = input.LA(1);
-
-                         
-                        int index28_230 = input.index();
-                        input.rewind();
-                        s = -1;
-                        if ( (LA28_230==EQUALS||(LA28_230>=NOTEQUALS && LA28_230<=GREATERTHANOREQUALS)) && ((strict == false))) {s = 127;}
-
-                        else if ( (LA28_230==NOT) && ((strict == false))) {s = 128;}
-
-                        else if ( (LA28_230==IN) && ((strict == false))) {s = 129;}
-
-                        else if ( (LA28_230==LIKE) && ((strict == false))) {s = 130;}
-
-                        else if ( (LA28_230==IS) && ((strict == false))) {s = 131;}
-
-                         
-                        input.seek(index28_230);
-                        if ( s>=0 ) return s;
-                        break;
-                    case 44 : 
-                        int LA28_261 = input.LA(1);
-
-                         
-                        int index28_261 = input.index();
-                        input.rewind();
-                        s = -1;
-                        if ( (LA28_261==DOUBLE_QUOTE) && ((strict == false))) {s = 274;}
-
-                         
-                        input.seek(index28_261);
-                        if ( s>=0 ) return s;
-                        break;
-                    case 45 : 
-                        int LA28_255 = input.LA(1);
-
-                         
-                        int index28_255 = input.index();
-                        input.rewind();
-                        s = -1;
-                        if ( (LA28_255==DOUBLE_QUOTE) && ((strict == false))) {s = 274;}
-
-                         
-                        input.seek(index28_255);
-                        if ( s>=0 ) return s;
-                        break;
-                    case 46 : 
-                        int LA28_51 = input.LA(1);
-
-                         
-                        int index28_51 = input.index();
-                        input.rewind();
-                        s = -1;
-                        if ( (LA28_51==DOUBLE_QUOTE) && ((strict == false))) {s = 80;}
-
-                         
-                        input.seek(index28_51);
-                        if ( s>=0 ) return s;
-                        break;
-                    case 47 : 
-                        int LA28_67 = input.LA(1);
-
-                         
-                        int index28_67 = input.index();
-                        input.rewind();
-                        s = -1;
-                        if ( (LA28_67==DOUBLE_QUOTE) && ((strict == false))) {s = 80;}
-
-                         
-                        input.seek(index28_67);
-                        if ( s>=0 ) return s;
-                        break;
-                    case 48 : 
-                        int LA28_126 = input.LA(1);
-
-                         
-                        int index28_126 = input.index();
-                        input.rewind();
-                        s = -1;
-                        if ( (LA28_126==ID) && ((strict == false))) {s = 230;}
-
-                        else if ( (LA28_126==DOUBLE_QUOTE) && ((strict == false))) {s = 231;}
-
-                         
-                        input.seek(index28_126);
-                        if ( s>=0 ) return s;
-                        break;
-                    case 49 : 
-                        int LA28_256 = input.LA(1);
-
-                         
-                        int index28_256 = input.index();
-                        input.rewind();
-                        s = -1;
-                        if ( (LA28_256==DOUBLE_QUOTE) && ((strict == false))) {s = 274;}
-
-                         
-                        input.seek(index28_256);
-                        if ( s>=0 ) return s;
-                        break;
-                    case 50 : 
-                        int LA28_128 = input.LA(1);
-
-                         
-                        int index28_128 = input.index();
-                        input.rewind();
-                        s = -1;
-                        if ( (LA28_128==IN) && ((strict == false))) {s = 129;}
-
-                        else if ( (LA28_128==LIKE) && ((strict == false))) {s = 130;}
-
-                         
-                        input.seek(index28_128);
-                        if ( s>=0 ) return s;
-                        break;
-                    case 51 : 
-                        int LA28_257 = input.LA(1);
-
-                         
-                        int index28_257 = input.index();
-                        input.rewind();
-                        s = -1;
-                        if ( (LA28_257==DOUBLE_QUOTE) && ((strict == false))) {s = 274;}
-
-                         
-                        input.seek(index28_257);
-                        if ( s>=0 ) return s;
-                        break;
-                    case 52 : 
-                        int LA28_83 = input.LA(1);
-
-                         
-                        int index28_83 = input.index();
-                        input.rewind();
-                        s = -1;
-                        if ( (LA28_83==RPAREN) ) {s = 166;}
-
-                        else if ( (LA28_83==ID) && ((strict == false))) {s = 134;}
-
-                        else if ( (LA28_83==DOUBLE_QUOTE) && ((strict == false))) {s = 135;}
-
-                        else if ( (LA28_83==FLOATING_POINT_LITERAL) && ((strict == false))) {s = 84;}
-
-                        else if ( (LA28_83==DECIMAL_INTEGER_LITERAL) && ((strict == false))) {s = 85;}
-
-                        else if ( (LA28_83==QUOTED_STRING) && ((strict == false))) {s = 136;}
-
-                        else if ( (LA28_83==TRUE) && ((strict == false))) {s = 86;}
-
-                        else if ( (LA28_83==FALSE) && ((strict == false))) {s = 87;}
-
-                        else if ( (LA28_83==TIMESTAMP) && ((strict == false))) {s = 88;}
-
-                        else if ( (LA28_83==COLON) && ((strict == false))) {s = 89;}
-
-                         
-                        input.seek(index28_83);
-                        if ( s>=0 ) return s;
-                        break;
-                    case 53 : 
-                        int LA28_274 = input.LA(1);
-
-                         
-                        int index28_274 = input.index();
-                        input.rewind();
-                        s = -1;
-                        if ( (LA28_274==EQUALS||(LA28_274>=NOTEQUALS && LA28_274<=GREATERTHANOREQUALS)) && ((strict == false))) {s = 127;}
-
-                        else if ( (LA28_274==NOT) && ((strict == false))) {s = 128;}
-
-                        else if ( (LA28_274==IN) && ((strict == false))) {s = 129;}
-
-                        else if ( (LA28_274==LIKE) && ((strict == false))) {s = 130;}
-
-                        else if ( (LA28_274==IS) && ((strict == false))) {s = 131;}
-
-                         
-                        input.seek(index28_274);
-                        if ( s>=0 ) return s;
-                        break;
-                    case 54 : 
-                        int LA28_265 = input.LA(1);
-
-                         
-                        int index28_265 = input.index();
-                        input.rewind();
-                        s = -1;
-                        if ( (LA28_265==DOUBLE_QUOTE) && ((strict == false))) {s = 274;}
-
-                         
-                        input.seek(index28_265);
-                        if ( s>=0 ) return s;
-                        break;
-                    case 55 : 
-                        int LA28_69 = input.LA(1);
-
-                         
-                        int index28_69 = input.index();
-                        input.rewind();
-                        s = -1;
-                        if ( (LA28_69==DOUBLE_QUOTE) && ((strict == false))) {s = 80;}
-
-                         
-                        input.seek(index28_69);
-                        if ( s>=0 ) return s;
-                        break;
-                    case 56 : 
-                        int LA28_66 = input.LA(1);
-
-                         
-                        int index28_66 = input.index();
-                        input.rewind();
-                        s = -1;
-                        if ( (LA28_66==DOUBLE_QUOTE) && ((strict == false))) {s = 80;}
-
-                         
-                        input.seek(index28_66);
-                        if ( s>=0 ) return s;
-                        break;
-                    case 57 : 
-                        int LA28_266 = input.LA(1);
-
-                         
-                        int index28_266 = input.index();
-                        input.rewind();
-                        s = -1;
-                        if ( (LA28_266==DOUBLE_QUOTE) && ((strict == false))) {s = 274;}
-
-                         
-                        input.seek(index28_266);
-                        if ( s>=0 ) return s;
-                        break;
-                    case 58 : 
-                        int LA28_2 = input.LA(1);
-
-                         
-                        int index28_2 = input.index();
-                        input.rewind();
-                        s = -1;
-                        if ( (LA28_2==SELECT) && ((strict == false))) {s = 42;}
-
-                        else if ( (LA28_2==AS) && ((strict == false))) {s = 43;}
-
-                        else if ( (LA28_2==FROM) && ((strict == false))) {s = 44;}
-
-                        else if ( (LA28_2==JOIN) && ((strict == false))) {s = 45;}
-
-                        else if ( (LA28_2==INNER) && ((strict == false))) {s = 46;}
-
-                        else if ( (LA28_2==LEFT) && ((strict == false))) {s = 47;}
-
-                        else if ( (LA28_2==OUTER) && ((strict == false))) {s = 48;}
-
-                        else if ( (LA28_2==ON) && ((strict == false))) {s = 49;}
-
-                        else if ( (LA28_2==WHERE) && ((strict == false))) {s = 50;}
-
-                        else if ( (LA28_2==OR) && ((strict == false))) {s = 51;}
-
-                        else if ( (LA28_2==AND) && ((strict == false))) {s = 52;}
-
-                        else if ( (LA28_2==NOT) && ((strict == false))) {s = 53;}
-
-                        else if ( (LA28_2==IN) && ((strict == false))) {s = 54;}
-
-                        else if ( (LA28_2==LIKE) && ((strict == false))) {s = 55;}
-
-                        else if ( (LA28_2==IS) && ((strict == false))) {s = 56;}
-
-                        else if ( (LA28_2==NULL) && ((strict == false))) {s = 57;}
-
-                        else if ( (LA28_2==ANY) && ((strict == false))) {s = 58;}
-
-                        else if ( (LA28_2==CONTAINS) && ((strict == false))) {s = 59;}
-
-                        else if ( (LA28_2==IN_FOLDER) && ((strict == false))) {s = 60;}
-
-                        else if ( (LA28_2==IN_TREE) && ((strict == false))) {s = 61;}
-
-                        else if ( (LA28_2==ORDER) && ((strict == false))) {s = 62;}
-
-                        else if ( (LA28_2==BY) && ((strict == false))) {s = 63;}
-
-                        else if ( (LA28_2==ASC) && ((strict == false))) {s = 64;}
-
-                        else if ( (LA28_2==DESC) && ((strict == false))) {s = 65;}
-
-                        else if ( (LA28_2==TIMESTAMP) && ((strict == false))) {s = 66;}
-
-                        else if ( (LA28_2==TRUE) && ((strict == false))) {s = 67;}
-
-                        else if ( (LA28_2==FALSE) && ((strict == false))) {s = 68;}
-
-                        else if ( (LA28_2==SCORE) && ((strict == false))) {s = 69;}
-
-                        else if ( (LA28_2==ID) && ((strict == false))) {s = 70;}
-
-                         
-                        input.seek(index28_2);
-                        if ( s>=0 ) return s;
-                        break;
-                    case 59 : 
-                        int LA28_48 = input.LA(1);
-
-                         
-                        int index28_48 = input.index();
-                        input.rewind();
-                        s = -1;
-                        if ( (LA28_48==DOUBLE_QUOTE) && ((strict == false))) {s = 80;}
-
-                         
-                        input.seek(index28_48);
-                        if ( s>=0 ) return s;
-                        break;
-                    case 60 : 
-                        int LA28_267 = input.LA(1);
-
-                         
-                        int index28_267 = input.index();
-                        input.rewind();
-                        s = -1;
-                        if ( (LA28_267==DOUBLE_QUOTE) && ((strict == false))) {s = 274;}
-
-                         
-                        input.seek(index28_267);
-                        if ( s>=0 ) return s;
-                        break;
-                    case 61 : 
-                        int LA28_49 = input.LA(1);
-
-                         
-                        int index28_49 = input.index();
-                        input.rewind();
-                        s = -1;
-                        if ( (LA28_49==DOUBLE_QUOTE) && ((strict == false))) {s = 80;}
-
-                         
-                        input.seek(index28_49);
-                        if ( s>=0 ) return s;
-                        break;
-                    case 62 : 
-                        int LA28_65 = input.LA(1);
-
-                         
-                        int index28_65 = input.index();
-                        input.rewind();
-                        s = -1;
-                        if ( (LA28_65==DOUBLE_QUOTE) && ((strict == false))) {s = 80;}
-
-                         
-                        input.seek(index28_65);
-                        if ( s>=0 ) return s;
-                        break;
-                    case 63 : 
-                        int LA28_262 = input.LA(1);
-
-                         
-                        int index28_262 = input.index();
-                        input.rewind();
-                        s = -1;
-                        if ( (LA28_262==DOUBLE_QUOTE) && ((strict == false))) {s = 274;}
-
-                         
-                        input.seek(index28_262);
-                        if ( s>=0 ) return s;
-                        break;
-                    case 64 : 
-                        int LA28_263 = input.LA(1);
-
-                         
-                        int index28_263 = input.index();
-                        input.rewind();
-                        s = -1;
-                        if ( (LA28_263==DOUBLE_QUOTE) && ((strict == false))) {s = 274;}
-
-                         
-                        input.seek(index28_263);
-                        if ( s>=0 ) return s;
-                        break;
-                    case 65 : 
-                        int LA28_264 = input.LA(1);
-
-                         
-                        int index28_264 = input.index();
-                        input.rewind();
-                        s = -1;
-                        if ( (LA28_264==DOUBLE_QUOTE) && ((strict == false))) {s = 274;}
-
-                         
-                        input.seek(index28_264);
-                        if ( s>=0 ) return s;
-                        break;
-                    case 66 : 
-                        int LA28_1 = input.LA(1);
-
-                         
-                        int index28_1 = input.index();
-                        input.rewind();
-                        s = -1;
-                        if ( (LA28_1==DOT) ) {s = 35;}
-
-                        else if ( (LA28_1==EQUALS||(LA28_1>=NOTEQUALS && LA28_1<=GREATERTHANOREQUALS)) ) {s = 36;}
-
-                        else if ( (LA28_1==LPAREN) && ((strict == false))) {s = 37;}
-
-                        else if ( (LA28_1==NOT) ) {s = 38;}
-
-                        else if ( (LA28_1==IN) ) {s = 39;}
-
-                        else if ( (LA28_1==LIKE) ) {s = 40;}
-
-                        else if ( (LA28_1==IS) ) {s = 41;}
-
-                         
-                        input.seek(index28_1);
-                        if ( s>=0 ) return s;
-                        break;
-                    case 67 : 
-                        int LA28_271 = input.LA(1);
-
-                         
-                        int index28_271 = input.index();
-                        input.rewind();
-                        s = -1;
-                        if ( (LA28_271==DOUBLE_QUOTE) && ((strict == false))) {s = 274;}
-
-                         
-                        input.seek(index28_271);
-                        if ( s>=0 ) return s;
-                        break;
-                    case 68 : 
-                        int LA28_42 = input.LA(1);
-
-                         
-                        int index28_42 = input.index();
-                        input.rewind();
-                        s = -1;
-                        if ( (LA28_42==DOUBLE_QUOTE) && ((strict == false))) {s = 80;}
-
-                         
-                        input.seek(index28_42);
-                        if ( s>=0 ) return s;
-                        break;
-                    case 69 : 
-                        int LA28_64 = input.LA(1);
-
-                         
-                        int index28_64 = input.index();
-                        input.rewind();
-                        s = -1;
-                        if ( (LA28_64==DOUBLE_QUOTE) && ((strict == false))) {s = 80;}
-
-                         
-                        input.seek(index28_64);
-                        if ( s>=0 ) return s;
-                        break;
-                    case 70 : 
-                        int LA28_46 = input.LA(1);
-
-                         
-                        int index28_46 = input.index();
-                        input.rewind();
-                        s = -1;
-                        if ( (LA28_46==DOUBLE_QUOTE) && ((strict == false))) {s = 80;}
-
-                         
-                        input.seek(index28_46);
-                        if ( s>=0 ) return s;
-                        break;
-                    case 71 : 
-                        int LA28_269 = input.LA(1);
-
-                         
-                        int index28_269 = input.index();
-                        input.rewind();
-                        s = -1;
-                        if ( (LA28_269==DOUBLE_QUOTE) && ((strict == false))) {s = 274;}
-
-                         
-                        input.seek(index28_269);
-                        if ( s>=0 ) return s;
-                        break;
-                    case 72 : 
-                        int LA28_268 = input.LA(1);
-
-                         
-                        int index28_268 = input.index();
-                        input.rewind();
-                        s = -1;
-                        if ( (LA28_268==DOUBLE_QUOTE) && ((strict == false))) {s = 274;}
-
-                         
-                        input.seek(index28_268);
-                        if ( s>=0 ) return s;
-                        break;
-                    case 73 : 
-                        int LA28_270 = input.LA(1);
-
-                         
-                        int index28_270 = input.index();
-                        input.rewind();
-                        s = -1;
-                        if ( (LA28_270==DOUBLE_QUOTE) && ((strict == false))) {s = 274;}
-
-                         
-                        input.seek(index28_270);
-                        if ( s>=0 ) return s;
-                        break;
-                    case 74 : 
-                        int LA28_43 = input.LA(1);
-
-                         
-                        int index28_43 = input.index();
-                        input.rewind();
-                        s = -1;
-                        if ( (LA28_43==DOUBLE_QUOTE) && ((strict == false))) {s = 80;}
-
-                         
-                        input.seek(index28_43);
-                        if ( s>=0 ) return s;
-                        break;
-                    case 75 : 
-                        int LA28_47 = input.LA(1);
-
-                         
-                        int index28_47 = input.index();
-                        input.rewind();
-                        s = -1;
-                        if ( (LA28_47==DOUBLE_QUOTE) && ((strict == false))) {s = 80;}
-
-                         
-                        input.seek(index28_47);
-                        if ( s>=0 ) return s;
-                        break;
-                    case 76 : 
-                        int LA28_63 = input.LA(1);
-
-                         
-                        int index28_63 = input.index();
-                        input.rewind();
-                        s = -1;
-                        if ( (LA28_63==DOUBLE_QUOTE) && ((strict == false))) {s = 80;}
-
-                         
-                        input.seek(index28_63);
-                        if ( s>=0 ) return s;
-                        break;
-                    case 77 : 
-                        int LA28_70 = input.LA(1);
-
-                         
-                        int index28_70 = input.index();
-                        input.rewind();
-                        s = -1;
-                        if ( (LA28_70==DOUBLE_QUOTE) && ((strict == false))) {s = 80;}
-
-                         
-                        input.seek(index28_70);
-                        if ( s>=0 ) return s;
-                        break;
-                    case 78 : 
-                        int LA28_272 = input.LA(1);
-
-                         
-                        int index28_272 = input.index();
-                        input.rewind();
-                        s = -1;
-                        if ( (LA28_272==DOUBLE_QUOTE) && ((strict == false))) {s = 274;}
-
-                         
-                        input.seek(index28_272);
-                        if ( s>=0 ) return s;
-                        break;
-                    case 79 : 
-                        int LA28_44 = input.LA(1);
-
-                         
-                        int index28_44 = input.index();
-                        input.rewind();
-                        s = -1;
-                        if ( (LA28_44==DOUBLE_QUOTE) && ((strict == false))) {s = 80;}
-
-                         
-                        input.seek(index28_44);
-                        if ( s>=0 ) return s;
-                        break;
-                    case 80 : 
-                        int LA28_73 = input.LA(1);
-
-                         
-                        int index28_73 = input.index();
-                        input.rewind();
-                        s = -1;
-                        if ( (LA28_73==ID) ) {s = 81;}
-
-                        else if ( (LA28_73==DOUBLE_QUOTE) ) {s = 82;}
-
-                        else if ( (LA28_73==QUOTED_STRING) ) {s = 83;}
-
-                        else if ( (LA28_73==FLOATING_POINT_LITERAL) && ((strict == false))) {s = 84;}
-
-                        else if ( (LA28_73==DECIMAL_INTEGER_LITERAL) && ((strict == false))) {s = 85;}
-
-                        else if ( (LA28_73==TRUE) && ((strict == false))) {s = 86;}
-
-                        else if ( (LA28_73==FALSE) && ((strict == false))) {s = 87;}
-
-                        else if ( (LA28_73==TIMESTAMP) && ((strict == false))) {s = 88;}
-
-                        else if ( (LA28_73==COLON) && ((strict == false))) {s = 89;}
-
-                        else if ( (LA28_73==RPAREN) && ((strict == false))) {s = 90;}
-
-                         
-                        input.seek(index28_73);
-                        if ( s>=0 ) return s;
-                        break;
-                    case 81 : 
-                        int LA28_62 = input.LA(1);
-
-                         
-                        int index28_62 = input.index();
-                        input.rewind();
-                        s = -1;
-                        if ( (LA28_62==DOUBLE_QUOTE) && ((strict == false))) {s = 80;}
-
-                         
-                        input.seek(index28_62);
-                        if ( s>=0 ) return s;
-                        break;
-                    case 82 : 
-                        int LA28_166 = input.LA(1);
-
-                         
-                        int index28_166 = input.index();
-                        input.rewind();
-                        s = -1;
-                        if ( (LA28_166==AND) ) {s = 233;}
-
-                        else if ( (LA28_166==OR) ) {s = 234;}
-
-                        else if ( (LA28_166==ORDER) ) {s = 235;}
-
-                        else if ( (LA28_166==EOF) ) {s = 236;}
-
-                        else if ( (LA28_166==RPAREN) ) {s = 237;}
-
-                        else if ( (LA28_166==EQUALS||(LA28_166>=NOTEQUALS && LA28_166<=GREATERTHANOREQUALS)) && ((strict == false))) {s = 127;}
-
-                         
-                        input.seek(index28_166);
-                        if ( s>=0 ) return s;
-                        break;
-                    case 83 : 
-                        int LA28_80 = input.LA(1);
-
-                         
-                        int index28_80 = input.index();
-                        input.rewind();
-                        s = -1;
-                        if ( (LA28_80==DOT) && ((strict == false))) {s = 126;}
-
-                        else if ( (LA28_80==EQUALS||(LA28_80>=NOTEQUALS && LA28_80<=GREATERTHANOREQUALS)) && ((strict == false))) {s = 127;}
-
-                        else if ( (LA28_80==NOT) && ((strict == false))) {s = 128;}
-
-                        else if ( (LA28_80==IN) && ((strict == false))) {s = 129;}
-
-                        else if ( (LA28_80==LIKE) && ((strict == false))) {s = 130;}
-
-                        else if ( (LA28_80==IS) && ((strict == false))) {s = 131;}
-
-                         
-                        input.seek(index28_80);
-                        if ( s>=0 ) return s;
-                        break;
-                    case 84 : 
-                        int LA28_45 = input.LA(1);
-
-                         
-                        int index28_45 = input.index();
-                        input.rewind();
-                        s = -1;
-                        if ( (LA28_45==DOUBLE_QUOTE) && ((strict == false))) {s = 80;}
-
-                         
-                        input.seek(index28_45);
-                        if ( s>=0 ) return s;
-                        break;
-                    case 85 : 
-                        int LA28_61 = input.LA(1);
-
-                         
-                        int index28_61 = input.index();
-                        input.rewind();
-                        s = -1;
-                        if ( (LA28_61==DOUBLE_QUOTE) && ((strict == false))) {s = 80;}
-
-                         
-                        input.seek(index28_61);
-                        if ( s>=0 ) return s;
-                        break;
-            }
-            if (state.backtracking>0) {state.failed=true; return -1;}
-            NoViableAltException nvae =
-                new NoViableAltException(getDescription(), 28, _s, input);
-            error(nvae);
-            throw nvae;
-        }
-    }
-    static final String DFA34_eotS =
-        "\151\uffff";
-    static final String DFA34_eofS =
-        "\151\uffff";
-    static final String DFA34_minS =
-        "\1\106\1\45\1\40\1\106\1\62\35\107\1\72\1\40\2\uffff\1\45\35\107"+
-        "\1\106\1\62\2\72\1\40\2\uffff\35\107\1\72";
-    static final String DFA34_maxS =
-        "\1\107\1\72\1\115\1\107\1\73\35\107\1\72\1\115\2\uffff\1\72\36"+
-        "\107\1\73\2\72\1\115\2\uffff\35\107\1\72";
-    static final String DFA34_acceptS =
-        "\44\uffff\1\1\1\2\43\uffff\1\1\1\2\36\uffff";
-    static final String DFA34_specialS =
-        "\1\46\1\uffff\1\50\2\uffff\1\35\1\26\1\31\1\33\1\44\1\47\1\45\1"+
-        "\37\1\42\1\73\1\72\1\75\1\57\1\65\1\63\1\7\1\1\1\20\1\24\1\14\1"+
-        "\32\1\27\1\30\1\36\1\34\1\43\1\41\1\52\1\71\4\uffff\1\40\35\uffff"+
-        "\1\16\1\66\1\uffff\1\62\1\25\2\uffff\1\12\1\15\1\13\1\21\1\17\1"+
-        "\23\1\22\1\2\1\0\1\4\1\3\1\6\1\5\1\11\1\10\1\70\1\67\1\64\1\61\1"+
-        "\60\1\55\1\54\1\51\1\101\1\77\1\76\1\74\1\100\1\56\1\53}>";
-    static final String[] DFA34_transitionS = {
-            "\1\1\1\2",
-            "\1\3\24\uffff\1\4",
-            "\1\5\2\uffff\1\6\4\uffff\1\7\1\10\1\11\1\12\1\13\1\14\1\uffff"+
-            "\1\15\1\16\1\17\1\20\5\uffff\1\21\1\22\1\23\1\24\1\25\1\26\1"+
-            "\27\1\30\1\31\1\32\1\33\1\34\2\uffff\1\41\3\uffff\1\36\1\37"+
-            "\1\35\1\40",
-            "\1\42\1\43",
-            "\1\45\10\uffff\1\44",
-            "\1\46",
-            "\1\46",
-            "\1\46",
-            "\1\46",
-            "\1\46",
-            "\1\46",
-            "\1\46",
-            "\1\46",
-            "\1\46",
-            "\1\46",
-            "\1\46",
-            "\1\46",
-            "\1\46",
-            "\1\46",
-            "\1\46",
-            "\1\46",
-            "\1\46",
-            "\1\46",
-            "\1\46",
-            "\1\46",
-            "\1\46",
-            "\1\46",
-            "\1\46",
-            "\1\46",
-            "\1\46",
-            "\1\46",
-            "\1\46",
-            "\1\46",
-            "\1\46",
-            "\1\4",
-            "\1\47\2\uffff\1\50\4\uffff\1\51\1\52\1\53\1\54\1\55\1\56\1"+
-            "\uffff\1\57\1\60\1\61\1\62\5\uffff\1\63\1\64\1\65\1\66\1\67"+
-            "\1\70\1\71\1\72\1\73\1\74\1\75\1\76\2\uffff\1\103\3\uffff\1"+
-            "\100\1\101\1\77\1\102",
-            "",
-            "",
-            "\1\104\24\uffff\1\105",
-            "\1\106",
-            "\1\106",
-            "\1\106",
-            "\1\106",
-            "\1\106",
-            "\1\106",
-            "\1\106",
-            "\1\106",
-            "\1\106",
-            "\1\106",
-            "\1\106",
-            "\1\106",
-            "\1\106",
-            "\1\106",
-            "\1\106",
-            "\1\106",
-            "\1\106",
-            "\1\106",
-            "\1\106",
-            "\1\106",
-            "\1\106",
-            "\1\106",
-            "\1\106",
-            "\1\106",
-            "\1\106",
-            "\1\106",
-            "\1\106",
-            "\1\106",
-            "\1\106",
-            "\1\107\1\110",
-            "\1\112\10\uffff\1\111",
-            "\1\4",
-            "\1\105",
-            "\1\113\2\uffff\1\114\4\uffff\1\115\1\116\1\117\1\120\1\121"+
-            "\1\122\1\uffff\1\123\1\124\1\125\1\126\5\uffff\1\127\1\130\1"+
-            "\131\1\132\1\133\1\134\1\135\1\136\1\137\1\140\1\141\1\142\2"+
-            "\uffff\1\147\3\uffff\1\144\1\145\1\143\1\146",
-            "",
-            "",
-            "\1\150",
-            "\1\150",
-            "\1\150",
-            "\1\150",
-            "\1\150",
-            "\1\150",
-            "\1\150",
-            "\1\150",
-            "\1\150",
-            "\1\150",
-            "\1\150",
-            "\1\150",
-            "\1\150",
-            "\1\150",
-            "\1\150",
-            "\1\150",
-            "\1\150",
-            "\1\150",
-            "\1\150",
-            "\1\150",
-            "\1\150",
-            "\1\150",
-            "\1\150",
-            "\1\150",
-            "\1\150",
-            "\1\150",
-            "\1\150",
-            "\1\150",
-            "\1\150",
-            "\1\105"
-    };
-
-    static final short[] DFA34_eot = DFA.unpackEncodedString(DFA34_eotS);
-    static final short[] DFA34_eof = DFA.unpackEncodedString(DFA34_eofS);
-    static final char[] DFA34_min = DFA.unpackEncodedStringToUnsignedChars(DFA34_minS);
-    static final char[] DFA34_max = DFA.unpackEncodedStringToUnsignedChars(DFA34_maxS);
-    static final short[] DFA34_accept = DFA.unpackEncodedString(DFA34_acceptS);
-    static final short[] DFA34_special = DFA.unpackEncodedString(DFA34_specialS);
-    static final short[][] DFA34_transition;
-
-    static {
-        int numStates = DFA34_transitionS.length;
-        DFA34_transition = new short[numStates][];
-        for (int i=0; i<numStates; i++) {
-            DFA34_transition[i] = DFA.unpackEncodedString(DFA34_transitionS[i]);
-        }
-    }
-
-    class DFA34 extends DFA {
-
-        public DFA34(BaseRecognizer recognizer) {
-            this.recognizer = recognizer;
-            this.decisionNumber = 34;
-            this.eot = DFA34_eot;
-            this.eof = DFA34_eof;
-            this.min = DFA34_min;
-            this.max = DFA34_max;
-            this.accept = DFA34_accept;
-            this.special = DFA34_special;
-            this.transition = DFA34_transition;
-        }
-        public String getDescription() {
-            return "633:1: nullPredicate : ( columnReference IS NULL -> ^( PRED_EXISTS columnReference NOT ) | columnReference IS NOT NULL -> ^( PRED_EXISTS columnReference ) );";
-        }
-        public int specialStateTransition(int s, IntStream _input) throws NoViableAltException {
-            TokenStream input = (TokenStream)_input;
-        	int _s = s;
-            switch ( s ) {
-                    case 0 : 
-                        int LA34_83 = input.LA(1);
-
-                         
-                        int index34_83 = input.index();
-                        input.rewind();
-                        s = -1;
-                        if ( (LA34_83==DOUBLE_QUOTE) && ((strict == false))) {s = 104;}
-
-                         
-                        input.seek(index34_83);
-                        if ( s>=0 ) return s;
-                        break;
-                    case 1 : 
-                        int LA34_21 = input.LA(1);
-
-                         
-                        int index34_21 = input.index();
-                        input.rewind();
-                        s = -1;
-                        if ( (LA34_21==DOUBLE_QUOTE) && ((strict == false))) {s = 38;}
-
-                         
-                        input.seek(index34_21);
-                        if ( s>=0 ) return s;
-                        break;
-                    case 2 : 
-                        int LA34_82 = input.LA(1);
-
-                         
-                        int index34_82 = input.index();
-                        input.rewind();
-                        s = -1;
-                        if ( (LA34_82==DOUBLE_QUOTE) && ((strict == false))) {s = 104;}
-
-                         
-                        input.seek(index34_82);
-                        if ( s>=0 ) return s;
-                        break;
-                    case 3 : 
-                        int LA34_85 = input.LA(1);
-
-                         
-                        int index34_85 = input.index();
-                        input.rewind();
-                        s = -1;
-                        if ( (LA34_85==DOUBLE_QUOTE) && ((strict == false))) {s = 104;}
-
-                         
-                        input.seek(index34_85);
-                        if ( s>=0 ) return s;
-                        break;
-                    case 4 : 
-                        int LA34_84 = input.LA(1);
-
-                         
-                        int index34_84 = input.index();
-                        input.rewind();
-                        s = -1;
-                        if ( (LA34_84==DOUBLE_QUOTE) && ((strict == false))) {s = 104;}
-
-                         
-                        input.seek(index34_84);
-                        if ( s>=0 ) return s;
-                        break;
-                    case 5 : 
-                        int LA34_87 = input.LA(1);
-
-                         
-                        int index34_87 = input.index();
-                        input.rewind();
-                        s = -1;
-                        if ( (LA34_87==DOUBLE_QUOTE) && ((strict == false))) {s = 104;}
-
-                         
-                        input.seek(index34_87);
-                        if ( s>=0 ) return s;
-                        break;
-                    case 6 : 
-                        int LA34_86 = input.LA(1);
-
-                         
-                        int index34_86 = input.index();
-                        input.rewind();
-                        s = -1;
-                        if ( (LA34_86==DOUBLE_QUOTE) && ((strict == false))) {s = 104;}
-
-                         
-                        input.seek(index34_86);
-                        if ( s>=0 ) return s;
-                        break;
-                    case 7 : 
-                        int LA34_20 = input.LA(1);
-
-                         
-                        int index34_20 = input.index();
-                        input.rewind();
-                        s = -1;
-                        if ( (LA34_20==DOUBLE_QUOTE) && ((strict == false))) {s = 38;}
-
-                         
-                        input.seek(index34_20);
-                        if ( s>=0 ) return s;
-                        break;
-                    case 8 : 
-                        int LA34_89 = input.LA(1);
-
-                         
-                        int index34_89 = input.index();
-                        input.rewind();
-                        s = -1;
-                        if ( (LA34_89==DOUBLE_QUOTE) && ((strict == false))) {s = 104;}
-
-                         
-                        input.seek(index34_89);
-                        if ( s>=0 ) return s;
-                        break;
-                    case 9 : 
-                        int LA34_88 = input.LA(1);
-
-                         
-                        int index34_88 = input.index();
-                        input.rewind();
-                        s = -1;
-                        if ( (LA34_88==DOUBLE_QUOTE) && ((strict == false))) {s = 104;}
-
-                         
-                        input.seek(index34_88);
-                        if ( s>=0 ) return s;
-                        break;
-                    case 10 : 
-                        int LA34_75 = input.LA(1);
-
-                         
-                        int index34_75 = input.index();
-                        input.rewind();
-                        s = -1;
-                        if ( (LA34_75==DOUBLE_QUOTE) && ((strict == false))) {s = 104;}
-
-                         
-                        input.seek(index34_75);
-                        if ( s>=0 ) return s;
-                        break;
-                    case 11 : 
-                        int LA34_77 = input.LA(1);
-
-                         
-                        int index34_77 = input.index();
-                        input.rewind();
-                        s = -1;
-                        if ( (LA34_77==DOUBLE_QUOTE) && ((strict == false))) {s = 104;}
-
-                         
-                        input.seek(index34_77);
-                        if ( s>=0 ) return s;
-                        break;
-                    case 12 : 
-                        int LA34_24 = input.LA(1);
-
-                         
-                        int index34_24 = input.index();
-                        input.rewind();
-                        s = -1;
-                        if ( (LA34_24==DOUBLE_QUOTE) && ((strict == false))) {s = 38;}
-
-                         
-                        input.seek(index34_24);
-                        if ( s>=0 ) return s;
-                        break;
-                    case 13 : 
-                        int LA34_76 = input.LA(1);
-
-                         
-                        int index34_76 = input.index();
-                        input.rewind();
-                        s = -1;
-                        if ( (LA34_76==DOUBLE_QUOTE) && ((strict == false))) {s = 104;}
-
-                         
-                        input.seek(index34_76);
-                        if ( s>=0 ) return s;
-                        break;
-                    case 14 : 
-                        int LA34_68 = input.LA(1);
-
-                         
-                        int index34_68 = input.index();
-                        input.rewind();
-                        s = -1;
-                        if ( (LA34_68==ID) && ((strict == false))) {s = 71;}
-
-                        else if ( (LA34_68==DOUBLE_QUOTE) && ((strict == false))) {s = 72;}
-
-                         
-                        input.seek(index34_68);
-                        if ( s>=0 ) return s;
-                        break;
-                    case 15 : 
-                        int LA34_79 = input.LA(1);
-
-                         
-                        int index34_79 = input.index();
-                        input.rewind();
-                        s = -1;
-                        if ( (LA34_79==DOUBLE_QUOTE) && ((strict == false))) {s = 104;}
-
-                         
-                        input.seek(index34_79);
-                        if ( s>=0 ) return s;
-                        break;
-                    case 16 : 
-                        int LA34_22 = input.LA(1);
-
-                         
-                        int index34_22 = input.index();
-                        input.rewind();
-                        s = -1;
-                        if ( (LA34_22==DOUBLE_QUOTE) && ((strict == false))) {s = 38;}
-
-                         
-                        input.seek(index34_22);
-                        if ( s>=0 ) return s;
-                        break;
-                    case 17 : 
-                        int LA34_78 = input.LA(1);
-
-                         
-                        int index34_78 = input.index();
-                        input.rewind();
-                        s = -1;
-                        if ( (LA34_78==DOUBLE_QUOTE) && ((strict == false))) {s = 104;}
-
-                         
-                        input.seek(index34_78);
-                        if ( s>=0 ) return s;
-                        break;
-                    case 18 : 
-                        int LA34_81 = input.LA(1);
-
-                         
-                        int index34_81 = input.index();
-                        input.rewind();
-                        s = -1;
-                        if ( (LA34_81==DOUBLE_QUOTE) && ((strict == false))) {s = 104;}
-
-                         
-                        input.seek(index34_81);
-                        if ( s>=0 ) return s;
-                        break;
-                    case 19 : 
-                        int LA34_80 = input.LA(1);
-
-                         
-                        int index34_80 = input.index();
-                        input.rewind();
-                        s = -1;
-                        if ( (LA34_80==DOUBLE_QUOTE) && ((strict == false))) {s = 104;}
-
-                         
-                        input.seek(index34_80);
-                        if ( s>=0 ) return s;
-                        break;
-                    case 20 : 
-                        int LA34_23 = input.LA(1);
-
-                         
-                        int index34_23 = input.index();
-                        input.rewind();
-                        s = -1;
-                        if ( (LA34_23==DOUBLE_QUOTE) && ((strict == false))) {s = 38;}
-
-                         
-                        input.seek(index34_23);
-                        if ( s>=0 ) return s;
-                        break;
-                    case 21 : 
-                        int LA34_72 = input.LA(1);
-
-                         
-                        int index34_72 = input.index();
-                        input.rewind();
-                        s = -1;
-                        if ( (LA34_72==SELECT) && ((strict == false))) {s = 75;}
-
-                        else if ( (LA34_72==AS) && ((strict == false))) {s = 76;}
-
-                        else if ( (LA34_72==FROM) && ((strict == false))) {s = 77;}
-
-                        else if ( (LA34_72==JOIN) && ((strict == false))) {s = 78;}
-
-                        else if ( (LA34_72==INNER) && ((strict == false))) {s = 79;}
-
-                        else if ( (LA34_72==LEFT) && ((strict == false))) {s = 80;}
-
-                        else if ( (LA34_72==OUTER) && ((strict == false))) {s = 81;}
-
-                        else if ( (LA34_72==ON) && ((strict == false))) {s = 82;}
-
-                        else if ( (LA34_72==WHERE) && ((strict == false))) {s = 83;}
-
-                        else if ( (LA34_72==OR) && ((strict == false))) {s = 84;}
-
-                        else if ( (LA34_72==AND) && ((strict == false))) {s = 85;}
-
-                        else if ( (LA34_72==NOT) && ((strict == false))) {s = 86;}
-
-                        else if ( (LA34_72==IN) && ((strict == false))) {s = 87;}
-
-                        else if ( (LA34_72==LIKE) && ((strict == false))) {s = 88;}
-
-                        else if ( (LA34_72==IS) && ((strict == false))) {s = 89;}
-
-                        else if ( (LA34_72==NULL) && ((strict == false))) {s = 90;}
-
-                        else if ( (LA34_72==ANY) && ((strict == false))) {s = 91;}
-
-                        else if ( (LA34_72==CONTAINS) && ((strict == false))) {s = 92;}
-
-                        else if ( (LA34_72==IN_FOLDER) && ((strict == false))) {s = 93;}
-
-                        else if ( (LA34_72==IN_TREE) && ((strict == false))) {s = 94;}
-
-                        else if ( (LA34_72==ORDER) && ((strict == false))) {s = 95;}
-
-                        else if ( (LA34_72==BY) && ((strict == false))) {s = 96;}
-
-                        else if ( (LA34_72==ASC) && ((strict == false))) {s = 97;}
-
-                        else if ( (LA34_72==DESC) && ((strict == false))) {s = 98;}
-
-                        else if ( (LA34_72==TIMESTAMP) && ((strict == false))) {s = 99;}
-
-                        else if ( (LA34_72==TRUE) && ((strict == false))) {s = 100;}
-
-                        else if ( (LA34_72==FALSE) && ((strict == false))) {s = 101;}
-
-                        else if ( (LA34_72==SCORE) && ((strict == false))) {s = 102;}
-
-                        else if ( (LA34_72==ID) && ((strict == false))) {s = 103;}
-
-                         
-                        input.seek(index34_72);
-                        if ( s>=0 ) return s;
-                        break;
-                    case 22 : 
-                        int LA34_6 = input.LA(1);
-
-                         
-                        int index34_6 = input.index();
-                        input.rewind();
-                        s = -1;
-                        if ( (LA34_6==DOUBLE_QUOTE) && ((strict == false))) {s = 38;}
-
-                         
-                        input.seek(index34_6);
-                        if ( s>=0 ) return s;
-                        break;
-                    case 23 : 
-                        int LA34_26 = input.LA(1);
-
-                         
-                        int index34_26 = input.index();
-                        input.rewind();
-                        s = -1;
-                        if ( (LA34_26==DOUBLE_QUOTE) && ((strict == false))) {s = 38;}
-
-                         
-                        input.seek(index34_26);
-                        if ( s>=0 ) return s;
-                        break;
-                    case 24 : 
-                        int LA34_27 = input.LA(1);
-
-                         
-                        int index34_27 = input.index();
-                        input.rewind();
-                        s = -1;
-                        if ( (LA34_27==DOUBLE_QUOTE) && ((strict == false))) {s = 38;}
-
-                         
-                        input.seek(index34_27);
-                        if ( s>=0 ) return s;
-                        break;
-                    case 25 : 
-                        int LA34_7 = input.LA(1);
-
-                         
-                        int index34_7 = input.index();
-                        input.rewind();
-                        s = -1;
-                        if ( (LA34_7==DOUBLE_QUOTE) && ((strict == false))) {s = 38;}
-
-                         
-                        input.seek(index34_7);
-                        if ( s>=0 ) return s;
-                        break;
-                    case 26 : 
-                        int LA34_25 = input.LA(1);
-
-                         
-                        int index34_25 = input.index();
-                        input.rewind();
-                        s = -1;
-                        if ( (LA34_25==DOUBLE_QUOTE) && ((strict == false))) {s = 38;}
-
-                         
-                        input.seek(index34_25);
-                        if ( s>=0 ) return s;
-                        break;
-                    case 27 : 
-                        int LA34_8 = input.LA(1);
-
-                         
-                        int index34_8 = input.index();
-                        input.rewind();
-                        s = -1;
-                        if ( (LA34_8==DOUBLE_QUOTE) && ((strict == false))) {s = 38;}
-
-                         
-                        input.seek(index34_8);
-                        if ( s>=0 ) return s;
-                        break;
-                    case 28 : 
-                        int LA34_29 = input.LA(1);
-
-                         
-                        int index34_29 = input.index();
-                        input.rewind();
-                        s = -1;
-                        if ( (LA34_29==DOUBLE_QUOTE) && ((strict == false))) {s = 38;}
-
-                         
-                        input.seek(index34_29);
-                        if ( s>=0 ) return s;
-                        break;
-                    case 29 : 
-                        int LA34_5 = input.LA(1);
-
-                         
-                        int index34_5 = input.index();
-                        input.rewind();
-                        s = -1;
-                        if ( (LA34_5==DOUBLE_QUOTE) && ((strict == false))) {s = 38;}
-
-                         
-                        input.seek(index34_5);
-                        if ( s>=0 ) return s;
-                        break;
-                    case 30 : 
-                        int LA34_28 = input.LA(1);
-
-                         
-                        int index34_28 = input.index();
-                        input.rewind();
-                        s = -1;
-                        if ( (LA34_28==DOUBLE_QUOTE) && ((strict == false))) {s = 38;}
-
-                         
-                        input.seek(index34_28);
-                        if ( s>=0 ) return s;
-                        break;
-                    case 31 : 
-                        int LA34_12 = input.LA(1);
-
-                         
-                        int index34_12 = input.index();
-                        input.rewind();
-                        s = -1;
-                        if ( (LA34_12==DOUBLE_QUOTE) && ((strict == false))) {s = 38;}
-
-                         
-                        input.seek(index34_12);
-                        if ( s>=0 ) return s;
-                        break;
-                    case 32 : 
-                        int LA34_38 = input.LA(1);
-
-                         
-                        int index34_38 = input.index();
-                        input.rewind();
-                        s = -1;
-                        if ( (LA34_38==DOT) && ((strict == false))) {s = 68;}
-
-                        else if ( (LA34_38==IS) && ((strict == false))) {s = 69;}
-
-                         
-                        input.seek(index34_38);
-                        if ( s>=0 ) return s;
-                        break;
-                    case 33 : 
-                        int LA34_31 = input.LA(1);
-
-                         
-                        int index34_31 = input.index();
-                        input.rewind();
-                        s = -1;
-                        if ( (LA34_31==DOUBLE_QUOTE) && ((strict == false))) {s = 38;}
-
-                         
-                        input.seek(index34_31);
-                        if ( s>=0 ) return s;
-                        break;
-                    case 34 : 
-                        int LA34_13 = input.LA(1);
-
-                         
-                        int index34_13 = input.index();
-                        input.rewind();
-                        s = -1;
-                        if ( (LA34_13==DOUBLE_QUOTE) && ((strict == false))) {s = 38;}
-
-                         
-                        input.seek(index34_13);
-                        if ( s>=0 ) return s;
-                        break;
-                    case 35 : 
-                        int LA34_30 = input.LA(1);
-
-                         
-                        int index34_30 = input.index();
-                        input.rewind();
-                        s = -1;
-                        if ( (LA34_30==DOUBLE_QUOTE) && ((strict == false))) {s = 38;}
-
-                         
-                        input.seek(index34_30);
-                        if ( s>=0 ) return s;
-                        break;
-                    case 36 : 
-                        int LA34_9 = input.LA(1);
-
-                         
-                        int index34_9 = input.index();
-                        input.rewind();
-                        s = -1;
-                        if ( (LA34_9==DOUBLE_QUOTE) && ((strict == false))) {s = 38;}
-
-                         
-                        input.seek(index34_9);
-                        if ( s>=0 ) return s;
-                        break;
-                    case 37 : 
-                        int LA34_11 = input.LA(1);
-
-                         
-                        int index34_11 = input.index();
-                        input.rewind();
-                        s = -1;
-                        if ( (LA34_11==DOUBLE_QUOTE) && ((strict == false))) {s = 38;}
-
-                         
-                        input.seek(index34_11);
-                        if ( s>=0 ) return s;
-                        break;
-                    case 38 : 
-                        int LA34_0 = input.LA(1);
-
-                         
-                        int index34_0 = input.index();
-                        input.rewind();
-                        s = -1;
-                        if ( (LA34_0==ID) ) {s = 1;}
-
-                        else if ( (LA34_0==DOUBLE_QUOTE) && ((strict == false))) {s = 2;}
-
-                         
-                        input.seek(index34_0);
-                        if ( s>=0 ) return s;
-                        break;
-                    case 39 : 
-                        int LA34_10 = input.LA(1);
-
-                         
-                        int index34_10 = input.index();
-                        input.rewind();
-                        s = -1;
-                        if ( (LA34_10==DOUBLE_QUOTE) && ((strict == false))) {s = 38;}
-
-                         
-                        input.seek(index34_10);
-                        if ( s>=0 ) return s;
-                        break;
-                    case 40 : 
-                        int LA34_2 = input.LA(1);
-
-                         
-                        int index34_2 = input.index();
-                        input.rewind();
-                        s = -1;
-                        if ( (LA34_2==SELECT) && ((strict == false))) {s = 5;}
-
-                        else if ( (LA34_2==AS) && ((strict == false))) {s = 6;}
-
-                        else if ( (LA34_2==FROM) && ((strict == false))) {s = 7;}
-
-                        else if ( (LA34_2==JOIN) && ((strict == false))) {s = 8;}
-
-                        else if ( (LA34_2==INNER) && ((strict == false))) {s = 9;}
-
-                        else if ( (LA34_2==LEFT) && ((strict == false))) {s = 10;}
-
-                        else if ( (LA34_2==OUTER) && ((strict == false))) {s = 11;}
-
-                        else if ( (LA34_2==ON) && ((strict == false))) {s = 12;}
-
-                        else if ( (LA34_2==WHERE) && ((strict == false))) {s = 13;}
-
-                        else if ( (LA34_2==OR) && ((strict == false))) {s = 14;}
-
-                        else if ( (LA34_2==AND) && ((strict == false))) {s = 15;}
-
-                        else if ( (LA34_2==NOT) && ((strict == false))) {s = 16;}
-
-                        else if ( (LA34_2==IN) && ((strict == false))) {s = 17;}
-
-                        else if ( (LA34_2==LIKE) && ((strict == false))) {s = 18;}
-
-                        else if ( (LA34_2==IS) && ((strict == false))) {s = 19;}
-
-                        else if ( (LA34_2==NULL) && ((strict == false))) {s = 20;}
-
-                        else if ( (LA34_2==ANY) && ((strict == false))) {s = 21;}
-
-                        else if ( (LA34_2==CONTAINS) && ((strict == false))) {s = 22;}
-
-                        else if ( (LA34_2==IN_FOLDER) && ((strict == false))) {s = 23;}
-
-                        else if ( (LA34_2==IN_TREE) && ((strict == false))) {s = 24;}
-
-                        else if ( (LA34_2==ORDER) && ((strict == false))) {s = 25;}
-
-                        else if ( (LA34_2==BY) && ((strict == false))) {s = 26;}
-
-                        else if ( (LA34_2==ASC) && ((strict == false))) {s = 27;}
-
-                        else if ( (LA34_2==DESC) && ((strict == false))) {s = 28;}
-
-                        else if ( (LA34_2==TIMESTAMP) && ((strict == false))) {s = 29;}
-
-                        else if ( (LA34_2==TRUE) && ((strict == false))) {s = 30;}
-
-                        else if ( (LA34_2==FALSE) && ((strict == false))) {s = 31;}
-
-                        else if ( (LA34_2==SCORE) && ((strict == false))) {s = 32;}
-
-                        else if ( (LA34_2==ID) && ((strict == false))) {s = 33;}
-
-                         
-                        input.seek(index34_2);
-                        if ( s>=0 ) return s;
-                        break;
-                    case 41 : 
-                        int LA34_97 = input.LA(1);
-
-                         
-                        int index34_97 = input.index();
-                        input.rewind();
-                        s = -1;
-                        if ( (LA34_97==DOUBLE_QUOTE) && ((strict == false))) {s = 104;}
-
-                         
-                        input.seek(index34_97);
-                        if ( s>=0 ) return s;
-                        break;
-                    case 42 : 
-                        int LA34_32 = input.LA(1);
-
-                         
-                        int index34_32 = input.index();
-                        input.rewind();
-                        s = -1;
-                        if ( (LA34_32==DOUBLE_QUOTE) && ((strict == false))) {s = 38;}
-
-                         
-                        input.seek(index34_32);
-                        if ( s>=0 ) return s;
-                        break;
-                    case 43 : 
-                        int LA34_104 = input.LA(1);
-
-                         
-                        int index34_104 = input.index();
-                        input.rewind();
-                        s = -1;
-                        if ( (LA34_104==IS) && ((strict == false))) {s = 69;}
-
-                         
-                        input.seek(index34_104);
-                        if ( s>=0 ) return s;
-                        break;
-                    case 44 : 
-                        int LA34_96 = input.LA(1);
-
-                         
-                        int index34_96 = input.index();
-                        input.rewind();
-                        s = -1;
-                        if ( (LA34_96==DOUBLE_QUOTE) && ((strict == false))) {s = 104;}
-
-                         
-                        input.seek(index34_96);
-                        if ( s>=0 ) return s;
-                        break;
-                    case 45 : 
-                        int LA34_95 = input.LA(1);
-
-                         
-                        int index34_95 = input.index();
-                        input.rewind();
-                        s = -1;
-                        if ( (LA34_95==DOUBLE_QUOTE) && ((strict == false))) {s = 104;}
-
-                         
-                        input.seek(index34_95);
-                        if ( s>=0 ) return s;
-                        break;
-                    case 46 : 
-                        int LA34_103 = input.LA(1);
-
-                         
-                        int index34_103 = input.index();
-                        input.rewind();
-                        s = -1;
-                        if ( (LA34_103==DOUBLE_QUOTE) && ((strict == false))) {s = 104;}
-
-                         
-                        input.seek(index34_103);
-                        if ( s>=0 ) return s;
-                        break;
-                    case 47 : 
-                        int LA34_17 = input.LA(1);
-
-                         
-                        int index34_17 = input.index();
-                        input.rewind();
-                        s = -1;
-                        if ( (LA34_17==DOUBLE_QUOTE) && ((strict == false))) {s = 38;}
-
-                         
-                        input.seek(index34_17);
-                        if ( s>=0 ) return s;
-                        break;
-                    case 48 : 
-                        int LA34_94 = input.LA(1);
-
-                         
-                        int index34_94 = input.index();
-                        input.rewind();
-                        s = -1;
-                        if ( (LA34_94==DOUBLE_QUOTE) && ((strict == false))) {s = 104;}
-
-                         
-                        input.seek(index34_94);
-                        if ( s>=0 ) return s;
-                        break;
-                    case 49 : 
-                        int LA34_93 = input.LA(1);
-
-                         
-                        int index34_93 = input.index();
-                        input.rewind();
-                        s = -1;
-                        if ( (LA34_93==DOUBLE_QUOTE) && ((strict == false))) {s = 104;}
-
-                         
-                        input.seek(index34_93);
-                        if ( s>=0 ) return s;
-                        break;
-                    case 50 : 
-                        int LA34_71 = input.LA(1);
-
-                         
-                        int index34_71 = input.index();
-                        input.rewind();
-                        s = -1;
-                        if ( (LA34_71==IS) && ((strict == false))) {s = 69;}
-
-                         
-                        input.seek(index34_71);
-                        if ( s>=0 ) return s;
-                        break;
-                    case 51 : 
-                        int LA34_19 = input.LA(1);
-
-                         
-                        int index34_19 = input.index();
-                        input.rewind();
-                        s = -1;
-                        if ( (LA34_19==DOUBLE_QUOTE) && ((strict == false))) {s = 38;}
-
-                         
-                        input.seek(index34_19);
-                        if ( s>=0 ) return s;
-                        break;
-                    case 52 : 
-                        int LA34_92 = input.LA(1);
-
-                         
-                        int index34_92 = input.index();
-                        input.rewind();
-                        s = -1;
-                        if ( (LA34_92==DOUBLE_QUOTE) && ((strict == false))) {s = 104;}
-
-                         
-                        input.seek(index34_92);
-                        if ( s>=0 ) return s;
-                        break;
-                    case 53 : 
-                        int LA34_18 = input.LA(1);
-
-                         
-                        int index34_18 = input.index();
-                        input.rewind();
-                        s = -1;
-                        if ( (LA34_18==DOUBLE_QUOTE) && ((strict == false))) {s = 38;}
-
-                         
-                        input.seek(index34_18);
-                        if ( s>=0 ) return s;
-                        break;
-                    case 54 : 
-                        int LA34_69 = input.LA(1);
-
-                         
-                        int index34_69 = input.index();
-                        input.rewind();
-                        s = -1;
-                        if ( (LA34_69==NULL) && ((strict == false))) {s = 73;}
-
-                        else if ( (LA34_69==NOT) && ((strict == false))) {s = 74;}
-
-                         
-                        input.seek(index34_69);
-                        if ( s>=0 ) return s;
-                        break;
-                    case 55 : 
-                        int LA34_91 = input.LA(1);
-
-                         
-                        int index34_91 = input.index();
-                        input.rewind();
-                        s = -1;
-                        if ( (LA34_91==DOUBLE_QUOTE) && ((strict == false))) {s = 104;}
-
-                         
-                        input.seek(index34_91);
-                        if ( s>=0 ) return s;
-                        break;
-                    case 56 : 
-                        int LA34_90 = input.LA(1);
-
-                         
-                        int index34_90 = input.index();
-                        input.rewind();
-                        s = -1;
-                        if ( (LA34_90==DOUBLE_QUOTE) && ((strict == false))) {s = 104;}
-
-                         
-                        input.seek(index34_90);
-                        if ( s>=0 ) return s;
-                        break;
-                    case 57 : 
-                        int LA34_33 = input.LA(1);
-
-                         
-                        int index34_33 = input.index();
-                        input.rewind();
-                        s = -1;
-                        if ( (LA34_33==DOUBLE_QUOTE) && ((strict == false))) {s = 38;}
-
-                         
-                        input.seek(index34_33);
-                        if ( s>=0 ) return s;
-                        break;
-                    case 58 : 
-                        int LA34_15 = input.LA(1);
-
-                         
-                        int index34_15 = input.index();
-                        input.rewind();
-                        s = -1;
-                        if ( (LA34_15==DOUBLE_QUOTE) && ((strict == false))) {s = 38;}
-
-                         
-                        input.seek(index34_15);
-                        if ( s>=0 ) return s;
-                        break;
-                    case 59 : 
-                        int LA34_14 = input.LA(1);
-
-                         
-                        int index34_14 = input.index();
-                        input.rewind();
-                        s = -1;
-                        if ( (LA34_14==DOUBLE_QUOTE) && ((strict == false))) {s = 38;}
-
-                         
-                        input.seek(index34_14);
-                        if ( s>=0 ) return s;
-                        break;
-                    case 60 : 
-                        int LA34_101 = input.LA(1);
-
-                         
-                        int index34_101 = input.index();
-                        input.rewind();
-                        s = -1;
-                        if ( (LA34_101==DOUBLE_QUOTE) && ((strict == false))) {s = 104;}
-
-                         
-                        input.seek(index34_101);
-                        if ( s>=0 ) return s;
-                        break;
-                    case 61 : 
-                        int LA34_16 = input.LA(1);
-
-                         
-                        int index34_16 = input.index();
-                        input.rewind();
-                        s = -1;
-                        if ( (LA34_16==DOUBLE_QUOTE) && ((strict == false))) {s = 38;}
-
-                         
-                        input.seek(index34_16);
-                        if ( s>=0 ) return s;
-                        break;
-                    case 62 : 
-                        int LA34_100 = input.LA(1);
-
-                         
-                        int index34_100 = input.index();
-                        input.rewind();
-                        s = -1;
-                        if ( (LA34_100==DOUBLE_QUOTE) && ((strict == false))) {s = 104;}
-
-                         
-                        input.seek(index34_100);
-                        if ( s>=0 ) return s;
-                        break;
-                    case 63 : 
-                        int LA34_99 = input.LA(1);
-
-                         
-                        int index34_99 = input.index();
-                        input.rewind();
-                        s = -1;
-                        if ( (LA34_99==DOUBLE_QUOTE) && ((strict == false))) {s = 104;}
-
-                         
-                        input.seek(index34_99);
-                        if ( s>=0 ) return s;
-                        break;
-                    case 64 : 
-                        int LA34_102 = input.LA(1);
-
-                         
-                        int index34_102 = input.index();
-                        input.rewind();
-                        s = -1;
-                        if ( (LA34_102==DOUBLE_QUOTE) && ((strict == false))) {s = 104;}
-
-                         
-                        input.seek(index34_102);
-                        if ( s>=0 ) return s;
-                        break;
-                    case 65 : 
-                        int LA34_98 = input.LA(1);
-
-                         
-                        int index34_98 = input.index();
-                        input.rewind();
-                        s = -1;
-                        if ( (LA34_98==DOUBLE_QUOTE) && ((strict == false))) {s = 104;}
-
-                         
-                        input.seek(index34_98);
-                        if ( s>=0 ) return s;
-                        break;
-            }
-            if (state.backtracking>0) {state.failed=true; return -1;}
-            NoViableAltException nvae =
-                new NoViableAltException(getDescription(), 34, _s, input);
-            error(nvae);
-            throw nvae;
-        }
-    }
-    static final String DFA41_eotS =
-        "\153\uffff";
-    static final String DFA41_eofS =
-        "\1\uffff\1\5\43\uffff\1\5\1\uffff\1\107\42\uffff\1\5\1\107\36\uffff"+
-        "\1\107";
-    static final String DFA41_minS =
-        "\1\106\1\42\1\40\1\106\4\uffff\35\107\1\42\1\40\1\42\35\107\1\106"+
-        "\4\uffff\2\42\1\40\35\107\1\42";
-    static final String DFA41_maxS =
-        "\1\107\1\103\1\115\1\107\4\uffff\35\107\1\103\1\115\1\103\36\107"+
-        "\4\uffff\2\103\1\115\35\107\1\103";
-    static final String DFA41_acceptS =
-        "\4\uffff\2\1\2\2\76\uffff\2\1\2\2\41\uffff";
-    static final String DFA41_specialS =
-        "\1\43\1\uffff\1\52\5\uffff\1\36\1\26\1\32\1\34\1\47\1\51\1\50\1"+
-        "\42\1\45\1\72\1\71\1\74\1\60\1\65\1\63\1\7\1\1\1\20\1\24\1\14\1"+
-        "\33\1\27\1\31\1\40\1\35\1\46\1\44\1\54\1\70\2\uffff\1\30\35\uffff"+
-        "\1\16\5\uffff\1\37\1\25\1\12\1\15\1\13\1\21\1\17\1\23\1\22\1\2\1"+
-        "\0\1\4\1\3\1\6\1\5\1\11\1\10\1\67\1\66\1\64\1\62\1\61\1\56\1\55"+
-        "\1\53\1\100\1\76\1\75\1\73\1\77\1\57\1\41}>";
-    static final String[] DFA41_transitionS = {
-            "\1\1\1\2",
-            "\1\4\2\uffff\1\3\34\uffff\1\6\1\7",
-            "\1\10\2\uffff\1\11\4\uffff\1\12\1\13\1\14\1\15\1\16\1\17\1"+
-            "\uffff\1\20\1\21\1\22\1\23\5\uffff\1\24\1\25\1\26\1\27\1\30"+
-            "\1\31\1\32\1\33\1\34\1\35\1\36\1\37\2\uffff\1\44\3\uffff\1\41"+
-            "\1\42\1\40\1\43",
-            "\1\45\1\46",
-            "",
-            "",
-            "",
-            "",
-            "\1\47",
-            "\1\47",
-            "\1\47",
-            "\1\47",
-            "\1\47",
-            "\1\47",
-            "\1\47",
-            "\1\47",
-            "\1\47",
-            "\1\47",
-            "\1\47",
-            "\1\47",
-            "\1\47",
-            "\1\47",
-            "\1\47",
-            "\1\47",
-            "\1\47",
-            "\1\47",
-            "\1\47",
-            "\1\47",
-            "\1\47",
-            "\1\47",
-            "\1\47",
-            "\1\47",
-            "\1\47",
-            "\1\47",
-            "\1\47",
-            "\1\47",
-            "\1\47",
-            "\1\4\37\uffff\1\6\1\7",
-            "\1\50\2\uffff\1\51\4\uffff\1\52\1\53\1\54\1\55\1\56\1\57\1"+
-            "\uffff\1\60\1\61\1\62\1\63\5\uffff\1\64\1\65\1\66\1\67\1\70"+
-            "\1\71\1\72\1\73\1\74\1\75\1\76\1\77\2\uffff\1\104\3\uffff\1"+
-            "\101\1\102\1\100\1\103",
-            "\1\106\2\uffff\1\105\34\uffff\1\110\1\111",
-            "\1\112",
-            "\1\112",
-            "\1\112",
-            "\1\112",
-            "\1\112",
-            "\1\112",
-            "\1\112",
-            "\1\112",
-            "\1\112",
-            "\1\112",
-            "\1\112",
-            "\1\112",
-            "\1\112",
-            "\1\112",
-            "\1\112",
-            "\1\112",
-            "\1\112",
-            "\1\112",
-            "\1\112",
-            "\1\112",
-            "\1\112",
-            "\1\112",
-            "\1\112",
-            "\1\112",
-            "\1\112",
-            "\1\112",
-            "\1\112",
-            "\1\112",
-            "\1\112",
-            "\1\113\1\114",
-            "",
-            "",
-            "",
-            "",
-            "\1\4\37\uffff\1\6\1\7",
-            "\1\106\37\uffff\1\110\1\111",
-            "\1\115\2\uffff\1\116\4\uffff\1\117\1\120\1\121\1\122\1\123"+
-            "\1\124\1\uffff\1\125\1\126\1\127\1\130\5\uffff\1\131\1\132\1"+
-            "\133\1\134\1\135\1\136\1\137\1\140\1\141\1\142\1\143\1\144\2"+
-            "\uffff\1\151\3\uffff\1\146\1\147\1\145\1\150",
-            "\1\152",
-            "\1\152",
-            "\1\152",
-            "\1\152",
-            "\1\152",
-            "\1\152",
-            "\1\152",
-            "\1\152",
-            "\1\152",
-            "\1\152",
-            "\1\152",
-            "\1\152",
-            "\1\152",
-            "\1\152",
-            "\1\152",
-            "\1\152",
-            "\1\152",
-            "\1\152",
-            "\1\152",
-            "\1\152",
-            "\1\152",
-            "\1\152",
-            "\1\152",
-            "\1\152",
-            "\1\152",
-            "\1\152",
-            "\1\152",
-            "\1\152",
-            "\1\152",
-            "\1\106\37\uffff\1\110\1\111"
-    };
-
-    static final short[] DFA41_eot = DFA.unpackEncodedString(DFA41_eotS);
-    static final short[] DFA41_eof = DFA.unpackEncodedString(DFA41_eofS);
-    static final char[] DFA41_min = DFA.unpackEncodedStringToUnsignedChars(DFA41_minS);
-    static final char[] DFA41_max = DFA.unpackEncodedStringToUnsignedChars(DFA41_maxS);
-    static final short[] DFA41_accept = DFA.unpackEncodedString(DFA41_acceptS);
-    static final short[] DFA41_special = DFA.unpackEncodedString(DFA41_specialS);
-    static final short[][] DFA41_transition;
-
-    static {
-        int numStates = DFA41_transitionS.length;
-        DFA41_transition = new short[numStates][];
-        for (int i=0; i<numStates; i++) {
-            DFA41_transition[i] = DFA.unpackEncodedString(DFA41_transitionS[i]);
-        }
-    }
-
-    class DFA41 extends DFA {
-
-        public DFA41(BaseRecognizer recognizer) {
-            this.recognizer = recognizer;
-            this.decisionNumber = 41;
-            this.eot = DFA41_eot;
-            this.eof = DFA41_eof;
-            this.min = DFA41_min;
-            this.max = DFA41_max;
-            this.accept = DFA41_accept;
-            this.special = DFA41_special;
-            this.transition = DFA41_transition;
-        }
-        public String getDescription() {
-            return "695:1: sortSpecification : ( columnReference -> ^( SORT_SPECIFICATION columnReference ASC ) | columnReference (by= ASC | by= DESC ) -> ^( SORT_SPECIFICATION columnReference $by) );";
-        }
-        public int specialStateTransition(int s, IntStream _input) throws NoViableAltException {
-            TokenStream input = (TokenStream)_input;
-        	int _s = s;
-            switch ( s ) {
-                    case 0 : 
-                        int LA41_85 = input.LA(1);
-
-                         
-                        int index41_85 = input.index();
-                        input.rewind();
-                        s = -1;
-                        if ( (LA41_85==DOUBLE_QUOTE) && ((strict == false))) {s = 106;}
-
-                         
-                        input.seek(index41_85);
-                        if ( s>=0 ) return s;
-                        break;
-                    case 1 : 
-                        int LA41_24 = input.LA(1);
-
-                         
-                        int index41_24 = input.index();
-                        input.rewind();
-                        s = -1;
-                        if ( (LA41_24==DOUBLE_QUOTE) && ((strict == false))) {s = 39;}
-
-                         
-                        input.seek(index41_24);
-                        if ( s>=0 ) return s;
-                        break;
-                    case 2 : 
-                        int LA41_84 = input.LA(1);
-
-                         
-                        int index41_84 = input.index();
-                        input.rewind();
-                        s = -1;
-                        if ( (LA41_84==DOUBLE_QUOTE) && ((strict == false))) {s = 106;}
-
-                         
-                        input.seek(index41_84);
-                        if ( s>=0 ) return s;
-                        break;
-                    case 3 : 
-                        int LA41_87 = input.LA(1);
-
-                         
-                        int index41_87 = input.index();
-                        input.rewind();
-                        s = -1;
-                        if ( (LA41_87==DOUBLE_QUOTE) && ((strict == false))) {s = 106;}
-
-                         
-                        input.seek(index41_87);
-                        if ( s>=0 ) return s;
-                        break;
-                    case 4 : 
-                        int LA41_86 = input.LA(1);
-
-                         
-                        int index41_86 = input.index();
-                        input.rewind();
-                        s = -1;
-                        if ( (LA41_86==DOUBLE_QUOTE) && ((strict == false))) {s = 106;}
-
-                         
-                        input.seek(index41_86);
-                        if ( s>=0 ) return s;
-                        break;
-                    case 5 : 
-                        int LA41_89 = input.LA(1);
-
-                         
-                        int index41_89 = input.index();
-                        input.rewind();
-                        s = -1;
-                        if ( (LA41_89==DOUBLE_QUOTE) && ((strict == false))) {s = 106;}
-
-                         
-                        input.seek(index41_89);
-                        if ( s>=0 ) return s;
-                        break;
-                    case 6 : 
-                        int LA41_88 = input.LA(1);
-
-                         
-                        int index41_88 = input.index();
-                        input.rewind();
-                        s = -1;
-                        if ( (LA41_88==DOUBLE_QUOTE) && ((strict == false))) {s = 106;}
-
-                         
-                        input.seek(index41_88);
-                        if ( s>=0 ) return s;
-                        break;
-                    case 7 : 
-                        int LA41_23 = input.LA(1);
-
-                         
-                        int index41_23 = input.index();
-                        input.rewind();
-                        s = -1;
-                        if ( (LA41_23==DOUBLE_QUOTE) && ((strict == false))) {s = 39;}
-
-                         
-                        input.seek(index41_23);
-                        if ( s>=0 ) return s;
-                        break;
-                    case 8 : 
-                        int LA41_91 = input.LA(1);
-
-                         
-                        int index41_91 = input.index();
-                        input.rewind();
-                        s = -1;
-                        if ( (LA41_91==DOUBLE_QUOTE) && ((strict == false))) {s = 106;}
-
-                         
-                        input.seek(index41_91);
-                        if ( s>=0 ) return s;
-                        break;
-                    case 9 : 
-                        int LA41_90 = input.LA(1);
-
-                         
-                        int index41_90 = input.index();
-                        input.rewind();
-                        s = -1;
-                        if ( (LA41_90==DOUBLE_QUOTE) && ((strict == false))) {s = 106;}
-
-                         
-                        input.seek(index41_90);
-                        if ( s>=0 ) return s;
-                        break;
-                    case 10 : 
-                        int LA41_77 = input.LA(1);
-
-                         
-                        int index41_77 = input.index();
-                        input.rewind();
-                        s = -1;
-                        if ( (LA41_77==DOUBLE_QUOTE) && ((strict == false))) {s = 106;}
-
-                         
-                        input.seek(index41_77);
-                        if ( s>=0 ) return s;
-                        break;
-                    case 11 : 
-                        int LA41_79 = input.LA(1);
-
-                         
-                        int index41_79 = input.index();
-                        input.rewind();
-                        s = -1;
-                        if ( (LA41_79==DOUBLE_QUOTE) && ((strict == false))) {s = 106;}
-
-                         
-                        input.seek(index41_79);
-                        if ( s>=0 ) return s;
-                        break;
-                    case 12 : 
-                        int LA41_27 = input.LA(1);
-
-                         
-                        int index41_27 = input.index();
-                        input.rewind();
-                        s = -1;
-                        if ( (LA41_27==DOUBLE_QUOTE) && ((strict == false))) {s = 39;}
-
-                         
-                        input.seek(index41_27);
-                        if ( s>=0 ) return s;
-                        break;
-                    case 13 : 
-                        int LA41_78 = input.LA(1);
-
-                         
-                        int index41_78 = input.index();
-                        input.rewind();
-                        s = -1;
-                        if ( (LA41_78==DOUBLE_QUOTE) && ((strict == false))) {s = 106;}
-
-                         
-                        input.seek(index41_78);
-                        if ( s>=0 ) return s;
-                        break;
-                    case 14 : 
-                        int LA41_69 = input.LA(1);
-
-                         
-                        int index41_69 = input.index();
-                        input.rewind();
-                        s = -1;
-                        if ( (LA41_69==ID) && ((strict == false))) {s = 75;}
-
-                        else if ( (LA41_69==DOUBLE_QUOTE) && ((strict == false))) {s = 76;}
-
-                         
-                        input.seek(index41_69);
-                        if ( s>=0 ) return s;
-                        break;
-                    case 15 : 
-                        int LA41_81 = input.LA(1);
-
-                         
-                        int index41_81 = input.index();
-                        input.rewind();
-                        s = -1;
-                        if ( (LA41_81==DOUBLE_QUOTE) && ((strict == false))) {s = 106;}
-
-                         
-                        input.seek(index41_81);
-                        if ( s>=0 ) return s;
-                        break;
-                    case 16 : 
-                        int LA41_25 = input.LA(1);
-
-                         
-                        int index41_25 = input.index();
-                        input.rewind();
-                        s = -1;
-                        if ( (LA41_25==DOUBLE_QUOTE) && ((strict == false))) {s = 39;}
-
-                         
-                        input.seek(index41_25);
-                        if ( s>=0 ) return s;
-                        break;
-                    case 17 : 
-                        int LA41_80 = input.LA(1);
-
-                         
-                        int index41_80 = input.index();
-                        input.rewind();
-                        s = -1;
-                        if ( (LA41_80==DOUBLE_QUOTE) && ((strict == false))) {s = 106;}
-
-                         
-                        input.seek(index41_80);
-                        if ( s>=0 ) return s;
-                        break;
-                    case 18 : 
-                        int LA41_83 = input.LA(1);
-
-                         
-                        int index41_83 = input.index();
-                        input.rewind();
-                        s = -1;
-                        if ( (LA41_83==DOUBLE_QUOTE) && ((strict == false))) {s = 106;}
-
-                         
-                        input.seek(index41_83);
-                        if ( s>=0 ) return s;
-                        break;
-                    case 19 : 
-                        int LA41_82 = input.LA(1);
-
-                         
-                        int index41_82 = input.index();
-                        input.rewind();
-                        s = -1;
-                        if ( (LA41_82==DOUBLE_QUOTE) && ((strict == false))) {s = 106;}
-
-                         
-                        input.seek(index41_82);
-                        if ( s>=0 ) return s;
-                        break;
-                    case 20 : 
-                        int LA41_26 = input.LA(1);
-
-                         
-                        int index41_26 = input.index();
-                        input.rewind();
-                        s = -1;
-                        if ( (LA41_26==DOUBLE_QUOTE) && ((strict == false))) {s = 39;}
-
-                         
-                        input.seek(index41_26);
-                        if ( s>=0 ) return s;
-                        break;
-                    case 21 : 
-                        int LA41_76 = input.LA(1);
-
-                         
-                        int index41_76 = input.index();
-                        input.rewind();
-                        s = -1;
-                        if ( (LA41_76==SELECT) && ((strict == false))) {s = 77;}
-
-                        else if ( (LA41_76==AS) && ((strict == false))) {s = 78;}
-
-                        else if ( (LA41_76==FROM) && ((strict == false))) {s = 79;}
-
-                        else if ( (LA41_76==JOIN) && ((strict == false))) {s = 80;}
-
-                        else if ( (LA41_76==INNER) && ((strict == false))) {s = 81;}
-
-                        else if ( (LA41_76==LEFT) && ((strict == false))) {s = 82;}
-
-                        else if ( (LA41_76==OUTER) && ((strict == false))) {s = 83;}
-
-                        else if ( (LA41_76==ON) && ((strict == false))) {s = 84;}
-
-                        else if ( (LA41_76==WHERE) && ((strict == false))) {s = 85;}
-
-                        else if ( (LA41_76==OR) && ((strict == false))) {s = 86;}
-
-                        else if ( (LA41_76==AND) && ((strict == false))) {s = 87;}
-
-                        else if ( (LA41_76==NOT) && ((strict == false))) {s = 88;}
-
-                        else if ( (LA41_76==IN) && ((strict == false))) {s = 89;}
-
-                        else if ( (LA41_76==LIKE) && ((strict == false))) {s = 90;}
-
-                        else if ( (LA41_76==IS) && ((strict == false))) {s = 91;}
-
-                        else if ( (LA41_76==NULL) && ((strict == false))) {s = 92;}
-
-                        else if ( (LA41_76==ANY) && ((strict == false))) {s = 93;}
-
-                        else if ( (LA41_76==CONTAINS) && ((strict == false))) {s = 94;}
-
-                        else if ( (LA41_76==IN_FOLDER) && ((strict == false))) {s = 95;}
-
-                        else if ( (LA41_76==IN_TREE) && ((strict == false))) {s = 96;}
-
-                        else if ( (LA41_76==ORDER) && ((strict == false))) {s = 97;}
-
-                        else if ( (LA41_76==BY) && ((strict == false))) {s = 98;}
-
-                        else if ( (LA41_76==ASC) && ((strict == false))) {s = 99;}
-
-                        else if ( (LA41_76==DESC) && ((strict == false))) {s = 100;}
-
-                        else if ( (LA41_76==TIMESTAMP) && ((strict == false))) {s = 101;}
-
-                        else if ( (LA41_76==TRUE) && ((strict == false))) {s = 102;}
-
-                        else if ( (LA41_76==FALSE) && ((strict == false))) {s = 103;}
-
-                        else if ( (LA41_76==SCORE) && ((strict == false))) {s = 104;}
-
-                        else if ( (LA41_76==ID) && ((strict == false))) {s = 105;}
-
-                         
-                        input.seek(index41_76);
-                        if ( s>=0 ) return s;
-                        break;
-                    case 22 : 
-                        int LA41_9 = input.LA(1);
-
-                         
-                        int index41_9 = input.index();
-                        input.rewind();
-                        s = -1;
-                        if ( (LA41_9==DOUBLE_QUOTE) && ((strict == false))) {s = 39;}
-
-                         
-                        input.seek(index41_9);
-                        if ( s>=0 ) return s;
-                        break;
-                    case 23 : 
-                        int LA41_29 = input.LA(1);
-
-                         
-                        int index41_29 = input.index();
-                        input.rewind();
-                        s = -1;
-                        if ( (LA41_29==DOUBLE_QUOTE) && ((strict == false))) {s = 39;}
-
-                         
-                        input.seek(index41_29);
-                        if ( s>=0 ) return s;
-                        break;
-                    case 24 : 
-                        int LA41_39 = input.LA(1);
-
-                         
-                        int index41_39 = input.index();
-                        input.rewind();
-                        s = -1;
-                        if ( (LA41_39==DOT) && ((strict == false))) {s = 69;}
-
-                        else if ( (LA41_39==COMMA) && ((strict == false))) {s = 70;}
-
-                        else if ( (LA41_39==EOF) && ((strict == false))) {s = 71;}
-
-                        else if ( (LA41_39==ASC) && ((strict == false))) {s = 72;}
-
-                        else if ( (LA41_39==DESC) && ((strict == false))) {s = 73;}
-
-                         
-                        input.seek(index41_39);
-                        if ( s>=0 ) return s;
-                        break;
-                    case 25 : 
-                        int LA41_30 = input.LA(1);
-
-                         
-                        int index41_30 = input.index();
-                        input.rewind();
-                        s = -1;
-                        if ( (LA41_30==DOUBLE_QUOTE) && ((strict == false))) {s = 39;}
-
-                         
-                        input.seek(index41_30);
-                        if ( s>=0 ) return s;
-                        break;
-                    case 26 : 
-                        int LA41_10 = input.LA(1);
-
-                         
-                        int index41_10 = input.index();
-                        input.rewind();
-                        s = -1;
-                        if ( (LA41_10==DOUBLE_QUOTE) && ((strict == false))) {s = 39;}
-
-                         
-                        input.seek(index41_10);
-                        if ( s>=0 ) return s;
-                        break;
-                    case 27 : 
-                        int LA41_28 = input.LA(1);
-
-                         
-                        int index41_28 = input.index();
-                        input.rewind();
-                        s = -1;
-                        if ( (LA41_28==DOUBLE_QUOTE) && ((strict == false))) {s = 39;}
-
-                         
-                        input.seek(index41_28);
-                        if ( s>=0 ) return s;
-                        break;
-                    case 28 : 
-                        int LA41_11 = input.LA(1);
-
-                         
-                        int index41_11 = input.index();
-                        input.rewind();
-                        s = -1;
-                        if ( (LA41_11==DOUBLE_QUOTE) && ((strict == false))) {s = 39;}
-
-                         
-                        input.seek(index41_11);
-                        if ( s>=0 ) return s;
-                        break;
-                    case 29 : 
-                        int LA41_32 = input.LA(1);
-
-                         
-                        int index41_32 = input.index();
-                        input.rewind();
-                        s = -1;
-                        if ( (LA41_32==DOUBLE_QUOTE) && ((strict == false))) {s = 39;}
-
-                         
-                        input.seek(index41_32);
-                        if ( s>=0 ) return s;
-                        break;
-                    case 30 : 
-                        int LA41_8 = input.LA(1);
-
-                         
-                        int index41_8 = input.index();
-                        input.rewind();
-                        s = -1;
-                        if ( (LA41_8==DOUBLE_QUOTE) && ((strict == false))) {s = 39;}
-
-                         
-                        input.seek(index41_8);
-                        if ( s>=0 ) return s;
-                        break;
-                    case 31 : 
-                        int LA41_75 = input.LA(1);
-
-                         
-                        int index41_75 = input.index();
-                        input.rewind();
-                        s = -1;
-                        if ( (LA41_75==COMMA) && ((strict == false))) {s = 70;}
-
-                        else if ( (LA41_75==EOF) && ((strict == false))) {s = 71;}
-
-                        else if ( (LA41_75==ASC) && ((strict == false))) {s = 72;}
-
-                        else if ( (LA41_75==DESC) && ((strict == false))) {s = 73;}
-
-                         
-                        input.seek(index41_75);
-                        if ( s>=0 ) return s;
-                        break;
-                    case 32 : 
-                        int LA41_31 = input.LA(1);
-
-                         
-                        int index41_31 = input.index();
-                        input.rewind();
-                        s = -1;
-                        if ( (LA41_31==DOUBLE_QUOTE) && ((strict == false))) {s = 39;}
-
-                         
-                        input.seek(index41_31);
-                        if ( s>=0 ) return s;
-                        break;
-                    case 33 : 
-                        int LA41_106 = input.LA(1);
-
-                         
-                        int index41_106 = input.index();
-                        input.rewind();
-                        s = -1;
-                        if ( (LA41_106==COMMA) && ((strict == false))) {s = 70;}
-
-                        else if ( (LA41_106==EOF) && ((strict == false))) {s = 71;}
-
-                        else if ( (LA41_106==ASC) && ((strict == false))) {s = 72;}
-
-                        else if ( (LA41_106==DESC) && ((strict == false))) {s = 73;}
-
-                         
-                        input.seek(index41_106);
-                        if ( s>=0 ) return s;
-                        break;
-                    case 34 : 
-                        int LA41_15 = input.LA(1);
-
-                         
-                        int index41_15 = input.index();
-                        input.rewind();
-                        s = -1;
-                        if ( (LA41_15==DOUBLE_QUOTE) && ((strict == false))) {s = 39;}
-
-                         
-                        input.seek(index41_15);
-                        if ( s>=0 ) return s;
-                        break;
-                    case 35 : 
-                        int LA41_0 = input.LA(1);
-
-                         
-                        int index41_0 = input.index();
-                        input.rewind();
-                        s = -1;
-                        if ( (LA41_0==ID) ) {s = 1;}
-
-                        else if ( (LA41_0==DOUBLE_QUOTE) && ((strict == false))) {s = 2;}
-
-                         
-                        input.seek(index41_0);
-                        if ( s>=0 ) return s;
-                        break;
-                    case 36 : 
-                        int LA41_34 = input.LA(1);
-
-                         
-                        int index41_34 = input.index();
-                        input.rewind();
-                        s = -1;
-                        if ( (LA41_34==DOUBLE_QUOTE) && ((strict == false))) {s = 39;}
-
-                         
-                        input.seek(index41_34);
-                        if ( s>=0 ) return s;
-                        break;
-                    case 37 : 
-                        int LA41_16 = input.LA(1);
-
-                         
-                        int index41_16 = input.index();
-                        input.rewind();
-                        s = -1;
-                        if ( (LA41_16==DOUBLE_QUOTE) && ((strict == false))) {s = 39;}
-
-                         
-                        input.seek(index41_16);
-                        if ( s>=0 ) return s;
-                        break;
-                    case 38 : 
-                        int LA41_33 = input.LA(1);
-
-                         
-                        int index41_33 = input.index();
-                        input.rewind();
-                        s = -1;
-                        if ( (LA41_33==DOUBLE_QUOTE) && ((strict == false))) {s = 39;}
-
-                         
-                        input.seek(index41_33);
-                        if ( s>=0 ) return s;
-                        break;
-                    case 39 : 
-                        int LA41_12 = input.LA(1);
-
-                         
-                        int index41_12 = input.index();
-                        input.rewind();
-                        s = -1;
-                        if ( (LA41_12==DOUBLE_QUOTE) && ((strict == false))) {s = 39;}
-
-                         
-                        input.seek(index41_12);
-                        if ( s>=0 ) return s;
-                        break;
-                    case 40 : 
-                        int LA41_14 = input.LA(1);
-
-                         
-                        int index41_14 = input.index();
-                        input.rewind();
-                        s = -1;
-                        if ( (LA41_14==DOUBLE_QUOTE) && ((strict == false))) {s = 39;}
-
-                         
-                        input.seek(index41_14);
-                        if ( s>=0 ) return s;
-                        break;
-                    case 41 : 
-                        int LA41_13 = input.LA(1);
-
-                         
-                        int index41_13 = input.index();
-                        input.rewind();
-                        s = -1;
-                        if ( (LA41_13==DOUBLE_QUOTE) && ((strict == false))) {s = 39;}
-
-                         
-                        input.seek(index41_13);
-                        if ( s>=0 ) return s;
-                        break;
-                    case 42 : 
-                        int LA41_2 = input.LA(1);
-
-                         
-                        int index41_2 = input.index();
-                        input.rewind();
-                        s = -1;
-                        if ( (LA41_2==SELECT) && ((strict == false))) {s = 8;}
-
-                        else if ( (LA41_2==AS) && ((strict == false))) {s = 9;}
-
-                        else if ( (LA41_2==FROM) && ((strict == false))) {s = 10;}
-
-                        else if ( (LA41_2==JOIN) && ((strict == false))) {s = 11;}
-
-                        else if ( (LA41_2==INNER) && ((strict == false))) {s = 12;}
-
-                        else if ( (LA41_2==LEFT) && ((strict == false))) {s = 13;}
-
-                        else if ( (LA41_2==OUTER) && ((strict == false))) {s = 14;}
-
-                        else if ( (LA41_2==ON) && ((strict == false))) {s = 15;}
-
-                        else if ( (LA41_2==WHERE) && ((strict == false))) {s = 16;}
-
-                        else if ( (LA41_2==OR) && ((strict == false))) {s = 17;}
-
-                        else if ( (LA41_2==AND) && ((strict == false))) {s = 18;}
-
-                        else if ( (LA41_2==NOT) && ((strict == false))) {s = 19;}
-
-                        else if ( (LA41_2==IN) && ((strict == false))) {s = 20;}
-
-                        else if ( (LA41_2==LIKE) && ((strict == false))) {s = 21;}
-
-                        else if ( (LA41_2==IS) && ((strict == false))) {s = 22;}
-
-                        else if ( (LA41_2==NULL) && ((strict == false))) {s = 23;}
-
-                        else if ( (LA41_2==ANY) && ((strict == false))) {s = 24;}
-
-                        else if ( (LA41_2==CONTAINS) && ((strict == false))) {s = 25;}
-
-                        else if ( (LA41_2==IN_FOLDER) && ((strict == false))) {s = 26;}
-
-                        else if ( (LA41_2==IN_TREE) && ((strict == false))) {s = 27;}
-
-                        else if ( (LA41_2==ORDER) && ((strict == false))) {s = 28;}
-
-                        else if ( (LA41_2==BY) && ((strict == false))) {s = 29;}
-
-                        else if ( (LA41_2==ASC) && ((strict == false))) {s = 30;}
-
-                        else if ( (LA41_2==DESC) && ((strict == false))) {s = 31;}
-
-                        else if ( (LA41_2==TIMESTAMP) && ((strict == false))) {s = 32;}
-
-                        else if ( (LA41_2==TRUE) && ((strict == false))) {s = 33;}
-
-                        else if ( (LA41_2==FALSE) && ((strict == false))) {s = 34;}
-
-                        else if ( (LA41_2==SCORE) && ((strict == false))) {s = 35;}
-
-                        else if ( (LA41_2==ID) && ((strict == false))) {s = 36;}
-
-                         
-                        input.seek(index41_2);
-                        if ( s>=0 ) return s;
-                        break;
-                    case 43 : 
-                        int LA41_99 = input.LA(1);
-
-                         
-                        int index41_99 = input.index();
-                        input.rewind();
-                        s = -1;
-                        if ( (LA41_99==DOUBLE_QUOTE) && ((strict == false))) {s = 106;}
-
-                         
-                        input.seek(index41_99);
-                        if ( s>=0 ) return s;
-                        break;
-                    case 44 : 
-                        int LA41_35 = input.LA(1);
-
-                         
-                        int index41_35 = input.index();
-                        input.rewind();
-                        s = -1;
-                        if ( (LA41_35==DOUBLE_QUOTE) && ((strict == false))) {s = 39;}
-
-                         
-                        input.seek(index41_35);
-                        if ( s>=0 ) return s;
-                        break;
-                    case 45 : 
-                        int LA41_98 = input.LA(1);
-
-                         
-                        int index41_98 = input.index();
-                        input.rewind();
-                        s = -1;
-                        if ( (LA41_98==DOUBLE_QUOTE) && ((strict == false))) {s = 106;}
-
-                         
-                        input.seek(index41_98);
-                        if ( s>=0 ) return s;
-                        break;
-                    case 46 : 
-                        int LA41_97 = input.LA(1);
-
-                         
-                        int index41_97 = input.index();
-                        input.rewind();
-                        s = -1;
-                        if ( (LA41_97==DOUBLE_QUOTE) && ((strict == false))) {s = 106;}
-
-                         
-                        input.seek(index41_97);
-                        if ( s>=0 ) return s;
-                        break;
-                    case 47 : 
-                        int LA41_105 = input.LA(1);
-
-                         
-                        int index41_105 = input.index();
-                        input.rewind();
-                        s = -1;
-                        if ( (LA41_105==DOUBLE_QUOTE) && ((strict == false))) {s = 106;}
-
-                         
-                        input.seek(index41_105);
-                        if ( s>=0 ) return s;
-                        break;
-                    case 48 : 
-                        int LA41_20 = input.LA(1);
-
-                         
-                        int index41_20 = input.index();
-                        input.rewind();
-                        s = -1;
-                        if ( (LA41_20==DOUBLE_QUOTE) && ((strict == false))) {s = 39;}
-
-                         
-                        input.seek(index41_20);
-                        if ( s>=0 ) return s;
-                        break;
-                    case 49 : 
-                        int LA41_96 = input.LA(1);
-
-                         
-                        int index41_96 = input.index();
-                        input.rewind();
-                        s = -1;
-                        if ( (LA41_96==DOUBLE_QUOTE) && ((strict == false))) {s = 106;}
-
-                         
-                        input.seek(index41_96);
-                        if ( s>=0 ) return s;
-                        break;
-                    case 50 : 
-                        int LA41_95 = input.LA(1);
-
-                         
-                        int index41_95 = input.index();
-                        input.rewind();
-                        s = -1;
-                        if ( (LA41_95==DOUBLE_QUOTE) && ((strict == false))) {s = 106;}
-
-                         
-                        input.seek(index41_95);
-                        if ( s>=0 ) return s;
-                        break;
-                    case 51 : 
-                        int LA41_22 = input.LA(1);
-
-                         
-                        int index41_22 = input.index();
-                        input.rewind();
-                        s = -1;
-                        if ( (LA41_22==DOUBLE_QUOTE) && ((strict == false))) {s = 39;}
-
-                         
-                        input.seek(index41_22);
-                        if ( s>=0 ) return s;
-                        break;
-                    case 52 : 
-                        int LA41_94 = input.LA(1);
-
-                         
-                        int index41_94 = input.index();
-                        input.rewind();
-                        s = -1;
-                        if ( (LA41_94==DOUBLE_QUOTE) && ((strict == false))) {s = 106;}
-
-                         
-                        input.seek(index41_94);
-                        if ( s>=0 ) return s;
-                        break;
-                    case 53 : 
-                        int LA41_21 = input.LA(1);
-
-                         
-                        int index41_21 = input.index();
-                        input.rewind();
-                        s = -1;
-                        if ( (LA41_21==DOUBLE_QUOTE) && ((strict == false))) {s = 39;}
-
-                         
-                        input.seek(index41_21);
-                        if ( s>=0 ) return s;
-                        break;
-                    case 54 : 
-                        int LA41_93 = input.LA(1);
-
-                         
-                        int index41_93 = input.index();
-                        input.rewind();
-                        s = -1;
-                        if ( (LA41_93==DOUBLE_QUOTE) && ((strict == false))) {s = 106;}
-
-                         
-                        input.seek(index41_93);
-                        if ( s>=0 ) return s;
-                        break;
-                    case 55 : 
-                        int LA41_92 = input.LA(1);
-
-                         
-                        int index41_92 = input.index();
-                        input.rewind();
-                        s = -1;
-                        if ( (LA41_92==DOUBLE_QUOTE) && ((strict == false))) {s = 106;}
-
-                         
-                        input.seek(index41_92);
-                        if ( s>=0 ) return s;
-                        break;
-                    case 56 : 
-                        int LA41_36 = input.LA(1);
-
-                         
-                        int index41_36 = input.index();
-                        input.rewind();
-                        s = -1;
-                        if ( (LA41_36==DOUBLE_QUOTE) && ((strict == false))) {s = 39;}
-
-                         
-                        input.seek(index41_36);
-                        if ( s>=0 ) return s;
-                        break;
-                    case 57 : 
-                        int LA41_18 = input.LA(1);
-
-                         
-                        int index41_18 = input.index();
-                        input.rewind();
-                        s = -1;
-                        if ( (LA41_18==DOUBLE_QUOTE) && ((strict == false))) {s = 39;}
-
-                         
-                        input.seek(index41_18);
-                        if ( s>=0 ) return s;
-                        break;
-                    case 58 : 
-                        int LA41_17 = input.LA(1);
-
-                         
-                        int index41_17 = input.index();
-                        input.rewind();
-                        s = -1;
-                        if ( (LA41_17==DOUBLE_QUOTE) && ((strict == false))) {s = 39;}
-
-                         
-                        input.seek(index41_17);
-                        if ( s>=0 ) return s;
-                        break;
-                    case 59 : 
-                        int LA41_103 = input.LA(1);
-
-                         
-                        int index41_103 = input.index();
-                        input.rewind();
-                        s = -1;
-                        if ( (LA41_103==DOUBLE_QUOTE) && ((strict == false))) {s = 106;}
-
-                         
-                        input.seek(index41_103);
-                        if ( s>=0 ) return s;
-                        break;
-                    case 60 : 
-                        int LA41_19 = input.LA(1);
-
-                         
-                        int index41_19 = input.index();
-                        input.rewind();
-                        s = -1;
-                        if ( (LA41_19==DOUBLE_QUOTE) && ((strict == false))) {s = 39;}
-
-                         
-                        input.seek(index41_19);
-                        if ( s>=0 ) return s;
-                        break;
-                    case 61 : 
-                        int LA41_102 = input.LA(1);
-
-                         
-                        int index41_102 = input.index();
-                        input.rewind();
-                        s = -1;
-                        if ( (LA41_102==DOUBLE_QUOTE) && ((strict == false))) {s = 106;}
-
-                         
-                        input.seek(index41_102);
-                        if ( s>=0 ) return s;
-                        break;
-                    case 62 : 
-                        int LA41_101 = input.LA(1);
-
-                         
-                        int index41_101 = input.index();
-                        input.rewind();
-                        s = -1;
-                        if ( (LA41_101==DOUBLE_QUOTE) && ((strict == false))) {s = 106;}
-
-                         
-                        input.seek(index41_101);
-                        if ( s>=0 ) return s;
-                        break;
-                    case 63 : 
-                        int LA41_104 = input.LA(1);
-
-                         
-                        int index41_104 = input.index();
-                        input.rewind();
-                        s = -1;
-                        if ( (LA41_104==DOUBLE_QUOTE) && ((strict == false))) {s = 106;}
-
-                         
-                        input.seek(index41_104);
-                        if ( s>=0 ) return s;
-                        break;
-                    case 64 : 
-                        int LA41_100 = input.LA(1);
-
-                         
-                        int index41_100 = input.index();
-                        input.rewind();
-                        s = -1;
-                        if ( (LA41_100==DOUBLE_QUOTE) && ((strict == false))) {s = 106;}
-
-                         
-                        input.seek(index41_100);
-                        if ( s>=0 ) return s;
-                        break;
-            }
-            if (state.backtracking>0) {state.failed=true; return -1;}
-            NoViableAltException nvae =
-                new NoViableAltException(getDescription(), 41, _s, input);
-            error(nvae);
-            throw nvae;
-        }
-    }
- 
-
-    public static final BitSet FOLLOW_SELECT_in_query415 = new BitSet(new long[]{0xFF07BF0B00000000L,0x0000000000003CCFL});
-    public static final BitSet FOLLOW_selectList_in_query417 = new BitSet(new long[]{0x0000010000000000L});
-    public static final BitSet FOLLOW_fromClause_in_query419 = new BitSet(new long[]{0x0000800000000000L,0x0000000000000001L});
-    public static final BitSet FOLLOW_whereClause_in_query421 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000001L});
-    public static final BitSet FOLLOW_orderByClause_in_query424 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_query427 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_STAR_in_selectList526 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_selectSubList_in_selectList584 = new BitSet(new long[]{0x0000000400000002L});
-    public static final BitSet FOLLOW_COMMA_in_selectList587 = new BitSet(new long[]{0xFF07BF0B00000000L,0x0000000000003CCFL});
-    public static final BitSet FOLLOW_selectSubList_in_selectList589 = new BitSet(new long[]{0x0000000400000002L});
-    public static final BitSet FOLLOW_valueExpression_in_selectSubList673 = new BitSet(new long[]{0x0000000800000002L,0x00000000000000C0L});
-    public static final BitSet FOLLOW_AS_in_selectSubList676 = new BitSet(new long[]{0x0000000000000000L,0x00000000000000C0L});
-    public static final BitSet FOLLOW_columnName_in_selectSubList679 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_qualifier_in_selectSubList744 = new BitSet(new long[]{0x0000001000000000L});
-    public static final BitSet FOLLOW_DOTSTAR_in_selectSubList746 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_columnReference_in_valueExpression837 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_valueFunction_in_valueExpression869 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_qualifier_in_columnReference933 = new BitSet(new long[]{0x0000002000000000L});
-    public static final BitSet FOLLOW_DOT_in_columnReference935 = new BitSet(new long[]{0x0000000000000000L,0x00000000000000C0L});
-    public static final BitSet FOLLOW_columnName_in_columnReference939 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_cmisFunction_in_valueFunction1035 = new BitSet(new long[]{0x0000004000000000L});
-    public static final BitSet FOLLOW_LPAREN_in_valueFunction1037 = new BitSet(new long[]{0x0000008000000000L,0x0000000000001FF0L});
-    public static final BitSet FOLLOW_functionArgument_in_valueFunction1039 = new BitSet(new long[]{0x0000008000000000L,0x0000000000001FF0L});
-    public static final BitSet FOLLOW_RPAREN_in_valueFunction1042 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_keyWordOrId_in_valueFunction1115 = new BitSet(new long[]{0x0000004000000000L});
-    public static final BitSet FOLLOW_LPAREN_in_valueFunction1117 = new BitSet(new long[]{0x0000008000000000L,0x0000000000001FF0L});
-    public static final BitSet FOLLOW_functionArgument_in_valueFunction1119 = new BitSet(new long[]{0x0000008000000000L,0x0000000000001FF0L});
-    public static final BitSet FOLLOW_RPAREN_in_valueFunction1122 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_qualifier_in_functionArgument1211 = new BitSet(new long[]{0x0000002000000000L});
-    public static final BitSet FOLLOW_DOT_in_functionArgument1213 = new BitSet(new long[]{0x0000000000000000L,0x00000000000000C0L});
-    public static final BitSet FOLLOW_columnName_in_functionArgument1215 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_identifier_in_functionArgument1277 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_literalOrParameterName_in_functionArgument1289 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_tableName_in_qualifier1328 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_correlationName_in_qualifier1360 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_FROM_in_fromClause1423 = new BitSet(new long[]{0x0000004000000000L,0x00000000000000C0L});
-    public static final BitSet FOLLOW_tableReference_in_fromClause1425 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_singleTable_in_tableReference1488 = new BitSet(new long[]{0x00000E0000000002L});
-    public static final BitSet FOLLOW_joinedTable_in_tableReference1490 = new BitSet(new long[]{0x00000E0000000002L});
-    public static final BitSet FOLLOW_simpleTable_in_singleTable1588 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_complexTable_in_singleTable1620 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_tableName_in_simpleTable1711 = new BitSet(new long[]{0x0000000800000002L,0x00000000000000C0L});
-    public static final BitSet FOLLOW_AS_in_simpleTable1714 = new BitSet(new long[]{0x0000000000000000L,0x00000000000000C0L});
-    public static final BitSet FOLLOW_correlationName_in_simpleTable1717 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_joinType_in_joinedTable1813 = new BitSet(new long[]{0x0000020000000000L});
-    public static final BitSet FOLLOW_JOIN_in_joinedTable1816 = new BitSet(new long[]{0x0000004000000000L,0x00000000000000C0L});
-    public static final BitSet FOLLOW_tableReference_in_joinedTable1818 = new BitSet(new long[]{0x0000200000000000L});
-    public static final BitSet FOLLOW_joinSpecification_in_joinedTable1820 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_LPAREN_in_complexTable1929 = new BitSet(new long[]{0x0000004000000000L,0x00000000000000C0L});
-    public static final BitSet FOLLOW_singleTable_in_complexTable1931 = new BitSet(new long[]{0x00000E0000000000L});
-    public static final BitSet FOLLOW_joinedTable_in_complexTable1933 = new BitSet(new long[]{0x00000E8000000000L});
-    public static final BitSet FOLLOW_RPAREN_in_complexTable1936 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_LPAREN_in_complexTable1999 = new BitSet(new long[]{0x0000004000000000L,0x00000000000000C0L});
-    public static final BitSet FOLLOW_complexTable_in_complexTable2001 = new BitSet(new long[]{0x0000008000000000L});
-    public static final BitSet FOLLOW_RPAREN_in_complexTable2003 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_INNER_in_joinType2056 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_LEFT_in_joinType2088 = new BitSet(new long[]{0x0000100000000002L});
-    public static final BitSet FOLLOW_OUTER_in_joinType2090 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ON_in_joinSpecification2154 = new BitSet(new long[]{0x0000000000000000L,0x00000000000000C0L});
-    public static final BitSet FOLLOW_columnReference_in_joinSpecification2158 = new BitSet(new long[]{0x0000400000000000L});
-    public static final BitSet FOLLOW_EQUALS_in_joinSpecification2160 = new BitSet(new long[]{0x0000000000000000L,0x00000000000000C0L});
-    public static final BitSet FOLLOW_columnReference_in_joinSpecification2164 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_WHERE_in_whereClause2264 = new BitSet(new long[]{0xFF07BF4900000000L,0x0000000000003FFFL});
-    public static final BitSet FOLLOW_searchOrCondition_in_whereClause2266 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_searchAndCondition_in_searchOrCondition2321 = new BitSet(new long[]{0x0001000000000002L});
-    public static final BitSet FOLLOW_OR_in_searchOrCondition2324 = new BitSet(new long[]{0xFF07BF4900000000L,0x0000000000003FFFL});
-    public static final BitSet FOLLOW_searchAndCondition_in_searchOrCondition2326 = new BitSet(new long[]{0x0001000000000002L});
-    public static final BitSet FOLLOW_searchNotCondition_in_searchAndCondition2412 = new BitSet(new long[]{0x0002000000000002L});
-    public static final BitSet FOLLOW_AND_in_searchAndCondition2415 = new BitSet(new long[]{0xFF07BF4900000000L,0x0000000000003FFFL});
-    public static final BitSet FOLLOW_searchNotCondition_in_searchAndCondition2417 = new BitSet(new long[]{0x0002000000000002L});
-    public static final BitSet FOLLOW_NOT_in_searchNotCondition2501 = new BitSet(new long[]{0xFF07BF4900000000L,0x0000000000003FFFL});
-    public static final BitSet FOLLOW_searchTest_in_searchNotCondition2503 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_searchTest_in_searchNotCondition2563 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_predicate_in_searchTest2616 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_LPAREN_in_searchTest2648 = new BitSet(new long[]{0xFF07BF4900000000L,0x0000000000003FFFL});
-    public static final BitSet FOLLOW_searchOrCondition_in_searchTest2650 = new BitSet(new long[]{0x0000008000000000L});
-    public static final BitSet FOLLOW_RPAREN_in_searchTest2652 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_comparisonPredicate_in_predicate2705 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_inPredicate_in_predicate2717 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_likePredicate_in_predicate2729 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_nullPredicate_in_predicate2741 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_quantifiedComparisonPredicate_in_predicate2753 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_quantifiedInPredicate_in_predicate2765 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_textSearchPredicate_in_predicate2777 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_folderPredicate_in_predicate2789 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_valueExpression_in_comparisonPredicate2822 = new BitSet(new long[]{0x00F8400000000000L});
-    public static final BitSet FOLLOW_compOp_in_comparisonPredicate2824 = new BitSet(new long[]{0x0000000000000000L,0x0000000000001FF0L});
-    public static final BitSet FOLLOW_literalOrParameterName_in_comparisonPredicate2826 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_set_in_compOp0 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_literal_in_literalOrParameterName3006 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_parameterName_in_literalOrParameterName3021 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_signedNumericLiteral_in_literal3054 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_characterStringLiteral_in_literal3066 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_booleanLiteral_in_literal3078 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_datetimeLiteral_in_literal3090 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_columnReference_in_inPredicate3123 = new BitSet(new long[]{0x0104000000000000L});
-    public static final BitSet FOLLOW_NOT_in_inPredicate3125 = new BitSet(new long[]{0x0100000000000000L});
-    public static final BitSet FOLLOW_IN_in_inPredicate3128 = new BitSet(new long[]{0x0000004000000000L});
-    public static final BitSet FOLLOW_LPAREN_in_inPredicate3130 = new BitSet(new long[]{0x0000000000000000L,0x0000000000001FF0L});
-    public static final BitSet FOLLOW_inValueList_in_inPredicate3132 = new BitSet(new long[]{0x0000008000000000L});
-    public static final BitSet FOLLOW_RPAREN_in_inPredicate3134 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_literalOrParameterName_in_inValueList3222 = new BitSet(new long[]{0x0000000400000002L});
-    public static final BitSet FOLLOW_COMMA_in_inValueList3225 = new BitSet(new long[]{0x0000000000000000L,0x0000000000001FF0L});
-    public static final BitSet FOLLOW_literalOrParameterName_in_inValueList3227 = new BitSet(new long[]{0x0000000400000002L});
-    public static final BitSet FOLLOW_columnReference_in_likePredicate3311 = new BitSet(new long[]{0x0204000000000000L});
-    public static final BitSet FOLLOW_NOT_in_likePredicate3313 = new BitSet(new long[]{0x0200000000000000L});
-    public static final BitSet FOLLOW_LIKE_in_likePredicate3316 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000020L});
-    public static final BitSet FOLLOW_characterStringLiteral_in_likePredicate3318 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_columnReference_in_nullPredicate3404 = new BitSet(new long[]{0x0400000000000000L});
-    public static final BitSet FOLLOW_IS_in_nullPredicate3406 = new BitSet(new long[]{0x0800000000000000L});
-    public static final BitSet FOLLOW_NULL_in_nullPredicate3408 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_columnReference_in_nullPredicate3470 = new BitSet(new long[]{0x0400000000000000L});
-    public static final BitSet FOLLOW_IS_in_nullPredicate3472 = new BitSet(new long[]{0x0004000000000000L});
-    public static final BitSet FOLLOW_NOT_in_nullPredicate3474 = new BitSet(new long[]{0x0800000000000000L});
-    public static final BitSet FOLLOW_NULL_in_nullPredicate3476 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_literalOrParameterName_in_quantifiedComparisonPredicate3557 = new BitSet(new long[]{0x00F8400000000000L});
-    public static final BitSet FOLLOW_compOp_in_quantifiedComparisonPredicate3559 = new BitSet(new long[]{0x1000000000000000L});
-    public static final BitSet FOLLOW_ANY_in_quantifiedComparisonPredicate3561 = new BitSet(new long[]{0x0000000000000000L,0x00000000000000C0L});
-    public static final BitSet FOLLOW_columnReference_in_quantifiedComparisonPredicate3563 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ANY_in_quantifiedInPredicate3650 = new BitSet(new long[]{0x0000000000000000L,0x00000000000000C0L});
-    public static final BitSet FOLLOW_columnReference_in_quantifiedInPredicate3652 = new BitSet(new long[]{0x0104000000000000L});
-    public static final BitSet FOLLOW_NOT_in_quantifiedInPredicate3654 = new BitSet(new long[]{0x0100000000000000L});
-    public static final BitSet FOLLOW_IN_in_quantifiedInPredicate3657 = new BitSet(new long[]{0x0000004000000000L});
-    public static final BitSet FOLLOW_LPAREN_in_quantifiedInPredicate3659 = new BitSet(new long[]{0x0000000000000000L,0x0000000000001FF0L});
-    public static final BitSet FOLLOW_inValueList_in_quantifiedInPredicate3661 = new BitSet(new long[]{0x0000008000000000L});
-    public static final BitSet FOLLOW_RPAREN_in_quantifiedInPredicate3663 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_CONTAINS_in_textSearchPredicate3751 = new BitSet(new long[]{0x0000004000000000L});
-    public static final BitSet FOLLOW_LPAREN_in_textSearchPredicate3753 = new BitSet(new long[]{0x0000000000000000L,0x00000000000000E0L});
-    public static final BitSet FOLLOW_qualifier_in_textSearchPredicate3756 = new BitSet(new long[]{0x0000000400000000L});
-    public static final BitSet FOLLOW_COMMA_in_textSearchPredicate3758 = new BitSet(new long[]{0x0000000000000000L,0x00000000000000E0L});
-    public static final BitSet FOLLOW_textSearchExpression_in_textSearchPredicate3762 = new BitSet(new long[]{0x0000008000000000L});
-    public static final BitSet FOLLOW_RPAREN_in_textSearchPredicate3764 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_IN_FOLDER_in_folderPredicate3848 = new BitSet(new long[]{0x0000004000000000L});
-    public static final BitSet FOLLOW_folderPredicateArgs_in_folderPredicate3850 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_IN_TREE_in_folderPredicate3910 = new BitSet(new long[]{0x0000004000000000L});
-    public static final BitSet FOLLOW_folderPredicateArgs_in_folderPredicate3912 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_LPAREN_in_folderPredicateArgs3993 = new BitSet(new long[]{0x0000000000000000L,0x00000000000000E0L});
-    public static final BitSet FOLLOW_qualifier_in_folderPredicateArgs3996 = new BitSet(new long[]{0x0000000400000000L});
-    public static final BitSet FOLLOW_COMMA_in_folderPredicateArgs3998 = new BitSet(new long[]{0x0000000000000000L,0x00000000000000E0L});
-    public static final BitSet FOLLOW_folderId_in_folderPredicateArgs4002 = new BitSet(new long[]{0x0000008000000000L});
-    public static final BitSet FOLLOW_RPAREN_in_folderPredicateArgs4004 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ORDER_in_orderByClause4070 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000002L});
-    public static final BitSet FOLLOW_BY_in_orderByClause4072 = new BitSet(new long[]{0x0000000000000000L,0x00000000000000C0L});
-    public static final BitSet FOLLOW_sortSpecification_in_orderByClause4074 = new BitSet(new long[]{0x0000000400000002L});
-    public static final BitSet FOLLOW_COMMA_in_orderByClause4077 = new BitSet(new long[]{0x0000000000000000L,0x00000000000000C0L});
-    public static final BitSet FOLLOW_sortSpecification_in_orderByClause4079 = new BitSet(new long[]{0x0000000400000002L});
-    public static final BitSet FOLLOW_columnReference_in_sortSpecification4163 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_columnReference_in_sortSpecification4225 = new BitSet(new long[]{0x0000000000000000L,0x000000000000000CL});
-    public static final BitSet FOLLOW_ASC_in_sortSpecification4255 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_DESC_in_sortSpecification4277 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_identifier_in_correlationName4371 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_identifier_in_tableName4407 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_identifier_in_columnName4460 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_COLON_in_parameterName4513 = new BitSet(new long[]{0x0000000000000000L,0x00000000000000C0L});
-    public static final BitSet FOLLOW_identifier_in_parameterName4515 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_characterStringLiteral_in_folderId4596 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_QUOTED_STRING_in_textSearchExpression4649 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ID_in_identifier4682 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_DOUBLE_QUOTE_in_identifier4717 = new BitSet(new long[]{0xFF07BF0900000000L,0x0000000000003CCFL});
-    public static final BitSet FOLLOW_keyWordOrId_in_identifier4719 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000080L});
-    public static final BitSet FOLLOW_DOUBLE_QUOTE_in_identifier4721 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_FLOATING_POINT_LITERAL_in_signedNumericLiteral4800 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_integerLiteral_in_signedNumericLiteral4860 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_DECIMAL_INTEGER_LITERAL_in_integerLiteral4913 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_TRUE_in_booleanLiteral4994 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_FALSE_in_booleanLiteral5054 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_TIMESTAMP_in_datetimeLiteral5135 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000020L});
-    public static final BitSet FOLLOW_QUOTED_STRING_in_datetimeLiteral5137 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_QUOTED_STRING_in_characterStringLiteral5218 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_SELECT_in_keyWord5299 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_AS_in_keyWord5311 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_FROM_in_keyWord5323 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_JOIN_in_keyWord5335 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_INNER_in_keyWord5347 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_LEFT_in_keyWord5359 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_OUTER_in_keyWord5371 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ON_in_keyWord5383 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_WHERE_in_keyWord5395 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_OR_in_keyWord5407 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_AND_in_keyWord5419 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_NOT_in_keyWord5431 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_IN_in_keyWord5443 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_LIKE_in_keyWord5455 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_IS_in_keyWord5467 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_NULL_in_keyWord5479 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ANY_in_keyWord5491 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_CONTAINS_in_keyWord5503 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_IN_FOLDER_in_keyWord5515 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_IN_TREE_in_keyWord5527 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ORDER_in_keyWord5539 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_BY_in_keyWord5551 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ASC_in_keyWord5563 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_DESC_in_keyWord5575 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_TIMESTAMP_in_keyWord5587 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_TRUE_in_keyWord5599 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_FALSE_in_keyWord5611 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_cmisFunction_in_keyWord5623 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_SCORE_in_cmisFunction5656 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_keyWord_in_keyWordOrId5709 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ID_in_keyWordOrId5741 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_tableName_in_synpred1_CMIS1323 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_LPAREN_in_synpred2_CMIS1917 = new BitSet(new long[]{0x0000004000000000L,0x00000000000000C0L});
-    public static final BitSet FOLLOW_singleTable_in_synpred2_CMIS1919 = new BitSet(new long[]{0x00000E0000000000L});
-    public static final BitSet FOLLOW_joinedTable_in_synpred2_CMIS1921 = new BitSet(new long[]{0x00000E8000000000L});
-    public static final BitSet FOLLOW_RPAREN_in_synpred2_CMIS1924 = new BitSet(new long[]{0x0000000000000002L});
-
-}
\ No newline at end of file
diff --git a/source/java/org/alfresco/repo/search/impl/parsers/CMISTest.java b/source/java/org/alfresco/repo/search/impl/parsers/CMISTest.java
deleted file mode 100644
index 2af4fff2df..0000000000
--- a/source/java/org/alfresco/repo/search/impl/parsers/CMISTest.java
+++ /dev/null
@@ -1,83 +0,0 @@
-/*
- * Copyright (C) 2005-2010 Alfresco Software Limited.
- *
- * This file is part of Alfresco
- *
- * Alfresco is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Alfresco is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
- */
-package org.alfresco.repo.search.impl.parsers;
-
-import java.io.IOException;
-import java.io.InputStream;
-
-import junit.framework.TestCase;
-
-import org.alfresco.repo.node.BaseNodeServiceTest;
-import org.antlr.gunit.GrammarInfo;
-import org.antlr.gunit.gUnitLexer;
-import org.antlr.gunit.gUnitParser;
-import org.antlr.runtime.ANTLRInputStream;
-import org.antlr.runtime.CharStream;
-import org.antlr.runtime.CommonTokenStream;
-import org.antlr.runtime.RecognitionException;
-
-public class CMISTest extends TestCase
-{
-    public CMISTest()
-    {
-        // TODO Auto-generated constructor stub
-    }
-
-    public CMISTest(String name)
-    {
-        super(name);
-        // TODO Auto-generated constructor stub
-    }
-
-    @Override
-    protected void setUp() throws Exception
-    {
-        super.setUp();
-
-    }
-
-    public void testLexer() throws IOException, RecognitionException
-    {
-        ClassLoader cl = BaseNodeServiceTest.class.getClassLoader();
-        InputStream modelStream = cl.getResourceAsStream("org/alfresco/repo/search/impl/parsers/cmis_test.gunit");
-
-        CharStream input = new ANTLRInputStream(modelStream);
-        
-        
-        gUnitExecutor executer = new gUnitExecutor(parse(input), "CMIS");
-        
-        System.out.print(executer.execTest());  // unit test result
-        
-        assertEquals("Failures ", 0, executer.failures.size()); 
-        assertEquals("Invalids ", 0, executer.invalids.size()); 
-    }
-
-    private GrammarInfo parse(CharStream input) throws RecognitionException
-    {
-        gUnitLexer lexer = new gUnitLexer(input);
-        CommonTokenStream tokens = new CommonTokenStream(lexer);
-
-        GrammarInfo grammarInfo = new GrammarInfo();
-        gUnitParser parser = new gUnitParser(tokens, grammarInfo);
-        parser.gUnitDef(); // parse gunit script and save elements to grammarInfo
-        return grammarInfo;
-    }
-
-    
-}
diff --git a/source/java/org/alfresco/repo/search/impl/parsers/CMIS_FTS.g b/source/java/org/alfresco/repo/search/impl/parsers/CMIS_FTS.g
deleted file mode 100644
index 196c8724fb..0000000000
--- a/source/java/org/alfresco/repo/search/impl/parsers/CMIS_FTS.g
+++ /dev/null
@@ -1,433 +0,0 @@
-/*
- * Copyright (C) 2005-2010 Alfresco Software Limited.
- *
- * This file is part of Alfresco
- *
- * Alfresco is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Alfresco is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
- */
-/*
- * Parser for the Alfresco full text query language.
- * It may be used stand-alone or embedded, for example, in CMIS SQL contains() 
- *
- */
-
-grammar CMIS_FTS;
-
-options
-{
-        output    = AST;
-        backtrack = false;
-}
-/*
- * Additional tokens for tree building.
- */
-
-
-tokens
-{
-        DISJUNCTION;
-        CONJUNCTION;
-        TERM;
-        PHRASE;
-        DEFAULT;
-        EXCLUDE;
-}
-/*
- * Make sure the lexer and parser are generated in the correct package
- */
-
-
-@lexer::header
-{
-package org.alfresco.repo.search.impl.parsers;
-import org.alfresco.cmis.CMISQueryException;
-}
-
-@header
-{
-package org.alfresco.repo.search.impl.parsers;
-}
-/*
- * Embeded java to control the default connective when not specified.
- *
- * Do not support recover from errors
- *
- * Add extra detail to teh error message
- */
-
-
-@members
-{
-    private Stack<String> paraphrases = new Stack<String>();
-    
-    protected Object recoverFromMismatchedToken(IntStream input, int ttype, BitSet follow) throws RecognitionException
-    {
-        throw new MismatchedTokenException(ttype, input);
-    }
-        
-    public Object recoverFromMismatchedSet(IntStream input, RecognitionException e, BitSet follow) throws RecognitionException
-    {
-        throw e;
-    }
-    
-   public String getErrorMessage(RecognitionException e, String[] tokenNames) 
-    {
-        List stack = getRuleInvocationStack(e, this.getClass().getName());
-        String msg = e.getMessage();
-        if ( e instanceof UnwantedTokenException ) 
-            {
-            UnwantedTokenException ute = (UnwantedTokenException)e;
-            String tokenName="<unknown>";
-            if ( ute.expecting== Token.EOF ) 
-            {
-                tokenName = "EOF";
-            }
-            else 
-            {
-                tokenName = tokenNames[ute.expecting];
-            }
-            msg = "extraneous input " + getTokenErrorDisplay(ute.getUnexpectedToken())
-                + " expecting "+tokenName;
-        }
-        else if ( e instanceof MissingTokenException ) 
-        {
-            MissingTokenException mte = (MissingTokenException)e;
-            String tokenName="<unknown>";
-            if ( mte.expecting== Token.EOF ) 
-            {
-                tokenName = "EOF";
-            }
-            else 
-            {
-                tokenName = tokenNames[mte.expecting];
-            }
-            msg = "missing " + tokenName+" at " + getTokenErrorDisplay(e.token)
-                + "  (" + getLongTokenErrorDisplay(e.token) +")";
-        }
-        else if ( e instanceof MismatchedTokenException ) 
-        {
-            MismatchedTokenException mte = (MismatchedTokenException)e;
-            String tokenName="<unknown>";
-            if ( mte.expecting== Token.EOF ) 
-            {
-                tokenName = "EOF";
-            }
-            else
-            {
-                tokenName = tokenNames[mte.expecting];
-            }
-            msg = "mismatched input " + getTokenErrorDisplay(e.token)
-                + " expecting " + tokenName +"  (" + getLongTokenErrorDisplay(e.token) + ")";
-        }
-        else if ( e instanceof MismatchedTreeNodeException ) 
-        {
-            MismatchedTreeNodeException mtne = (MismatchedTreeNodeException)e;
-            String tokenName="<unknown>";
-            if ( mtne.expecting==Token.EOF )  
-            {
-                tokenName = "EOF";
-            }
-            else 
-            {
-                tokenName = tokenNames[mtne.expecting];
-            }
-            msg = "mismatched tree node: " + mtne.node + " expecting " + tokenName;
-        }
-        else if ( e instanceof NoViableAltException ) 
-        {
-            NoViableAltException nvae = (NoViableAltException)e;
-            msg = "no viable alternative at input " + getTokenErrorDisplay(e.token)
-                + "\n\t (decision=" + nvae.decisionNumber
-                + " state " + nvae.stateNumber + ")" 
-                + " decision=<<" + nvae.grammarDecisionDescription + ">>";
-        }
-        else if ( e instanceof EarlyExitException ) 
-        {
-            //EarlyExitException eee = (EarlyExitException)e;
-            // for development, can add "(decision="+eee.decisionNumber+")"
-            msg = "required (...)+ loop did not match anything at input " + getTokenErrorDisplay(e.token);
-        }
-            else if ( e instanceof MismatchedSetException ) 
-            {
-                MismatchedSetException mse = (MismatchedSetException)e;
-                msg = "mismatched input " + getTokenErrorDisplay(e.token)
-                + " expecting set " + mse.expecting;
-        }
-        else if ( e instanceof MismatchedNotSetException ) 
-        {
-            MismatchedNotSetException mse = (MismatchedNotSetException)e;
-            msg = "mismatched input " + getTokenErrorDisplay(e.token)
-                + " expecting set " + mse.expecting;
-        }
-        else if ( e instanceof FailedPredicateException ) 
-        {
-            FailedPredicateException fpe = (FailedPredicateException)e;
-            msg = "rule " + fpe.ruleName + " failed predicate: {" + fpe.predicateText + "}?";
-        }
-                
-        if(paraphrases.size() > 0)
-        {
-            String paraphrase = (String)paraphrases.peek();
-            msg = msg+" "+paraphrase;
-        }
-        return msg +"\n\t"+stack;
-    }
-        
-    public String getLongTokenErrorDisplay(Token t)
-    {
-        return t.toString();
-    }
-    
-
-    public String getErrorString(RecognitionException e)
-    {
-        String hdr = getErrorHeader(e);
-        String msg = getErrorMessage(e, this.getTokenNames());
-        return hdr+" "+msg;
-    } 
-}
-/*
- * Always throw exceptions
- */
-
-
-@rulecatch
-{
-catch(RecognitionException e)
-{
-   throw e;
-}
-}
-/*
- * Support for emitting duplicate tokens from the lexer
- * - required to emit ranges after matching floating point literals ...
- */
-
-
-@lexer::members
-{
-List tokens = new ArrayList();
-public void emit(Token token) {
-        state.token = token;
-        tokens.add(token);
-}
-public Token nextToken() {
-        nextTokenImpl();
-        if ( tokens.size()==0 ) {
-            return Token.EOF_TOKEN;
-        }
-        return (Token)tokens.remove(0);
-}
-
-public Token nextTokenImpl() {
-        while (true) 
-        {
-            state.token = null;
-            state.channel = Token.DEFAULT_CHANNEL;
-            state.tokenStartCharIndex = input.index();
-            state.tokenStartCharPositionInLine = input.getCharPositionInLine();
-            state.tokenStartLine = input.getLine();
-            state.text = null;
-            if ( input.LA(1)==CharStream.EOF ) 
-            {
-                return Token.EOF_TOKEN;
-            }
-            try 
-            {
-                mTokens();
-                if ( state.token==null ) 
-                {
-                    emit();
-                }
-                else if ( state.token==Token.SKIP_TOKEN ) 
-                {
-                    continue;
-                }
-                return state.token;
-            }
-            catch (RecognitionException re) 
-            {
-                throw new CMISQueryException(getErrorString(re), re);
-            }
-        }
-    }
-    
-    public String getErrorString(RecognitionException e)
-    {
-        String hdr = getErrorHeader(e);
-        String msg = getErrorMessage(e, this.getTokenNames());
-        return hdr+" "+msg;
-    }
-}
-/*
- * Top level query
- */
-
-
-cmisFtsQuery
-        :
-        ftsCmisDisjunction EOF
-                -> ftsCmisDisjunction
-        ;
-/*
- * "OR"
- * As SQL, OR has lower precedence than implicit AND
- */
-
-
-ftsCmisDisjunction
-        :
-        ftsCmisConjunction (or ftsCmisConjunction)*
-                ->
-                        ^(DISJUNCTION ftsCmisConjunction+)
-        ;
-
-ftsCmisConjunction
-        :
-        ftsCmisPrefixed+
-                ->
-                        ^(CONJUNCTION ftsCmisPrefixed+)
-        ;
-
-ftsCmisPrefixed
-        :
-        cmisTest
-                ->
-                        ^(DEFAULT cmisTest)
-        | MINUS cmisTest
-                ->
-                        ^(EXCLUDE cmisTest)
-        ;
-
-cmisTest
-        :
-        cmisTerm
-                ->
-                        ^(TERM cmisTerm)
-        | cmisPhrase
-                ->
-                        ^(PHRASE cmisPhrase)
-        
-        ;
-
-cmisTerm
-        :
-        FTSWORD
-                -> FTSWORD
-        ;
-
-cmisPhrase
-        :
-        FTSPHRASE
-                -> FTSPHRASE
-        ;
-
-or
-        :
-        OR
-        ;
-
-// ===== //
-// LEXER //
-// ===== //
-
-FTSPHRASE
-        :
-        '\''
-        (
-                F_ESC
-                |
-                ~(
-                        '\\'
-                        | '\''
-                 )
-        )*
-        '\''
-        ;
-        
-        
-fragment
-F_ESC
-        :
-        '\\' ('\\' | '\'')
-        ;
-        
-/*
- * Simple tokens, note all are case insensitive
- */
-
-
-OR
-        :
-        (
-                'O'
-                | 'o'
-        )
-        (
-                'R'
-                | 'r'
-        )
-        ;
-
-MINUS
-        :
-        '-'
-        ;
-
-/*
- * Standard white space
- * White space may be escaped by \ in some tokens 
- */
-
-
-WS
-        :
-        (
-                ' '
-                | '\t'
-                | '\r'
-                | '\n'
-        )+
-        { $channel = HIDDEN; }
-        ;
-
-
-FTSWORD
-        :
-        START_WORD IN_WORD*
-        ;
-
-fragment
-START_WORD
-        :
-        ~ (
-                ' '
-                | '\t'
-                | '\r'
-                | '\n'
-                | '-'
-        )
-        ;
-
-fragment
-IN_WORD
-        :
-        ~ (
-                ' '
-                | '\t'
-                | '\r'
-                | '\n'
-        )
-        ;
-
diff --git a/source/java/org/alfresco/repo/search/impl/parsers/CMIS_FTS.tokens b/source/java/org/alfresco/repo/search/impl/parsers/CMIS_FTS.tokens
deleted file mode 100644
index 72ebd52679..0000000000
--- a/source/java/org/alfresco/repo/search/impl/parsers/CMIS_FTS.tokens
+++ /dev/null
@@ -1,14 +0,0 @@
-DISJUNCTION=4
-CONJUNCTION=5
-TERM=6
-PHRASE=7
-DEFAULT=8
-EXCLUDE=9
-MINUS=10
-FTSWORD=11
-FTSPHRASE=12
-OR=13
-F_ESC=14
-WS=15
-START_WORD=16
-IN_WORD=17
diff --git a/source/java/org/alfresco/repo/search/impl/parsers/CMIS_FTSLexer.java b/source/java/org/alfresco/repo/search/impl/parsers/CMIS_FTSLexer.java
deleted file mode 100644
index 58a8128421..0000000000
--- a/source/java/org/alfresco/repo/search/impl/parsers/CMIS_FTSLexer.java
+++ /dev/null
@@ -1,628 +0,0 @@
-// $ANTLR 3.3 Nov 30, 2010 12:50:56 W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS_FTS.g 2011-04-26 17:09:23
-
-package org.alfresco.repo.search.impl.parsers;
-import org.alfresco.cmis.CMISQueryException;
-
-
-import org.antlr.runtime.*;
-import java.util.Stack;
-import java.util.List;
-import java.util.ArrayList;
-
-public class CMIS_FTSLexer extends Lexer {
-    public static final int EOF=-1;
-    public static final int DISJUNCTION=4;
-    public static final int CONJUNCTION=5;
-    public static final int TERM=6;
-    public static final int PHRASE=7;
-    public static final int DEFAULT=8;
-    public static final int EXCLUDE=9;
-    public static final int MINUS=10;
-    public static final int FTSWORD=11;
-    public static final int FTSPHRASE=12;
-    public static final int OR=13;
-    public static final int F_ESC=14;
-    public static final int WS=15;
-    public static final int START_WORD=16;
-    public static final int IN_WORD=17;
-
-    List tokens = new ArrayList();
-    public void emit(Token token) {
-            state.token = token;
-            tokens.add(token);
-    }
-    public Token nextToken() {
-            nextTokenImpl();
-            if ( tokens.size()==0 ) {
-                return Token.EOF_TOKEN;
-            }
-            return (Token)tokens.remove(0);
-    }
-
-    public Token nextTokenImpl() {
-            while (true) 
-            {
-                state.token = null;
-                state.channel = Token.DEFAULT_CHANNEL;
-                state.tokenStartCharIndex = input.index();
-                state.tokenStartCharPositionInLine = input.getCharPositionInLine();
-                state.tokenStartLine = input.getLine();
-                state.text = null;
-                if ( input.LA(1)==CharStream.EOF ) 
-                {
-                    return Token.EOF_TOKEN;
-                }
-                try 
-                {
-                    mTokens();
-                    if ( state.token==null ) 
-                    {
-                        emit();
-                    }
-                    else if ( state.token==Token.SKIP_TOKEN ) 
-                    {
-                        continue;
-                    }
-                    return state.token;
-                }
-                catch (RecognitionException re) 
-                {
-                    throw new CMISQueryException(getErrorString(re), re);
-                }
-            }
-        }
-        
-        public String getErrorString(RecognitionException e)
-        {
-            String hdr = getErrorHeader(e);
-            String msg = getErrorMessage(e, this.getTokenNames());
-            return hdr+" "+msg;
-        }
-
-
-    // delegates
-    // delegators
-
-    public CMIS_FTSLexer() {;} 
-    public CMIS_FTSLexer(CharStream input) {
-        this(input, new RecognizerSharedState());
-    }
-    public CMIS_FTSLexer(CharStream input, RecognizerSharedState state) {
-        super(input,state);
-
-    }
-    public String getGrammarFileName() { return "W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS_FTS.g"; }
-
-    // $ANTLR start "FTSPHRASE"
-    public final void mFTSPHRASE() throws RecognitionException {
-        try {
-            int _type = FTSPHRASE;
-            int _channel = DEFAULT_TOKEN_CHANNEL;
-            // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS_FTS.g:346:9: ( '\\'' ( F_ESC | ~ ( '\\\\' | '\\'' ) )* '\\'' )
-            // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS_FTS.g:347:9: '\\'' ( F_ESC | ~ ( '\\\\' | '\\'' ) )* '\\''
-            {
-            match('\''); 
-            // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS_FTS.g:348:9: ( F_ESC | ~ ( '\\\\' | '\\'' ) )*
-            loop1:
-            do {
-                int alt1=3;
-                int LA1_0 = input.LA(1);
-
-                if ( (LA1_0=='\\') ) {
-                    alt1=1;
-                }
-                else if ( ((LA1_0>='\u0000' && LA1_0<='&')||(LA1_0>='(' && LA1_0<='[')||(LA1_0>=']' && LA1_0<='\uFFFF')) ) {
-                    alt1=2;
-                }
-
-
-                switch (alt1) {
-            	case 1 :
-            	    // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS_FTS.g:349:17: F_ESC
-            	    {
-            	    mF_ESC(); 
-
-            	    }
-            	    break;
-            	case 2 :
-            	    // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS_FTS.g:351:17: ~ ( '\\\\' | '\\'' )
-            	    {
-            	    if ( (input.LA(1)>='\u0000' && input.LA(1)<='&')||(input.LA(1)>='(' && input.LA(1)<='[')||(input.LA(1)>=']' && input.LA(1)<='\uFFFF') ) {
-            	        input.consume();
-
-            	    }
-            	    else {
-            	        MismatchedSetException mse = new MismatchedSetException(null,input);
-            	        recover(mse);
-            	        throw mse;}
-
-
-            	    }
-            	    break;
-
-            	default :
-            	    break loop1;
-                }
-            } while (true);
-
-            match('\''); 
-
-            }
-
-            state.type = _type;
-            state.channel = _channel;
-        }
-        finally {
-        }
-    }
-    // $ANTLR end "FTSPHRASE"
-
-    // $ANTLR start "F_ESC"
-    public final void mF_ESC() throws RecognitionException {
-        try {
-            // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS_FTS.g:362:9: ( '\\\\' ( '\\\\' | '\\'' ) )
-            // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS_FTS.g:363:9: '\\\\' ( '\\\\' | '\\'' )
-            {
-            match('\\'); 
-            if ( input.LA(1)=='\''||input.LA(1)=='\\' ) {
-                input.consume();
-
-            }
-            else {
-                MismatchedSetException mse = new MismatchedSetException(null,input);
-                recover(mse);
-                throw mse;}
-
-
-            }
-
-        }
-        finally {
-        }
-    }
-    // $ANTLR end "F_ESC"
-
-    // $ANTLR start "OR"
-    public final void mOR() throws RecognitionException {
-        try {
-            int _type = OR;
-            int _channel = DEFAULT_TOKEN_CHANNEL;
-            // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS_FTS.g:372:9: ( ( 'O' | 'o' ) ( 'R' | 'r' ) )
-            // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS_FTS.g:373:9: ( 'O' | 'o' ) ( 'R' | 'r' )
-            {
-            if ( input.LA(1)=='O'||input.LA(1)=='o' ) {
-                input.consume();
-
-            }
-            else {
-                MismatchedSetException mse = new MismatchedSetException(null,input);
-                recover(mse);
-                throw mse;}
-
-            if ( input.LA(1)=='R'||input.LA(1)=='r' ) {
-                input.consume();
-
-            }
-            else {
-                MismatchedSetException mse = new MismatchedSetException(null,input);
-                recover(mse);
-                throw mse;}
-
-
-            }
-
-            state.type = _type;
-            state.channel = _channel;
-        }
-        finally {
-        }
-    }
-    // $ANTLR end "OR"
-
-    // $ANTLR start "MINUS"
-    public final void mMINUS() throws RecognitionException {
-        try {
-            int _type = MINUS;
-            int _channel = DEFAULT_TOKEN_CHANNEL;
-            // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS_FTS.g:384:9: ( '-' )
-            // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS_FTS.g:385:9: '-'
-            {
-            match('-'); 
-
-            }
-
-            state.type = _type;
-            state.channel = _channel;
-        }
-        finally {
-        }
-    }
-    // $ANTLR end "MINUS"
-
-    // $ANTLR start "WS"
-    public final void mWS() throws RecognitionException {
-        try {
-            int _type = WS;
-            int _channel = DEFAULT_TOKEN_CHANNEL;
-            // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS_FTS.g:395:9: ( ( ' ' | '\\t' | '\\r' | '\\n' )+ )
-            // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS_FTS.g:396:9: ( ' ' | '\\t' | '\\r' | '\\n' )+
-            {
-            // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS_FTS.g:396:9: ( ' ' | '\\t' | '\\r' | '\\n' )+
-            int cnt2=0;
-            loop2:
-            do {
-                int alt2=2;
-                int LA2_0 = input.LA(1);
-
-                if ( ((LA2_0>='\t' && LA2_0<='\n')||LA2_0=='\r'||LA2_0==' ') ) {
-                    alt2=1;
-                }
-
-
-                switch (alt2) {
-            	case 1 :
-            	    // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS_FTS.g:
-            	    {
-            	    if ( (input.LA(1)>='\t' && input.LA(1)<='\n')||input.LA(1)=='\r'||input.LA(1)==' ' ) {
-            	        input.consume();
-
-            	    }
-            	    else {
-            	        MismatchedSetException mse = new MismatchedSetException(null,input);
-            	        recover(mse);
-            	        throw mse;}
-
-
-            	    }
-            	    break;
-
-            	default :
-            	    if ( cnt2 >= 1 ) break loop2;
-                        EarlyExitException eee =
-                            new EarlyExitException(2, input);
-                        throw eee;
-                }
-                cnt2++;
-            } while (true);
-
-             _channel = HIDDEN; 
-
-            }
-
-            state.type = _type;
-            state.channel = _channel;
-        }
-        finally {
-        }
-    }
-    // $ANTLR end "WS"
-
-    // $ANTLR start "FTSWORD"
-    public final void mFTSWORD() throws RecognitionException {
-        try {
-            int _type = FTSWORD;
-            int _channel = DEFAULT_TOKEN_CHANNEL;
-            // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS_FTS.g:407:9: ( START_WORD ( IN_WORD )* )
-            // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS_FTS.g:408:9: START_WORD ( IN_WORD )*
-            {
-            mSTART_WORD(); 
-            // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS_FTS.g:408:20: ( IN_WORD )*
-            loop3:
-            do {
-                int alt3=2;
-                int LA3_0 = input.LA(1);
-
-                if ( ((LA3_0>='\u0000' && LA3_0<='\b')||(LA3_0>='\u000B' && LA3_0<='\f')||(LA3_0>='\u000E' && LA3_0<='\u001F')||(LA3_0>='!' && LA3_0<='\uFFFF')) ) {
-                    alt3=1;
-                }
-
-
-                switch (alt3) {
-            	case 1 :
-            	    // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS_FTS.g:408:20: IN_WORD
-            	    {
-            	    mIN_WORD(); 
-
-            	    }
-            	    break;
-
-            	default :
-            	    break loop3;
-                }
-            } while (true);
-
-
-            }
-
-            state.type = _type;
-            state.channel = _channel;
-        }
-        finally {
-        }
-    }
-    // $ANTLR end "FTSWORD"
-
-    // $ANTLR start "START_WORD"
-    public final void mSTART_WORD() throws RecognitionException {
-        try {
-            // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS_FTS.g:413:9: (~ ( ' ' | '\\t' | '\\r' | '\\n' | '-' ) )
-            // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS_FTS.g:414:9: ~ ( ' ' | '\\t' | '\\r' | '\\n' | '-' )
-            {
-            if ( (input.LA(1)>='\u0000' && input.LA(1)<='\b')||(input.LA(1)>='\u000B' && input.LA(1)<='\f')||(input.LA(1)>='\u000E' && input.LA(1)<='\u001F')||(input.LA(1)>='!' && input.LA(1)<=',')||(input.LA(1)>='.' && input.LA(1)<='\uFFFF') ) {
-                input.consume();
-
-            }
-            else {
-                MismatchedSetException mse = new MismatchedSetException(null,input);
-                recover(mse);
-                throw mse;}
-
-
-            }
-
-        }
-        finally {
-        }
-    }
-    // $ANTLR end "START_WORD"
-
-    // $ANTLR start "IN_WORD"
-    public final void mIN_WORD() throws RecognitionException {
-        try {
-            // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS_FTS.g:425:9: (~ ( ' ' | '\\t' | '\\r' | '\\n' ) )
-            // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS_FTS.g:426:9: ~ ( ' ' | '\\t' | '\\r' | '\\n' )
-            {
-            if ( (input.LA(1)>='\u0000' && input.LA(1)<='\b')||(input.LA(1)>='\u000B' && input.LA(1)<='\f')||(input.LA(1)>='\u000E' && input.LA(1)<='\u001F')||(input.LA(1)>='!' && input.LA(1)<='\uFFFF') ) {
-                input.consume();
-
-            }
-            else {
-                MismatchedSetException mse = new MismatchedSetException(null,input);
-                recover(mse);
-                throw mse;}
-
-
-            }
-
-        }
-        finally {
-        }
-    }
-    // $ANTLR end "IN_WORD"
-
-    public void mTokens() throws RecognitionException {
-        // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS_FTS.g:1:8: ( FTSPHRASE | OR | MINUS | WS | FTSWORD )
-        int alt4=5;
-        alt4 = dfa4.predict(input);
-        switch (alt4) {
-            case 1 :
-                // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS_FTS.g:1:10: FTSPHRASE
-                {
-                mFTSPHRASE(); 
-
-                }
-                break;
-            case 2 :
-                // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS_FTS.g:1:20: OR
-                {
-                mOR(); 
-
-                }
-                break;
-            case 3 :
-                // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS_FTS.g:1:23: MINUS
-                {
-                mMINUS(); 
-
-                }
-                break;
-            case 4 :
-                // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS_FTS.g:1:29: WS
-                {
-                mWS(); 
-
-                }
-                break;
-            case 5 :
-                // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS_FTS.g:1:32: FTSWORD
-                {
-                mFTSWORD(); 
-
-                }
-                break;
-
-        }
-
-    }
-
-
-    protected DFA4 dfa4 = new DFA4(this);
-    static final String DFA4_eotS =
-        "\1\uffff\2\11\3\uffff\2\11\1\16\2\uffff\1\17\1\uffff\1\11\2\uffff";
-    static final String DFA4_eofS =
-        "\20\uffff";
-    static final String DFA4_minS =
-        "\3\0\3\uffff\3\0\2\uffff\1\0\1\uffff\1\0\2\uffff";
-    static final String DFA4_maxS =
-        "\3\uffff\3\uffff\3\uffff\2\uffff\1\uffff\1\uffff\1\uffff\2\uffff";
-    static final String DFA4_acceptS =
-        "\3\uffff\1\3\1\4\1\5\3\uffff\1\5\1\1\1\uffff\1\5\1\uffff\1\1\1"+
-        "\2";
-    static final String DFA4_specialS =
-        "\1\6\1\5\1\4\3\uffff\1\1\1\0\1\7\2\uffff\1\2\1\uffff\1\3\2\uffff}>";
-    static final String[] DFA4_transitionS = {
-            "\11\5\2\4\2\5\1\4\22\5\1\4\6\5\1\1\5\5\1\3\41\5\1\2\37\5\1"+
-            "\2\uff90\5",
-            "\11\7\2\12\2\7\1\12\22\7\1\12\6\7\1\10\64\7\1\6\uffa3\7",
-            "\11\14\2\uffff\2\14\1\uffff\22\14\1\uffff\61\14\1\13\37\14"+
-            "\1\13\uff8d\14",
-            "",
-            "",
-            "",
-            "\11\14\2\uffff\2\14\1\uffff\22\14\1\uffff\6\14\1\15\64\14"+
-            "\1\15\uffa3\14",
-            "\11\7\2\12\2\7\1\12\22\7\1\12\6\7\1\10\64\7\1\6\uffa3\7",
-            "\11\14\2\uffff\2\14\1\uffff\22\14\1\uffff\uffdf\14",
-            "",
-            "",
-            "\11\14\2\uffff\2\14\1\uffff\22\14\1\uffff\uffdf\14",
-            "",
-            "\11\7\2\12\2\7\1\12\22\7\1\12\6\7\1\10\64\7\1\6\uffa3\7",
-            "",
-            ""
-    };
-
-    static final short[] DFA4_eot = DFA.unpackEncodedString(DFA4_eotS);
-    static final short[] DFA4_eof = DFA.unpackEncodedString(DFA4_eofS);
-    static final char[] DFA4_min = DFA.unpackEncodedStringToUnsignedChars(DFA4_minS);
-    static final char[] DFA4_max = DFA.unpackEncodedStringToUnsignedChars(DFA4_maxS);
-    static final short[] DFA4_accept = DFA.unpackEncodedString(DFA4_acceptS);
-    static final short[] DFA4_special = DFA.unpackEncodedString(DFA4_specialS);
-    static final short[][] DFA4_transition;
-
-    static {
-        int numStates = DFA4_transitionS.length;
-        DFA4_transition = new short[numStates][];
-        for (int i=0; i<numStates; i++) {
-            DFA4_transition[i] = DFA.unpackEncodedString(DFA4_transitionS[i]);
-        }
-    }
-
-    class DFA4 extends DFA {
-
-        public DFA4(BaseRecognizer recognizer) {
-            this.recognizer = recognizer;
-            this.decisionNumber = 4;
-            this.eot = DFA4_eot;
-            this.eof = DFA4_eof;
-            this.min = DFA4_min;
-            this.max = DFA4_max;
-            this.accept = DFA4_accept;
-            this.special = DFA4_special;
-            this.transition = DFA4_transition;
-        }
-        public String getDescription() {
-            return "1:1: Tokens : ( FTSPHRASE | OR | MINUS | WS | FTSWORD );";
-        }
-        public int specialStateTransition(int s, IntStream _input) throws NoViableAltException {
-            IntStream input = _input;
-        	int _s = s;
-            switch ( s ) {
-                    case 0 : 
-                        int LA4_7 = input.LA(1);
-
-                        s = -1;
-                        if ( (LA4_7=='\'') ) {s = 8;}
-
-                        else if ( (LA4_7=='\\') ) {s = 6;}
-
-                        else if ( ((LA4_7>='\u0000' && LA4_7<='\b')||(LA4_7>='\u000B' && LA4_7<='\f')||(LA4_7>='\u000E' && LA4_7<='\u001F')||(LA4_7>='!' && LA4_7<='&')||(LA4_7>='(' && LA4_7<='[')||(LA4_7>=']' && LA4_7<='\uFFFF')) ) {s = 7;}
-
-                        else if ( ((LA4_7>='\t' && LA4_7<='\n')||LA4_7=='\r'||LA4_7==' ') ) {s = 10;}
-
-                        else s = 9;
-
-                        if ( s>=0 ) return s;
-                        break;
-                    case 1 : 
-                        int LA4_6 = input.LA(1);
-
-                        s = -1;
-                        if ( (LA4_6=='\''||LA4_6=='\\') ) {s = 13;}
-
-                        else if ( ((LA4_6>='\u0000' && LA4_6<='\b')||(LA4_6>='\u000B' && LA4_6<='\f')||(LA4_6>='\u000E' && LA4_6<='\u001F')||(LA4_6>='!' && LA4_6<='&')||(LA4_6>='(' && LA4_6<='[')||(LA4_6>=']' && LA4_6<='\uFFFF')) ) {s = 12;}
-
-                        else s = 9;
-
-                        if ( s>=0 ) return s;
-                        break;
-                    case 2 : 
-                        int LA4_11 = input.LA(1);
-
-                        s = -1;
-                        if ( ((LA4_11>='\u0000' && LA4_11<='\b')||(LA4_11>='\u000B' && LA4_11<='\f')||(LA4_11>='\u000E' && LA4_11<='\u001F')||(LA4_11>='!' && LA4_11<='\uFFFF')) ) {s = 12;}
-
-                        else s = 15;
-
-                        if ( s>=0 ) return s;
-                        break;
-                    case 3 : 
-                        int LA4_13 = input.LA(1);
-
-                        s = -1;
-                        if ( (LA4_13=='\'') ) {s = 8;}
-
-                        else if ( (LA4_13=='\\') ) {s = 6;}
-
-                        else if ( ((LA4_13>='\u0000' && LA4_13<='\b')||(LA4_13>='\u000B' && LA4_13<='\f')||(LA4_13>='\u000E' && LA4_13<='\u001F')||(LA4_13>='!' && LA4_13<='&')||(LA4_13>='(' && LA4_13<='[')||(LA4_13>=']' && LA4_13<='\uFFFF')) ) {s = 7;}
-
-                        else if ( ((LA4_13>='\t' && LA4_13<='\n')||LA4_13=='\r'||LA4_13==' ') ) {s = 10;}
-
-                        else s = 9;
-
-                        if ( s>=0 ) return s;
-                        break;
-                    case 4 : 
-                        int LA4_2 = input.LA(1);
-
-                        s = -1;
-                        if ( (LA4_2=='R'||LA4_2=='r') ) {s = 11;}
-
-                        else if ( ((LA4_2>='\u0000' && LA4_2<='\b')||(LA4_2>='\u000B' && LA4_2<='\f')||(LA4_2>='\u000E' && LA4_2<='\u001F')||(LA4_2>='!' && LA4_2<='Q')||(LA4_2>='S' && LA4_2<='q')||(LA4_2>='s' && LA4_2<='\uFFFF')) ) {s = 12;}
-
-                        else s = 9;
-
-                        if ( s>=0 ) return s;
-                        break;
-                    case 5 : 
-                        int LA4_1 = input.LA(1);
-
-                        s = -1;
-                        if ( (LA4_1=='\\') ) {s = 6;}
-
-                        else if ( ((LA4_1>='\u0000' && LA4_1<='\b')||(LA4_1>='\u000B' && LA4_1<='\f')||(LA4_1>='\u000E' && LA4_1<='\u001F')||(LA4_1>='!' && LA4_1<='&')||(LA4_1>='(' && LA4_1<='[')||(LA4_1>=']' && LA4_1<='\uFFFF')) ) {s = 7;}
-
-                        else if ( (LA4_1=='\'') ) {s = 8;}
-
-                        else if ( ((LA4_1>='\t' && LA4_1<='\n')||LA4_1=='\r'||LA4_1==' ') ) {s = 10;}
-
-                        else s = 9;
-
-                        if ( s>=0 ) return s;
-                        break;
-                    case 6 : 
-                        int LA4_0 = input.LA(1);
-
-                        s = -1;
-                        if ( (LA4_0=='\'') ) {s = 1;}
-
-                        else if ( (LA4_0=='O'||LA4_0=='o') ) {s = 2;}
-
-                        else if ( (LA4_0=='-') ) {s = 3;}
-
-                        else if ( ((LA4_0>='\t' && LA4_0<='\n')||LA4_0=='\r'||LA4_0==' ') ) {s = 4;}
-
-                        else if ( ((LA4_0>='\u0000' && LA4_0<='\b')||(LA4_0>='\u000B' && LA4_0<='\f')||(LA4_0>='\u000E' && LA4_0<='\u001F')||(LA4_0>='!' && LA4_0<='&')||(LA4_0>='(' && LA4_0<=',')||(LA4_0>='.' && LA4_0<='N')||(LA4_0>='P' && LA4_0<='n')||(LA4_0>='p' && LA4_0<='\uFFFF')) ) {s = 5;}
-
-                        if ( s>=0 ) return s;
-                        break;
-                    case 7 : 
-                        int LA4_8 = input.LA(1);
-
-                        s = -1;
-                        if ( ((LA4_8>='\u0000' && LA4_8<='\b')||(LA4_8>='\u000B' && LA4_8<='\f')||(LA4_8>='\u000E' && LA4_8<='\u001F')||(LA4_8>='!' && LA4_8<='\uFFFF')) ) {s = 12;}
-
-                        else s = 14;
-
-                        if ( s>=0 ) return s;
-                        break;
-            }
-            NoViableAltException nvae =
-                new NoViableAltException(getDescription(), 4, _s, input);
-            error(nvae);
-            throw nvae;
-        }
-    }
- 
-
-}
\ No newline at end of file
diff --git a/source/java/org/alfresco/repo/search/impl/parsers/CMIS_FTSParser.java b/source/java/org/alfresco/repo/search/impl/parsers/CMIS_FTSParser.java
deleted file mode 100644
index 4b1a22af76..0000000000
--- a/source/java/org/alfresco/repo/search/impl/parsers/CMIS_FTSParser.java
+++ /dev/null
@@ -1,962 +0,0 @@
-// $ANTLR 3.3 Nov 30, 2010 12:50:56 W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS_FTS.g 2011-04-26 17:09:23
-
-package org.alfresco.repo.search.impl.parsers;
-
-
-import org.antlr.runtime.*;
-import java.util.Stack;
-import java.util.List;
-import java.util.ArrayList;
-
-
-import org.antlr.runtime.tree.*;
-
-public class CMIS_FTSParser extends Parser {
-    public static final String[] tokenNames = new String[] {
-        "<invalid>", "<EOR>", "<DOWN>", "<UP>", "DISJUNCTION", "CONJUNCTION", "TERM", "PHRASE", "DEFAULT", "EXCLUDE", "MINUS", "FTSWORD", "FTSPHRASE", "OR", "F_ESC", "WS", "START_WORD", "IN_WORD"
-    };
-    public static final int EOF=-1;
-    public static final int DISJUNCTION=4;
-    public static final int CONJUNCTION=5;
-    public static final int TERM=6;
-    public static final int PHRASE=7;
-    public static final int DEFAULT=8;
-    public static final int EXCLUDE=9;
-    public static final int MINUS=10;
-    public static final int FTSWORD=11;
-    public static final int FTSPHRASE=12;
-    public static final int OR=13;
-    public static final int F_ESC=14;
-    public static final int WS=15;
-    public static final int START_WORD=16;
-    public static final int IN_WORD=17;
-
-    // delegates
-    // delegators
-
-
-        public CMIS_FTSParser(TokenStream input) {
-            this(input, new RecognizerSharedState());
-        }
-        public CMIS_FTSParser(TokenStream input, RecognizerSharedState state) {
-            super(input, state);
-             
-        }
-        
-    protected TreeAdaptor adaptor = new CommonTreeAdaptor();
-
-    public void setTreeAdaptor(TreeAdaptor adaptor) {
-        this.adaptor = adaptor;
-    }
-    public TreeAdaptor getTreeAdaptor() {
-        return adaptor;
-    }
-
-    public String[] getTokenNames() { return CMIS_FTSParser.tokenNames; }
-    public String getGrammarFileName() { return "W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS_FTS.g"; }
-
-
-        private Stack<String> paraphrases = new Stack<String>();
-        
-        protected Object recoverFromMismatchedToken(IntStream input, int ttype, BitSet follow) throws RecognitionException
-        {
-            throw new MismatchedTokenException(ttype, input);
-        }
-            
-        public Object recoverFromMismatchedSet(IntStream input, RecognitionException e, BitSet follow) throws RecognitionException
-        {
-            throw e;
-        }
-        
-       public String getErrorMessage(RecognitionException e, String[] tokenNames) 
-        {
-            List stack = getRuleInvocationStack(e, this.getClass().getName());
-            String msg = e.getMessage();
-            if ( e instanceof UnwantedTokenException ) 
-                {
-                UnwantedTokenException ute = (UnwantedTokenException)e;
-                String tokenName="<unknown>";
-                if ( ute.expecting== Token.EOF ) 
-                {
-                    tokenName = "EOF";
-                }
-                else 
-                {
-                    tokenName = tokenNames[ute.expecting];
-                }
-                msg = "extraneous input " + getTokenErrorDisplay(ute.getUnexpectedToken())
-                    + " expecting "+tokenName;
-            }
-            else if ( e instanceof MissingTokenException ) 
-            {
-                MissingTokenException mte = (MissingTokenException)e;
-                String tokenName="<unknown>";
-                if ( mte.expecting== Token.EOF ) 
-                {
-                    tokenName = "EOF";
-                }
-                else 
-                {
-                    tokenName = tokenNames[mte.expecting];
-                }
-                msg = "missing " + tokenName+" at " + getTokenErrorDisplay(e.token)
-                    + "  (" + getLongTokenErrorDisplay(e.token) +")";
-            }
-            else if ( e instanceof MismatchedTokenException ) 
-            {
-                MismatchedTokenException mte = (MismatchedTokenException)e;
-                String tokenName="<unknown>";
-                if ( mte.expecting== Token.EOF ) 
-                {
-                    tokenName = "EOF";
-                }
-                else
-                {
-                    tokenName = tokenNames[mte.expecting];
-                }
-                msg = "mismatched input " + getTokenErrorDisplay(e.token)
-                    + " expecting " + tokenName +"  (" + getLongTokenErrorDisplay(e.token) + ")";
-            }
-            else if ( e instanceof MismatchedTreeNodeException ) 
-            {
-                MismatchedTreeNodeException mtne = (MismatchedTreeNodeException)e;
-                String tokenName="<unknown>";
-                if ( mtne.expecting==Token.EOF )  
-                {
-                    tokenName = "EOF";
-                }
-                else 
-                {
-                    tokenName = tokenNames[mtne.expecting];
-                }
-                msg = "mismatched tree node: " + mtne.node + " expecting " + tokenName;
-            }
-            else if ( e instanceof NoViableAltException ) 
-            {
-                NoViableAltException nvae = (NoViableAltException)e;
-                msg = "no viable alternative at input " + getTokenErrorDisplay(e.token)
-                    + "\n\t (decision=" + nvae.decisionNumber
-                    + " state " + nvae.stateNumber + ")" 
-                    + " decision=<<" + nvae.grammarDecisionDescription + ">>";
-            }
-            else if ( e instanceof EarlyExitException ) 
-            {
-                //EarlyExitException eee = (EarlyExitException)e;
-                // for development, can add "(decision="+eee.decisionNumber+")"
-                msg = "required (...)+ loop did not match anything at input " + getTokenErrorDisplay(e.token);
-            }
-                else if ( e instanceof MismatchedSetException ) 
-                {
-                    MismatchedSetException mse = (MismatchedSetException)e;
-                    msg = "mismatched input " + getTokenErrorDisplay(e.token)
-                    + " expecting set " + mse.expecting;
-            }
-            else if ( e instanceof MismatchedNotSetException ) 
-            {
-                MismatchedNotSetException mse = (MismatchedNotSetException)e;
-                msg = "mismatched input " + getTokenErrorDisplay(e.token)
-                    + " expecting set " + mse.expecting;
-            }
-            else if ( e instanceof FailedPredicateException ) 
-            {
-                FailedPredicateException fpe = (FailedPredicateException)e;
-                msg = "rule " + fpe.ruleName + " failed predicate: {" + fpe.predicateText + "}?";
-            }
-                    
-            if(paraphrases.size() > 0)
-            {
-                String paraphrase = (String)paraphrases.peek();
-                msg = msg+" "+paraphrase;
-            }
-            return msg +"\n\t"+stack;
-        }
-            
-        public String getLongTokenErrorDisplay(Token t)
-        {
-            return t.toString();
-        }
-        
-
-        public String getErrorString(RecognitionException e)
-        {
-            String hdr = getErrorHeader(e);
-            String msg = getErrorMessage(e, this.getTokenNames());
-            return hdr+" "+msg;
-        } 
-
-
-    public static class cmisFtsQuery_return extends ParserRuleReturnScope {
-        Object tree;
-        public Object getTree() { return tree; }
-    };
-
-    // $ANTLR start "cmisFtsQuery"
-    // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS_FTS.g:278:1: cmisFtsQuery : ftsCmisDisjunction EOF -> ftsCmisDisjunction ;
-    public final CMIS_FTSParser.cmisFtsQuery_return cmisFtsQuery() throws RecognitionException {
-        CMIS_FTSParser.cmisFtsQuery_return retval = new CMIS_FTSParser.cmisFtsQuery_return();
-        retval.start = input.LT(1);
-
-        Object root_0 = null;
-
-        Token EOF2=null;
-        CMIS_FTSParser.ftsCmisDisjunction_return ftsCmisDisjunction1 = null;
-
-
-        Object EOF2_tree=null;
-        RewriteRuleTokenStream stream_EOF=new RewriteRuleTokenStream(adaptor,"token EOF");
-        RewriteRuleSubtreeStream stream_ftsCmisDisjunction=new RewriteRuleSubtreeStream(adaptor,"rule ftsCmisDisjunction");
-        try {
-            // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS_FTS.g:279:9: ( ftsCmisDisjunction EOF -> ftsCmisDisjunction )
-            // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS_FTS.g:280:9: ftsCmisDisjunction EOF
-            {
-            pushFollow(FOLLOW_ftsCmisDisjunction_in_cmisFtsQuery194);
-            ftsCmisDisjunction1=ftsCmisDisjunction();
-
-            state._fsp--;
-
-            stream_ftsCmisDisjunction.add(ftsCmisDisjunction1.getTree());
-            EOF2=(Token)match(input,EOF,FOLLOW_EOF_in_cmisFtsQuery196);  
-            stream_EOF.add(EOF2);
-
-
-
-            // AST REWRITE
-            // elements: ftsCmisDisjunction
-            // token labels: 
-            // rule labels: retval
-            // token list labels: 
-            // rule list labels: 
-            // wildcard labels: 
-            retval.tree = root_0;
-            RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"rule retval",retval!=null?retval.tree:null);
-
-            root_0 = (Object)adaptor.nil();
-            // 281:17: -> ftsCmisDisjunction
-            {
-                adaptor.addChild(root_0, stream_ftsCmisDisjunction.nextTree());
-
-            }
-
-            retval.tree = root_0;
-            }
-
-            retval.stop = input.LT(-1);
-
-            retval.tree = (Object)adaptor.rulePostProcessing(root_0);
-            adaptor.setTokenBoundaries(retval.tree, retval.start, retval.stop);
-
-        }
-
-        catch(RecognitionException e)
-        {
-           throw e;
-        }
-        finally {
-        }
-        return retval;
-    }
-    // $ANTLR end "cmisFtsQuery"
-
-    public static class ftsCmisDisjunction_return extends ParserRuleReturnScope {
-        Object tree;
-        public Object getTree() { return tree; }
-    };
-
-    // $ANTLR start "ftsCmisDisjunction"
-    // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS_FTS.g:289:1: ftsCmisDisjunction : ftsCmisConjunction ( or ftsCmisConjunction )* -> ^( DISJUNCTION ( ftsCmisConjunction )+ ) ;
-    public final CMIS_FTSParser.ftsCmisDisjunction_return ftsCmisDisjunction() throws RecognitionException {
-        CMIS_FTSParser.ftsCmisDisjunction_return retval = new CMIS_FTSParser.ftsCmisDisjunction_return();
-        retval.start = input.LT(1);
-
-        Object root_0 = null;
-
-        CMIS_FTSParser.ftsCmisConjunction_return ftsCmisConjunction3 = null;
-
-        CMIS_FTSParser.or_return or4 = null;
-
-        CMIS_FTSParser.ftsCmisConjunction_return ftsCmisConjunction5 = null;
-
-
-        RewriteRuleSubtreeStream stream_ftsCmisConjunction=new RewriteRuleSubtreeStream(adaptor,"rule ftsCmisConjunction");
-        RewriteRuleSubtreeStream stream_or=new RewriteRuleSubtreeStream(adaptor,"rule or");
-        try {
-            // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS_FTS.g:290:9: ( ftsCmisConjunction ( or ftsCmisConjunction )* -> ^( DISJUNCTION ( ftsCmisConjunction )+ ) )
-            // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS_FTS.g:291:9: ftsCmisConjunction ( or ftsCmisConjunction )*
-            {
-            pushFollow(FOLLOW_ftsCmisConjunction_in_ftsCmisDisjunction252);
-            ftsCmisConjunction3=ftsCmisConjunction();
-
-            state._fsp--;
-
-            stream_ftsCmisConjunction.add(ftsCmisConjunction3.getTree());
-            // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS_FTS.g:291:28: ( or ftsCmisConjunction )*
-            loop1:
-            do {
-                int alt1=2;
-                int LA1_0 = input.LA(1);
-
-                if ( (LA1_0==OR) ) {
-                    alt1=1;
-                }
-
-
-                switch (alt1) {
-            	case 1 :
-            	    // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS_FTS.g:291:29: or ftsCmisConjunction
-            	    {
-            	    pushFollow(FOLLOW_or_in_ftsCmisDisjunction255);
-            	    or4=or();
-
-            	    state._fsp--;
-
-            	    stream_or.add(or4.getTree());
-            	    pushFollow(FOLLOW_ftsCmisConjunction_in_ftsCmisDisjunction257);
-            	    ftsCmisConjunction5=ftsCmisConjunction();
-
-            	    state._fsp--;
-
-            	    stream_ftsCmisConjunction.add(ftsCmisConjunction5.getTree());
-
-            	    }
-            	    break;
-
-            	default :
-            	    break loop1;
-                }
-            } while (true);
-
-
-
-            // AST REWRITE
-            // elements: ftsCmisConjunction
-            // token labels: 
-            // rule labels: retval
-            // token list labels: 
-            // rule list labels: 
-            // wildcard labels: 
-            retval.tree = root_0;
-            RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"rule retval",retval!=null?retval.tree:null);
-
-            root_0 = (Object)adaptor.nil();
-            // 292:17: -> ^( DISJUNCTION ( ftsCmisConjunction )+ )
-            {
-                // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS_FTS.g:293:25: ^( DISJUNCTION ( ftsCmisConjunction )+ )
-                {
-                Object root_1 = (Object)adaptor.nil();
-                root_1 = (Object)adaptor.becomeRoot((Object)adaptor.create(DISJUNCTION, "DISJUNCTION"), root_1);
-
-                if ( !(stream_ftsCmisConjunction.hasNext()) ) {
-                    throw new RewriteEarlyExitException();
-                }
-                while ( stream_ftsCmisConjunction.hasNext() ) {
-                    adaptor.addChild(root_1, stream_ftsCmisConjunction.nextTree());
-
-                }
-                stream_ftsCmisConjunction.reset();
-
-                adaptor.addChild(root_0, root_1);
-                }
-
-            }
-
-            retval.tree = root_0;
-            }
-
-            retval.stop = input.LT(-1);
-
-            retval.tree = (Object)adaptor.rulePostProcessing(root_0);
-            adaptor.setTokenBoundaries(retval.tree, retval.start, retval.stop);
-
-        }
-
-        catch(RecognitionException e)
-        {
-           throw e;
-        }
-        finally {
-        }
-        return retval;
-    }
-    // $ANTLR end "ftsCmisDisjunction"
-
-    public static class ftsCmisConjunction_return extends ParserRuleReturnScope {
-        Object tree;
-        public Object getTree() { return tree; }
-    };
-
-    // $ANTLR start "ftsCmisConjunction"
-    // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS_FTS.g:296:1: ftsCmisConjunction : ( ftsCmisPrefixed )+ -> ^( CONJUNCTION ( ftsCmisPrefixed )+ ) ;
-    public final CMIS_FTSParser.ftsCmisConjunction_return ftsCmisConjunction() throws RecognitionException {
-        CMIS_FTSParser.ftsCmisConjunction_return retval = new CMIS_FTSParser.ftsCmisConjunction_return();
-        retval.start = input.LT(1);
-
-        Object root_0 = null;
-
-        CMIS_FTSParser.ftsCmisPrefixed_return ftsCmisPrefixed6 = null;
-
-
-        RewriteRuleSubtreeStream stream_ftsCmisPrefixed=new RewriteRuleSubtreeStream(adaptor,"rule ftsCmisPrefixed");
-        try {
-            // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS_FTS.g:297:9: ( ( ftsCmisPrefixed )+ -> ^( CONJUNCTION ( ftsCmisPrefixed )+ ) )
-            // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS_FTS.g:298:9: ( ftsCmisPrefixed )+
-            {
-            // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS_FTS.g:298:9: ( ftsCmisPrefixed )+
-            int cnt2=0;
-            loop2:
-            do {
-                int alt2=2;
-                int LA2_0 = input.LA(1);
-
-                if ( ((LA2_0>=MINUS && LA2_0<=FTSPHRASE)) ) {
-                    alt2=1;
-                }
-
-
-                switch (alt2) {
-            	case 1 :
-            	    // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS_FTS.g:298:9: ftsCmisPrefixed
-            	    {
-            	    pushFollow(FOLLOW_ftsCmisPrefixed_in_ftsCmisConjunction341);
-            	    ftsCmisPrefixed6=ftsCmisPrefixed();
-
-            	    state._fsp--;
-
-            	    stream_ftsCmisPrefixed.add(ftsCmisPrefixed6.getTree());
-
-            	    }
-            	    break;
-
-            	default :
-            	    if ( cnt2 >= 1 ) break loop2;
-                        EarlyExitException eee =
-                            new EarlyExitException(2, input);
-                        throw eee;
-                }
-                cnt2++;
-            } while (true);
-
-
-
-            // AST REWRITE
-            // elements: ftsCmisPrefixed
-            // token labels: 
-            // rule labels: retval
-            // token list labels: 
-            // rule list labels: 
-            // wildcard labels: 
-            retval.tree = root_0;
-            RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"rule retval",retval!=null?retval.tree:null);
-
-            root_0 = (Object)adaptor.nil();
-            // 299:17: -> ^( CONJUNCTION ( ftsCmisPrefixed )+ )
-            {
-                // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS_FTS.g:300:25: ^( CONJUNCTION ( ftsCmisPrefixed )+ )
-                {
-                Object root_1 = (Object)adaptor.nil();
-                root_1 = (Object)adaptor.becomeRoot((Object)adaptor.create(CONJUNCTION, "CONJUNCTION"), root_1);
-
-                if ( !(stream_ftsCmisPrefixed.hasNext()) ) {
-                    throw new RewriteEarlyExitException();
-                }
-                while ( stream_ftsCmisPrefixed.hasNext() ) {
-                    adaptor.addChild(root_1, stream_ftsCmisPrefixed.nextTree());
-
-                }
-                stream_ftsCmisPrefixed.reset();
-
-                adaptor.addChild(root_0, root_1);
-                }
-
-            }
-
-            retval.tree = root_0;
-            }
-
-            retval.stop = input.LT(-1);
-
-            retval.tree = (Object)adaptor.rulePostProcessing(root_0);
-            adaptor.setTokenBoundaries(retval.tree, retval.start, retval.stop);
-
-        }
-
-        catch(RecognitionException e)
-        {
-           throw e;
-        }
-        finally {
-        }
-        return retval;
-    }
-    // $ANTLR end "ftsCmisConjunction"
-
-    public static class ftsCmisPrefixed_return extends ParserRuleReturnScope {
-        Object tree;
-        public Object getTree() { return tree; }
-    };
-
-    // $ANTLR start "ftsCmisPrefixed"
-    // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS_FTS.g:303:1: ftsCmisPrefixed : ( cmisTest -> ^( DEFAULT cmisTest ) | MINUS cmisTest -> ^( EXCLUDE cmisTest ) );
-    public final CMIS_FTSParser.ftsCmisPrefixed_return ftsCmisPrefixed() throws RecognitionException {
-        CMIS_FTSParser.ftsCmisPrefixed_return retval = new CMIS_FTSParser.ftsCmisPrefixed_return();
-        retval.start = input.LT(1);
-
-        Object root_0 = null;
-
-        Token MINUS8=null;
-        CMIS_FTSParser.cmisTest_return cmisTest7 = null;
-
-        CMIS_FTSParser.cmisTest_return cmisTest9 = null;
-
-
-        Object MINUS8_tree=null;
-        RewriteRuleTokenStream stream_MINUS=new RewriteRuleTokenStream(adaptor,"token MINUS");
-        RewriteRuleSubtreeStream stream_cmisTest=new RewriteRuleSubtreeStream(adaptor,"rule cmisTest");
-        try {
-            // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS_FTS.g:304:9: ( cmisTest -> ^( DEFAULT cmisTest ) | MINUS cmisTest -> ^( EXCLUDE cmisTest ) )
-            int alt3=2;
-            int LA3_0 = input.LA(1);
-
-            if ( ((LA3_0>=FTSWORD && LA3_0<=FTSPHRASE)) ) {
-                alt3=1;
-            }
-            else if ( (LA3_0==MINUS) ) {
-                alt3=2;
-            }
-            else {
-                NoViableAltException nvae =
-                    new NoViableAltException("", 3, 0, input);
-
-                throw nvae;
-            }
-            switch (alt3) {
-                case 1 :
-                    // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS_FTS.g:305:9: cmisTest
-                    {
-                    pushFollow(FOLLOW_cmisTest_in_ftsCmisPrefixed424);
-                    cmisTest7=cmisTest();
-
-                    state._fsp--;
-
-                    stream_cmisTest.add(cmisTest7.getTree());
-
-
-                    // AST REWRITE
-                    // elements: cmisTest
-                    // token labels: 
-                    // rule labels: retval
-                    // token list labels: 
-                    // rule list labels: 
-                    // wildcard labels: 
-                    retval.tree = root_0;
-                    RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"rule retval",retval!=null?retval.tree:null);
-
-                    root_0 = (Object)adaptor.nil();
-                    // 306:17: -> ^( DEFAULT cmisTest )
-                    {
-                        // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS_FTS.g:307:25: ^( DEFAULT cmisTest )
-                        {
-                        Object root_1 = (Object)adaptor.nil();
-                        root_1 = (Object)adaptor.becomeRoot((Object)adaptor.create(DEFAULT, "DEFAULT"), root_1);
-
-                        adaptor.addChild(root_1, stream_cmisTest.nextTree());
-
-                        adaptor.addChild(root_0, root_1);
-                        }
-
-                    }
-
-                    retval.tree = root_0;
-                    }
-                    break;
-                case 2 :
-                    // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS_FTS.g:308:11: MINUS cmisTest
-                    {
-                    MINUS8=(Token)match(input,MINUS,FOLLOW_MINUS_in_ftsCmisPrefixed484);  
-                    stream_MINUS.add(MINUS8);
-
-                    pushFollow(FOLLOW_cmisTest_in_ftsCmisPrefixed486);
-                    cmisTest9=cmisTest();
-
-                    state._fsp--;
-
-                    stream_cmisTest.add(cmisTest9.getTree());
-
-
-                    // AST REWRITE
-                    // elements: cmisTest
-                    // token labels: 
-                    // rule labels: retval
-                    // token list labels: 
-                    // rule list labels: 
-                    // wildcard labels: 
-                    retval.tree = root_0;
-                    RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"rule retval",retval!=null?retval.tree:null);
-
-                    root_0 = (Object)adaptor.nil();
-                    // 309:17: -> ^( EXCLUDE cmisTest )
-                    {
-                        // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS_FTS.g:310:25: ^( EXCLUDE cmisTest )
-                        {
-                        Object root_1 = (Object)adaptor.nil();
-                        root_1 = (Object)adaptor.becomeRoot((Object)adaptor.create(EXCLUDE, "EXCLUDE"), root_1);
-
-                        adaptor.addChild(root_1, stream_cmisTest.nextTree());
-
-                        adaptor.addChild(root_0, root_1);
-                        }
-
-                    }
-
-                    retval.tree = root_0;
-                    }
-                    break;
-
-            }
-            retval.stop = input.LT(-1);
-
-            retval.tree = (Object)adaptor.rulePostProcessing(root_0);
-            adaptor.setTokenBoundaries(retval.tree, retval.start, retval.stop);
-
-        }
-
-        catch(RecognitionException e)
-        {
-           throw e;
-        }
-        finally {
-        }
-        return retval;
-    }
-    // $ANTLR end "ftsCmisPrefixed"
-
-    public static class cmisTest_return extends ParserRuleReturnScope {
-        Object tree;
-        public Object getTree() { return tree; }
-    };
-
-    // $ANTLR start "cmisTest"
-    // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS_FTS.g:313:1: cmisTest : ( cmisTerm -> ^( TERM cmisTerm ) | cmisPhrase -> ^( PHRASE cmisPhrase ) );
-    public final CMIS_FTSParser.cmisTest_return cmisTest() throws RecognitionException {
-        CMIS_FTSParser.cmisTest_return retval = new CMIS_FTSParser.cmisTest_return();
-        retval.start = input.LT(1);
-
-        Object root_0 = null;
-
-        CMIS_FTSParser.cmisTerm_return cmisTerm10 = null;
-
-        CMIS_FTSParser.cmisPhrase_return cmisPhrase11 = null;
-
-
-        RewriteRuleSubtreeStream stream_cmisPhrase=new RewriteRuleSubtreeStream(adaptor,"rule cmisPhrase");
-        RewriteRuleSubtreeStream stream_cmisTerm=new RewriteRuleSubtreeStream(adaptor,"rule cmisTerm");
-        try {
-            // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS_FTS.g:314:9: ( cmisTerm -> ^( TERM cmisTerm ) | cmisPhrase -> ^( PHRASE cmisPhrase ) )
-            int alt4=2;
-            int LA4_0 = input.LA(1);
-
-            if ( (LA4_0==FTSWORD) ) {
-                alt4=1;
-            }
-            else if ( (LA4_0==FTSPHRASE) ) {
-                alt4=2;
-            }
-            else {
-                NoViableAltException nvae =
-                    new NoViableAltException("", 4, 0, input);
-
-                throw nvae;
-            }
-            switch (alt4) {
-                case 1 :
-                    // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS_FTS.g:315:9: cmisTerm
-                    {
-                    pushFollow(FOLLOW_cmisTerm_in_cmisTest567);
-                    cmisTerm10=cmisTerm();
-
-                    state._fsp--;
-
-                    stream_cmisTerm.add(cmisTerm10.getTree());
-
-
-                    // AST REWRITE
-                    // elements: cmisTerm
-                    // token labels: 
-                    // rule labels: retval
-                    // token list labels: 
-                    // rule list labels: 
-                    // wildcard labels: 
-                    retval.tree = root_0;
-                    RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"rule retval",retval!=null?retval.tree:null);
-
-                    root_0 = (Object)adaptor.nil();
-                    // 316:17: -> ^( TERM cmisTerm )
-                    {
-                        // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS_FTS.g:317:25: ^( TERM cmisTerm )
-                        {
-                        Object root_1 = (Object)adaptor.nil();
-                        root_1 = (Object)adaptor.becomeRoot((Object)adaptor.create(TERM, "TERM"), root_1);
-
-                        adaptor.addChild(root_1, stream_cmisTerm.nextTree());
-
-                        adaptor.addChild(root_0, root_1);
-                        }
-
-                    }
-
-                    retval.tree = root_0;
-                    }
-                    break;
-                case 2 :
-                    // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS_FTS.g:318:11: cmisPhrase
-                    {
-                    pushFollow(FOLLOW_cmisPhrase_in_cmisTest627);
-                    cmisPhrase11=cmisPhrase();
-
-                    state._fsp--;
-
-                    stream_cmisPhrase.add(cmisPhrase11.getTree());
-
-
-                    // AST REWRITE
-                    // elements: cmisPhrase
-                    // token labels: 
-                    // rule labels: retval
-                    // token list labels: 
-                    // rule list labels: 
-                    // wildcard labels: 
-                    retval.tree = root_0;
-                    RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"rule retval",retval!=null?retval.tree:null);
-
-                    root_0 = (Object)adaptor.nil();
-                    // 319:17: -> ^( PHRASE cmisPhrase )
-                    {
-                        // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS_FTS.g:320:25: ^( PHRASE cmisPhrase )
-                        {
-                        Object root_1 = (Object)adaptor.nil();
-                        root_1 = (Object)adaptor.becomeRoot((Object)adaptor.create(PHRASE, "PHRASE"), root_1);
-
-                        adaptor.addChild(root_1, stream_cmisPhrase.nextTree());
-
-                        adaptor.addChild(root_0, root_1);
-                        }
-
-                    }
-
-                    retval.tree = root_0;
-                    }
-                    break;
-
-            }
-            retval.stop = input.LT(-1);
-
-            retval.tree = (Object)adaptor.rulePostProcessing(root_0);
-            adaptor.setTokenBoundaries(retval.tree, retval.start, retval.stop);
-
-        }
-
-        catch(RecognitionException e)
-        {
-           throw e;
-        }
-        finally {
-        }
-        return retval;
-    }
-    // $ANTLR end "cmisTest"
-
-    public static class cmisTerm_return extends ParserRuleReturnScope {
-        Object tree;
-        public Object getTree() { return tree; }
-    };
-
-    // $ANTLR start "cmisTerm"
-    // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS_FTS.g:324:1: cmisTerm : FTSWORD -> FTSWORD ;
-    public final CMIS_FTSParser.cmisTerm_return cmisTerm() throws RecognitionException {
-        CMIS_FTSParser.cmisTerm_return retval = new CMIS_FTSParser.cmisTerm_return();
-        retval.start = input.LT(1);
-
-        Object root_0 = null;
-
-        Token FTSWORD12=null;
-
-        Object FTSWORD12_tree=null;
-        RewriteRuleTokenStream stream_FTSWORD=new RewriteRuleTokenStream(adaptor,"token FTSWORD");
-
-        try {
-            // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS_FTS.g:325:9: ( FTSWORD -> FTSWORD )
-            // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS_FTS.g:326:9: FTSWORD
-            {
-            FTSWORD12=(Token)match(input,FTSWORD,FOLLOW_FTSWORD_in_cmisTerm717);  
-            stream_FTSWORD.add(FTSWORD12);
-
-
-
-            // AST REWRITE
-            // elements: FTSWORD
-            // token labels: 
-            // rule labels: retval
-            // token list labels: 
-            // rule list labels: 
-            // wildcard labels: 
-            retval.tree = root_0;
-            RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"rule retval",retval!=null?retval.tree:null);
-
-            root_0 = (Object)adaptor.nil();
-            // 327:17: -> FTSWORD
-            {
-                adaptor.addChild(root_0, stream_FTSWORD.nextNode());
-
-            }
-
-            retval.tree = root_0;
-            }
-
-            retval.stop = input.LT(-1);
-
-            retval.tree = (Object)adaptor.rulePostProcessing(root_0);
-            adaptor.setTokenBoundaries(retval.tree, retval.start, retval.stop);
-
-        }
-
-        catch(RecognitionException e)
-        {
-           throw e;
-        }
-        finally {
-        }
-        return retval;
-    }
-    // $ANTLR end "cmisTerm"
-
-    public static class cmisPhrase_return extends ParserRuleReturnScope {
-        Object tree;
-        public Object getTree() { return tree; }
-    };
-
-    // $ANTLR start "cmisPhrase"
-    // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS_FTS.g:330:1: cmisPhrase : FTSPHRASE -> FTSPHRASE ;
-    public final CMIS_FTSParser.cmisPhrase_return cmisPhrase() throws RecognitionException {
-        CMIS_FTSParser.cmisPhrase_return retval = new CMIS_FTSParser.cmisPhrase_return();
-        retval.start = input.LT(1);
-
-        Object root_0 = null;
-
-        Token FTSPHRASE13=null;
-
-        Object FTSPHRASE13_tree=null;
-        RewriteRuleTokenStream stream_FTSPHRASE=new RewriteRuleTokenStream(adaptor,"token FTSPHRASE");
-
-        try {
-            // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS_FTS.g:331:9: ( FTSPHRASE -> FTSPHRASE )
-            // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS_FTS.g:332:9: FTSPHRASE
-            {
-            FTSPHRASE13=(Token)match(input,FTSPHRASE,FOLLOW_FTSPHRASE_in_cmisPhrase770);  
-            stream_FTSPHRASE.add(FTSPHRASE13);
-
-
-
-            // AST REWRITE
-            // elements: FTSPHRASE
-            // token labels: 
-            // rule labels: retval
-            // token list labels: 
-            // rule list labels: 
-            // wildcard labels: 
-            retval.tree = root_0;
-            RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"rule retval",retval!=null?retval.tree:null);
-
-            root_0 = (Object)adaptor.nil();
-            // 333:17: -> FTSPHRASE
-            {
-                adaptor.addChild(root_0, stream_FTSPHRASE.nextNode());
-
-            }
-
-            retval.tree = root_0;
-            }
-
-            retval.stop = input.LT(-1);
-
-            retval.tree = (Object)adaptor.rulePostProcessing(root_0);
-            adaptor.setTokenBoundaries(retval.tree, retval.start, retval.stop);
-
-        }
-
-        catch(RecognitionException e)
-        {
-           throw e;
-        }
-        finally {
-        }
-        return retval;
-    }
-    // $ANTLR end "cmisPhrase"
-
-    public static class or_return extends ParserRuleReturnScope {
-        Object tree;
-        public Object getTree() { return tree; }
-    };
-
-    // $ANTLR start "or"
-    // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS_FTS.g:336:1: or : OR ;
-    public final CMIS_FTSParser.or_return or() throws RecognitionException {
-        CMIS_FTSParser.or_return retval = new CMIS_FTSParser.or_return();
-        retval.start = input.LT(1);
-
-        Object root_0 = null;
-
-        Token OR14=null;
-
-        Object OR14_tree=null;
-
-        try {
-            // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS_FTS.g:337:9: ( OR )
-            // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS_FTS.g:338:9: OR
-            {
-            root_0 = (Object)adaptor.nil();
-
-            OR14=(Token)match(input,OR,FOLLOW_OR_in_or823); 
-            OR14_tree = (Object)adaptor.create(OR14);
-            adaptor.addChild(root_0, OR14_tree);
-
-
-            }
-
-            retval.stop = input.LT(-1);
-
-            retval.tree = (Object)adaptor.rulePostProcessing(root_0);
-            adaptor.setTokenBoundaries(retval.tree, retval.start, retval.stop);
-
-        }
-
-        catch(RecognitionException e)
-        {
-           throw e;
-        }
-        finally {
-        }
-        return retval;
-    }
-    // $ANTLR end "or"
-
-    // Delegated rules
-
-
- 
-
-    public static final BitSet FOLLOW_ftsCmisDisjunction_in_cmisFtsQuery194 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_cmisFtsQuery196 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ftsCmisConjunction_in_ftsCmisDisjunction252 = new BitSet(new long[]{0x0000000000002002L});
-    public static final BitSet FOLLOW_or_in_ftsCmisDisjunction255 = new BitSet(new long[]{0x0000000000001C00L});
-    public static final BitSet FOLLOW_ftsCmisConjunction_in_ftsCmisDisjunction257 = new BitSet(new long[]{0x0000000000002002L});
-    public static final BitSet FOLLOW_ftsCmisPrefixed_in_ftsCmisConjunction341 = new BitSet(new long[]{0x0000000000001C02L});
-    public static final BitSet FOLLOW_cmisTest_in_ftsCmisPrefixed424 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_MINUS_in_ftsCmisPrefixed484 = new BitSet(new long[]{0x0000000000001800L});
-    public static final BitSet FOLLOW_cmisTest_in_ftsCmisPrefixed486 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_cmisTerm_in_cmisTest567 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_cmisPhrase_in_cmisTest627 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_FTSWORD_in_cmisTerm717 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_FTSPHRASE_in_cmisPhrase770 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_OR_in_or823 = new BitSet(new long[]{0x0000000000000002L});
-
-}
\ No newline at end of file
diff --git a/source/java/org/alfresco/repo/search/impl/parsers/CMIS_FTSTest.java b/source/java/org/alfresco/repo/search/impl/parsers/CMIS_FTSTest.java
deleted file mode 100644
index 3e91d38690..0000000000
--- a/source/java/org/alfresco/repo/search/impl/parsers/CMIS_FTSTest.java
+++ /dev/null
@@ -1,98 +0,0 @@
-/*
- * Copyright (C) 2005-2010 Alfresco Software Limited.
- *
- * This file is part of Alfresco
- *
- * Alfresco is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Alfresco is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
- */
-package org.alfresco.repo.search.impl.parsers;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.List;
-
-import junit.framework.TestCase;
-
-import org.alfresco.repo.node.BaseNodeServiceTest;
-import org.antlr.gunit.GrammarInfo;
-import org.antlr.gunit.gUnitLexer;
-import org.antlr.gunit.gUnitParser;
-import org.antlr.runtime.ANTLRInputStream;
-import org.antlr.runtime.CharStream;
-import org.antlr.runtime.CommonToken;
-import org.antlr.runtime.CommonTokenStream;
-import org.antlr.runtime.RecognitionException;
-import org.apache.tools.ant.filters.StringInputStream;
-
-public class CMIS_FTSTest extends TestCase
-{
-    public CMIS_FTSTest()
-    {
-        // TODO Auto-generated constructor stub
-    }
-
-    public CMIS_FTSTest(String name)
-    {
-        super(name);
-        // TODO Auto-generated constructor stub
-    }
-
-    @Override
-    protected void setUp() throws Exception
-    {
-        super.setUp();
-
-    }
-    
-    public void testLexer() throws IOException, RecognitionException
-    {
-        ClassLoader cl = BaseNodeServiceTest.class.getClassLoader();
-        InputStream modelStream = cl.getResourceAsStream("org/alfresco/repo/search/impl/parsers/cmis_fts_test.gunit");
-
-        CharStream input = new ANTLRInputStream(modelStream);
-        
-        
-        gUnitExecutor executer = new gUnitExecutor(parse(input), "FTS");
-        
-        System.out.print(executer.execTest());  // unit test result
-        
-        assertEquals("Failures ", 0, executer.failures.size()); 
-        assertEquals("Invalids ", 0, executer.invalids.size()); 
-    }
-
-    public void testLexerOutput() throws IOException
-    {
-        CharStream input = new ANTLRInputStream(new StringInputStream("~woof^2"));
-        FTSLexer lexer = new FTSLexer(input);
-        CommonTokenStream tokenStream = new CommonTokenStream(lexer);
-        for(CommonToken token : (List<CommonToken>)tokenStream.getTokens())
-        {
-            System.out.println(token.toString());
-        }
-        
-    }
-    
-    private GrammarInfo parse(CharStream input) throws RecognitionException
-    {
-        gUnitLexer lexer = new gUnitLexer(input);
-        CommonTokenStream tokens = new CommonTokenStream(lexer);
-
-        GrammarInfo grammarInfo = new GrammarInfo();
-        gUnitParser parser = new gUnitParser(tokens, grammarInfo);
-        parser.gUnitDef(); // parse gunit script and save elements to grammarInfo
-        return grammarInfo;
-    }
-
-    
-}
diff --git a/source/java/org/alfresco/repo/search/impl/parsers/cmis_fts_test.gunit b/source/java/org/alfresco/repo/search/impl/parsers/cmis_fts_test.gunit
deleted file mode 100644
index 3d05ee6f05..0000000000
--- a/source/java/org/alfresco/repo/search/impl/parsers/cmis_fts_test.gunit
+++ /dev/null
@@ -1,83 +0,0 @@
-/** CMIS FTS */
-
-gunit CMIS_FTS;
-
-@header{package org.alfresco.repo.search.impl.parsers;}
-
-/** Parser */
-
-ftsCmisDisjunction:
-"term1 term2 OR term3 term4" -> "(DISJUNCTION (CONJUNCTION (DEFAULT (TERM term1)) (DEFAULT (TERM term2))) (CONJUNCTION (DEFAULT (TERM term3)) (DEFAULT (TERM term4))))" 
-"'phrase one' 'phrase two' OR 'phrase three'" -> "(DISJUNCTION (CONJUNCTION (DEFAULT (PHRASE 'phrase one')) (DEFAULT (PHRASE 'phrase two'))) (CONJUNCTION (DEFAULT (PHRASE 'phrase three'))))"
-"-term OR -'phrase one' term2 OR -term3 'phrase two' OR 'phrase three'" -> "(DISJUNCTION (CONJUNCTION (EXCLUDE (TERM term))) (CONJUNCTION (EXCLUDE (PHRASE 'phrase one')) (DEFAULT (TERM term2))) (CONJUNCTION (EXCLUDE (TERM term3)) (DEFAULT (PHRASE 'phrase two'))) (CONJUNCTION (DEFAULT (PHRASE 'phrase three'))))" 
-"-term-one" -> "(DISJUNCTION (CONJUNCTION (EXCLUDE (TERM term-one))))"
-"'it\\'s'" -> "(DISJUNCTION (CONJUNCTION (DEFAULT (PHRASE 'it\\'s'))))"
-// Invalid phrases end up as terms
-"'it\'s'" -> "(DISJUNCTION (CONJUNCTION (DEFAULT (TERM 'it's'))))"
-"test" -> "(DISJUNCTION (CONJUNCTION (DEFAULT (TERM test))))"
-"!test" -> "(DISJUNCTION (CONJUNCTION (DEFAULT (TERM !test))))"
-"te!st" -> "(DISJUNCTION (CONJUNCTION (DEFAULT (TERM te!st))))"
-"test!" -> "(DISJUNCTION (CONJUNCTION (DEFAULT (TERM test!))))"
-"?test" -> "(DISJUNCTION (CONJUNCTION (DEFAULT (TERM ?test))))"
-"te?st" -> "(DISJUNCTION (CONJUNCTION (DEFAULT (TERM te?st))))"
-"test?" -> "(DISJUNCTION (CONJUNCTION (DEFAULT (TERM test?))))"
-"*test" -> "(DISJUNCTION (CONJUNCTION (DEFAULT (TERM *test))))"
-"te*st" -> "(DISJUNCTION (CONJUNCTION (DEFAULT (TERM te*st))))"
-"test*" -> "(DISJUNCTION (CONJUNCTION (DEFAULT (TERM test*))))"
-
-
-ftsCmisConjunction:
-"term1 term2" -> "(CONJUNCTION (DEFAULT (TERM term1)) (DEFAULT (TERM term2)))" 
-"'phrase one' 'phrase two'" -> "(CONJUNCTION (DEFAULT (PHRASE 'phrase one')) (DEFAULT (PHRASE 'phrase two')))"
-"-term -'phrase one' term2 -term3 'phrase two'" -> "(CONJUNCTION (EXCLUDE (TERM term)) (EXCLUDE (PHRASE 'phrase one')) (DEFAULT (TERM term2)) (EXCLUDE (TERM term3)) (DEFAULT (PHRASE 'phrase two')))"
-
-ftsCmisPrefixed:
-"term" -> "(DEFAULT (TERM term))" 
-"'phrase one'" -> "(DEFAULT (PHRASE 'phrase one'))"
-"-term" -> "(EXCLUDE (TERM term))" 
-"-'phrase one'" -> "(EXCLUDE (PHRASE 'phrase one'))"
-
-
-cmisTest:
-"term" -> "(TERM term)" 
-"'phrase one'" -> "(PHRASE 'phrase one')"
-
-cmisTerm:
-"term" -> "term"
-
-cmisPhrase:
-"'phrase one'" -> "'phrase one'"
-
-or:
-"OR" -> "OR"
-
-/** Lexer */
-
-FTSPHRASE:
-"''" OK
-"'meep'" OK
-"'it\\'s'" OK
-"'it\\'" FAIL
-"'it\\\\'" OK
-"'OR'" OK
-
-OR:
-"OR" OK
-"or" OK
-"Or" OK
-"oR" OK
-
-MINUS:
-"-" OK
-
-WS:
-" " OK
-"\t" OK
-"\r" OK
-"\n" OK
-
-FTSWORD:
-"word" OK
-"wo-rd" OK
-
-
diff --git a/source/java/org/alfresco/repo/search/impl/parsers/cmis_test.gunit b/source/java/org/alfresco/repo/search/impl/parsers/cmis_test.gunit
deleted file mode 100644
index 0a9089d1ca..0000000000
--- a/source/java/org/alfresco/repo/search/impl/parsers/cmis_test.gunit
+++ /dev/null
@@ -1,556 +0,0 @@
-/** CMIS */
-
-gunit CMIS;
-
-@header{package org.alfresco.repo.search.impl.parsers;}
-
-/** Parser */
-
-query:
-"SELECT * FROM cmis:document" OK
-"SELECT * FROM cmis:document, cmis:folder" FAIL
-"SELECT SCORE() FROM cmis:document" OK
-"SELECT from FROM cmis:document" FAIL
-"SELECT DOCUMENT.Name FROM cmis:document" OK
-"SELECT cmis:name, cmis:typeId FROM cmis:document" OK
-"SELECT document.* FROM cmis:document" OK
-"SELECT cmis:name,, cmis:typeId FROM cmis:document" FAIL
-"SELECT * FROM *" FAIL
-
-"SELECT * from FOLDER JOIN RELATIONSHIP ON FOLDER.ID = RELATIONSHIP.ID" OK
-"SELECT * from FOLDER F JOIN RELATIONSHIP RL ON F.ID = RL.ID" OK
-"SELECT * from DOCUMENT D JOIN DOCUMENT DD ON (D.ID = DD.ID)" FAIL
-"SELECT * from FOLDER F JOIN RELATIONSHIP RL ON F.ID = RL.ID" OK
-"SELECT * from (FOLDER F JOIN RELATIONSHIP RL ON F.ID = RL.ID)" OK
-"SELECT * from ((FOLDER F JOIN RELATIONSHIP RL ON F.ID = RL.ID))" OK   
-"SELECT * from (FOLDER)" FAIL   
-"SELECT * from cmis:folder F INNER JOIN cmis:relationship RL ON F.ID = RL.ID" OK
-"SELECT * from cmis:folder F LEFT JOIN cmis:relationship RL ON F.ID = RL.ID" OK
-"SELECT * from FOLDER F LEFT OUTER JOIN RELATIONSHIP RL ON F.ID = RL.ID" OK
-"SELECT * from FOLDER F LEFT INNER JOIN RELATIONSHIP RL ON F.ID = RL.ID" FAIL
-
-"SELECT * FROM cmis:document WHERE cmis:name='Test'" OK
-"SELECT * FROM FOLDER WHERE COUNTER=7" OK
-"SELECT * FROM FOLDER WHERE 7=COUNTER" FAIL
-"SELECT * FROM FOLDER WHERE COUNTER IS NULL" OK
-"SELECT * FROM FOLDER WHERE COUNTER IS NOT NULL" OK
-"SELECT * FROM FOLDER WHERE COUNTER IS 5" FAIL
-"SELECT * FROM FOLDER WHERE NAME LIKE '%te_t'" OK
-"SELECT * FROM FOLDER WHERE COUNTER LIKE 5" FAIL
-"SELECT * FROM FOLDER WHERE ANY NAME IN ('test', 'mail', 2)" OK
-"SELECT * FROM FOLDER WHERE CONTAINS ('test -mail')" OK
-"SELECT * FROM FOLDER WHERE IN_FOLDER('folderId')" OK
-"SELECT * FROM FOLDER WHERE IN_TREE('folderId')" OK
-"SELECT cmis:objectId FROM test:document where cmis:name='Test' AND counter>=22" OK
-"SELECT cmis:objectId FROM test:document where (cmis:name='Test' AND counter<>22) OR CONTAINS('test')" OK
-"SELECT cmis:objectId FROM test:document where ((cmis:name='Test' AND counter<=22) OR (CONTAINS('test') AND cmis:createdBy NOT LIKE 'J%')) AND (bill IS NULL)" OK
-
-"SELECT * FROM cmis:document WHERE cmis:name='Test' ORDER BY cmis:name" OK
-"SELECT * FROM cmis:document WHERE cmis:name='Test' ORDER BY cmis:name ASC, cmis:type DESC" OK
-"SELECT * FROM cmis:document WHERE cmis:name='Test' ORDER BY first lines" FAIL
-
-"SELECT Y.*, X.PROPERTY_ADDRESS FROM POLICY AS X JOIN CLAIMS AS Y ON X.POLICY_NUM = Y.POLICY_NUM WHERE ( ( Y.DAMAGE_ESTIMATES = 10000 OR cmis:createdBy NOT LIKE 'J%') AND (X.MAIN IS NULL) ) ORDER BY cmis:name ASC, cmis:type DESC" OK 
-"SELECT Name, Make FROM POLICY WHERE (MAKE = 'buick' ) OR ( ANY FEATURES IN ('NAVIGATION SYSTEM', 'SATELLITE RADIO', 'MP3') ) OR IN_FOLDER('folderId')" OK
-"SELECT DOC.NAME, DOC.TYPE, P.Info, SCORE() FROM cmis:document AS DOC LEFT OUTER JOIN POLICY P ON P.DOC_ID = DOC.ID WHERE (DOC.NAME LIKE 'Test%' AND P.INFO <> 'dual' AND DOC.NUM >=44) OR CONTAINS('test') OR DOC.NAME IS NOT NULL ORDER BY cmis:name ASC" OK
-"SELECT Name, SCORE() FROM POLICY JOIN DOCUMENT WHERE (MAKE = 'buick' ) OR (FEATURES IS ('NAVIGATION SYSTEM', 'MP3') )" FAIL
-
-
-selectList:
-"*" OK
-//"column1" OK
-//"column1, column2" OK
-"column1, *" FAIL
-"column1,, column2" FAIL
-"X.column1, Y.column2" OK
-"X.*" OK
-"X.1, X.Y.Z" FAIL
-
-"*" -> "ALL_COLUMNS"
-"X.*" -> "(COLUMNS (ALL_COLUMNS X))"
-//"column1, column2" -> "(COLUMNS (COLUMN (COLUMN_REF column1)) (COLUMN (COLUMN_REF column2)))" 
-"X.column1, Y.column2" -> "(COLUMNS (COLUMN (COLUMN_REF column1 X)) (COLUMN (COLUMN_REF column2 Y)))"
-"SCORE()" -> (COLUMNS (COLUMN (FUNCTION SCORE ( ))))
-
-//selectSubList:
-//"column1" OK
-
-//valueExpression:
-//"column1" OK
-
-columnReference:
-"column1" OK
-
-fromClause:
-"FROM table1" OK
-"FROM table1 T" OK
-"FROM table1 AS T" OK
-"FROM table1 JOIN table2 ON column1 = column2" OK
-"FROM table1 JOIN table2" FAIL
-"FROM table1 T1 JOIN table2 T2 ON T1.column1 = T2.column2" OK
-"FROM table1 T1 LEFT JOIN table2 T2 ON T1.column1 = T2.column2" OK
-"FROM table1 T1 LEFT INNER JOIN table2 T2 ON T1.column1 = T2.column2" FAIL
-"FROM table1 T1 LEFT OUTER JOIN table2 T2 ON T1.column1 = T2.column2" OK
-"FROM table1 T1 INNER JOIN table2 T2 ON T1.column1 = T2.column2" OK
-"FROM table1 T1 LEFT OUTER JOIN table2 T2 ON T1.column1 = T2.column2 INNER JOIN table3 ON T2.column2 = table3.column2" OK
-"FROM table1 T1 JOIN table2 T2 ON T1.column1 = T2.column1 JOIN table3 ON T2.column2 = table3.column2" OK
-"FROM ((table1 T1 JOIN table2 T2 ON T1.column1 = T2.column1) LEFT JOIN table3 T3 ON T2.column1 = T3.column1)" OK
-
-"FROM table1" -> "(SOURCE (TABLE_REF table1))"
-"FROM table1 AS T" -> "(SOURCE (TABLE_REF table1 T))"
-"FROM table1 JOIN table2 ON column1 = column2" -> "(SOURCE (TABLE_REF table1) (JOIN (SOURCE (TABLE_REF table2)) (ON (COLUMN_REF column1) = (COLUMN_REF column2))))"
-"FROM table1 LEFT OUTER JOIN table2 ON column1 = column2" -> "(SOURCE (TABLE_REF table1) (JOIN (SOURCE (TABLE_REF table2)) LEFT (ON (COLUMN_REF column1) = (COLUMN_REF column2))))"
-
-whereClause:
-"WHERE column1 = 'value1'" OK
-"WHERE 3.32 = ANY column1" OK
-"WHERE column1 = value1" FAIL
-"WHERE T.column1 = 'value1'" OK
-"WHERE T.T.column1 = 'value1'" FAIL
-"WHERE column1 = true" OK
-"WHERE column1 = 3.32" OK
-"WHERE column1 > 3.32" OK
-"WHERE column1 >= 3.32" OK
-"WHERE column1 => 3.32" FAIL
-"WHERE column1 < 3.32" OK
-"WHERE column1 <= 3.32" OK
-"WHERE column1 =< 3.32" FAIL
-"WHERE column1 <> 3.32" OK
-"WHERE column1 >< 3.32" FAIL
-"WHERE 2.22 < column1 < 3.32" FAIL
-
-"WHERE CONTAINS('test string')" OK
-"WHERE CONTAINS(22)" FAIL
-"WHERE IN_FOLDER('folderId')" OK
-"WHERE IN_TREE('folderId')" OK
-"WHERE column1 IS NULL" OK
-"WHERE column1 IS NOT NULL" OK
-"WHERE column1 NOT IS NULL" FAIL
-"WHERE column1 LIKE 'T%'" OK
-"WHERE column1 NOT LIKE 'T%'" OK
-"WHERE column1 LIKE 2%" FAIL
-"WHERE column1 IN (1, 2, 3)" OK
-"WHERE ANY column1 IN (1, 2, 3)" OK
-"WHERE column1 NOT IN (1, 2, 3)" OK
-"WHERE column1 IN ('A', 'B')" OK
-"WHERE column1 IN (A, B)" FAIL
-"WHERE column1 IN (True)" OK
-
-"WHERE col1=1 AND col2=2" OK
-"WHERE col1=1 OR col2=2" OK
-"WHERE (col1=1 AND col2=2)" OK
-"WHERE NOT (col1=1 AND col2=2)" OK
-"WHERE ((col1=1 OR col2=2))" OK
-"WHERE ((col1=1 OR col2=2)" FAIL
-"WHERE (col1=1 AND col2=2) OR col2=3" OK
-"WHERE col1=1 AND ((col2=2) OR col2=3)" OK
-"WHERE (col1=1 AND (col2=2 OR col2=3)" FAIL
-"WHERE NOT(col2=2) OR NOT(col2=3)" OK
-"WHERE NOT(col2=2 OR col2=3)" OK
-"WHERE NOT(col2=2 AND NOT(col3=3)) OR NOT(col1=1)" OK
-"WHERE col4=4 AND NOT(col2=2 AND NOT(col3=3)) OR NOT(col1=1)" OK
-"WHERE col4=4 AND (col2=2 NOT(col3=3)) OR NOT(col1=1)" FAIL
-
-"WHERE (NOT(col2 < 2.25) OR NOT CONTAINS('text')) AND col3 LIKE 'T__T'" OK
-"WHERE 2 = ANY col1 OR col2 IN (2.25, 3.25) OR ((col2 IS NOT NULL OR col3 LIKE 'T%') AND IN_TREE('folder_id'))" OK
-"WHERE ((NOT (col2 IS NOT NULL) OR col3 LIKE 'T%') AND CONTAINS ('TEXT')) OR (col1 >='A' AND col2 IN (2.25, 3.25))" OK
-
-"WHERE column1 = 'value1'" -> "(DISJUNCTION (CONJUNCTION (PRED_COMPARISON SINGLE_VALUED_PROPERTY (COLUMN_REF column1) = (STRING_LITERAL 'value1'))))"
-"WHERE 'value1'= ANY column1" -> "(DISJUNCTION (CONJUNCTION (PRED_COMPARISON ANY (STRING_LITERAL 'value1') = (COLUMN_REF column1))))"
-"WHERE column1 > 3.32" -> "(DISJUNCTION (CONJUNCTION (PRED_COMPARISON SINGLE_VALUED_PROPERTY (COLUMN_REF column1) > (NUMERIC_LITERAL 3.32))))"
-"WHERE CONTAINS('test string')" -> "(DISJUNCTION (CONJUNCTION (PRED_FTS 'test string')))"
-"WHERE IN_FOLDER('folderId')" -> "(DISJUNCTION (CONJUNCTION (PRED_CHILD (STRING_LITERAL 'folderId'))))"
-"WHERE IN_TREE('folderId')" -> "(DISJUNCTION (CONJUNCTION (PRED_DESCENDANT (STRING_LITERAL 'folderId'))))"
-"WHERE column1 IS NULL" -> "(DISJUNCTION (CONJUNCTION (PRED_EXISTS (COLUMN_REF column1) NOT)))"
-"WHERE column1 LIKE 'T%'" -> "(DISJUNCTION (CONJUNCTION (PRED_LIKE (COLUMN_REF column1) (STRING_LITERAL 'T%'))))"
-"WHERE column1 IN (1, 2)" -> "(DISJUNCTION (CONJUNCTION (PRED_IN SINGLE_VALUED_PROPERTY (COLUMN_REF column1) (LIST (NUMERIC_LITERAL 1) (NUMERIC_LITERAL 2)))))"
-"WHERE NOT(col1=1)" -> "(DISJUNCTION (CONJUNCTION (NEGATION (DISJUNCTION (CONJUNCTION (PRED_COMPARISON SINGLE_VALUED_PROPERTY (COLUMN_REF col1) = (NUMERIC_LITERAL 1)))))))"
-"WHERE col1=1 AND col2=2" -> "(DISJUNCTION (CONJUNCTION (PRED_COMPARISON SINGLE_VALUED_PROPERTY (COLUMN_REF col1) = (NUMERIC_LITERAL 1)) (PRED_COMPARISON SINGLE_VALUED_PROPERTY (COLUMN_REF col2) = (NUMERIC_LITERAL 2))))"
-"WHERE col1=1 OR col2=2" -> "(DISJUNCTION (CONJUNCTION (PRED_COMPARISON SINGLE_VALUED_PROPERTY (COLUMN_REF col1) = (NUMERIC_LITERAL 1))) (CONJUNCTION (PRED_COMPARISON SINGLE_VALUED_PROPERTY (COLUMN_REF col2) = (NUMERIC_LITERAL 2))))"
-
-orderByClause:
-"ORDER BY column1" OK
-"ORDER BY ASC" FAIL
-"ORDER BY column1 ASC" OK
-"ORDER BY column1 DESC" OK
-"ORDER BY column1 value" FAIL
-"ORDER BY column1, column2" OK
-"ORDER BY column1, column2 ASC" OK
-"ORDER BY column1 ASC, column2 DESC" OK
-
-"ORDER BY column1" -> "(ORDER (SORT_SPECIFICATION (COLUMN_REF column1) ASC))"
-"ORDER BY column1 ASC, column2 DESC" -> "(ORDER (SORT_SPECIFICATION (COLUMN_REF column1) ASC) (SORT_SPECIFICATION (COLUMN_REF column2) DESC))"
-
-datetimeLiteral:
-"TIMESTAMP '2009-12-09T13:22:15.250'" OK
-"TIMESTAMP '2009-12-09T13:22:15.250Z'" OK
-"TIMESTAMP '2009-12-09T13:22:15.250+02:30'" OK
-"TIMESTAMP '2009-12-09T13:22:15.250-02:30'" OK
-/* Should fail as " are not valid quotes in CMIS or SQL */
-"TIMESTAMP \"2009-12-09T13:22:15.250-02:30\"" FAIL
-/* Not checked at parse time */
-"TIMESTAMP '2009-12-9T13:22:15.250+2:30'" OK
-/* The date format is checked during query processing and not parsing */
-"TIMESTAMP 'Thu Dec 10 16:19:53 EET 2009'" OK
-
-textSearchExpression:
-"'word1'" OK
-"'word1 -word2'" OK
-"'word1 -word2 word3'" OK
-"'word1 -word2 OR word3'" OK
-/** OR is not treated as a special keyword */
-"'word1-word2 OR OR word3'" OK
-/** Spec spcifies minimum */
-"'word1-word2 \"word1 OR word3\"'" OK
-"'word1 \"phrase_word1 phrase_word2\"'" OK
-/** "'word1 'phrase_word1 phrase_word2''" FAIL this failsas invalid */
-
-
-/** Lexer */
-
-QUOTED_STRING:
-"'test string'" OK 
-"test string" FAIL
-"'string\\''" OK 
-"''test string'" FAIL
-"'cmis:name:\\'Folder 9\\\\\\'\\''" OK
-    
-SELECT:
-"SELECT"     OK
-"sElECt"     OK
-"SeLECT"     OK
-"seLEct"     OK
-"SELect"     OK
-"SElECt"     OK
-"seLect"     OK
-"sElEcT"     OK
-"select"     OK
-
-AS:
-"AS"         OK
-"aS"         OK
-"As"         OK
-"as"         OK
-
-FROM:
-"FROM"       OK
-"fRom"       OK
-"FROM"       OK
-"FroM"       OK
-"fROM"       OK
-"FRoM"       OK
-"from"       OK
-
-JOIN:
-"JOIN"       OK
-"JOiN"       OK
-"join"       OK
-"JoIN"       OK
-"jOiN"       OK
-"Join"       OK
-"join"       OK
-
-INNER:
-"INNER"      OK
-"innEr"      OK
-"iNNer"      OK
-"INnER"      OK
-"iNnEr"      OK
-"InNer"      OK
-"InneR"      OK
-"inner"      OK
-
-LEFT:
-"LEFT"       OK
-"leFt"       OK
-"lEfT"       OK
-"LEft"       OK
-"lefT"       OK
-"Left"       OK
-"left"       OK
-
-OUTER:
-"OUTER"      OK
-"oUtEr"      OK
-"OUTEr"      OK
-"outER"      OK
-"OUtEr"      OK
-"OutEr"      OK
-"oUTer"      OK
-"outer"      OK
-
-ON:
-"ON"         OK
-"oN"         OK
-"On"         OK
-"on"         OK
-
-WHERE:
-"WHERE"      OK
-"wheRe"      OK
-"WHere"      OK
-"WhERE"      OK
-"WHERe"      OK
-"WHErE"      OK
-"whEre"      OK
-"where"      OK
-
-OR:
-"OR"         OK
-"oR"         OK
-"Or"         OK
-"or"         OK
-
-AND:
-"AND"        OK
-"ANd"        OK
-"AnD"        OK
-"aNd"        OK
-"And"        OK
-"and"        OK
-
-NOT:
-"NOT"        OK
-"NoT"        OK
-"nOT"        OK
-"Not"        OK
-"noT"        OK
-"not"        OK
-
-IN:
-"IN"         OK
-"iN"         OK
-"In"         OK
-"in"         OK
-
-LIKE:
-"LIKE"       OK
-"LIkE"       OK
-"lIke"       OK
-"lIKe"       OK
-"liKE"       OK
-"lIkE"       OK
-"like"       OK
-
-IS:
-"IS"         OK
-"iS"         OK
-"Is"         OK
-"is"         OK
-
-NULL:
-"NULL"       OK
-"nulL"       OK
-"NUll"       OK
-"NuLl"       OK
-"nULL"       OK
-"NULL"       OK
-"null"       OK
-
-ANY:
-"ANY"        OK
-"aNy"        OK
-"AnY"        OK
-"aNY"        OK
-"Any"        OK
-"any"        OK
-
-CONTAINS:
-"CONTAINS"   OK
-"ContAINS"   OK
-"coNtainS"   OK
-"coNTainS"   OK
-"cONTAiNS"   OK
-"ContAIns"   OK
-"ConTains"   OK
-"CONTaiNS"   OK
-"CONtaiNs"   OK
-"COnTAiNS"   OK
-"contains"   OK
-
-IN_FOLDER:
-"IN_FOLDER"  OK
-"In_FoldeR"  OK
-"In_FoldEr"  OK
-"IN_fOlDeR"  OK
-"in_FOLdeR"  OK
-"iN_fOLder"  OK
-"IN_FOlder"  OK
-"iN_FOLdER"  OK
-"in_fOLdEr"  OK
-"iN_FOLDer"  OK
-"in_FOLdER"  OK
-"in_folder"  OK
-
-IN_TREE:
-"IN_TREE"    OK
-"IN_TRee"    OK
-"In_tREE"    OK
-"IN_tRee"    OK
-"in_trEe"    OK
-"In_TReE"    OK
-"IN_TRee"    OK
-"In_tRee"    OK
-"iN_treE"    OK
-"in_tree"    OK
-
-ORDER:
-"ORDER"      OK
-"Order"      OK
-"ORDeR"      OK
-"OrdeR"      OK
-"orDER"      OK
-"oRdEr"      OK
-"ORder"      OK
-"order"      OK
-
-BY:
-"BY"         OK
-"bY"         OK
-"By"         OK
-"by"         OK
-
-ASC:
-"ASC"        OK
-"asC"        OK
-"Asc"        OK
-"ASc"        OK
-"aSC"        OK
-"asc"        OK
-
-DESC:
-"DESC"       OK
-"deSC"       OK
-"DEsC"       OK
-"dESc"       OK
-"DeSC"       OK
-"dESC"       OK
-"desc"       OK
-
-TIMESTAMP:
-"TIMESTAMP"  OK
-"tiMEsTaMP"  OK
-"TImESTaMp"  OK
-"tImesTAMP"  OK
-"TImEstaMp"  OK
-"timesTAMp"  OK
-"TIMEsTaMP"  OK
-"tiMESTAMP"  OK
-"timeSTamp"  OK
-"tIMESTamp"  OK
-"tImEsTAmp"  OK
-"timestamp"  OK
-
-TRUE:
-"TRUE"       OK
-"tRUE"       OK
-"True"       OK
-"TRUE"       OK
-"truE"       OK
-"tRUe"       OK
-"true"       OK
-
-FALSE:
-"FALSE"      OK
-"fALsE"      OK
-"FAlSE"      OK
-"fAlSe"      OK
-"FalSe"      OK
-"fALSE"      OK
-"fALsE"      OK
-"false"      OK
-
-SCORE:
-"SCORE"      OK
-"SCore"      OK
-"score"      OK
-"ScOrE"      OK
-"scOrE"      OK
-"sCore"      OK
-"SCoRe"      OK
-"score"      OK
-
-LPAREN:   
-"("          OK
-
-RPAREN:   
-")"          OK
-
-STAR:
-"*"          OK
-
-COMMA:
-","          OK
-
-DOTSTAR:
-".*"         OK
-
-DOT:
-"."          OK
-
-DOTDOT:
-".."         OK
-
-EQUALS:
-"="          OK
-
-TILDA:
-"~"          OK
-
-NOTEQUALS:
-"<>"         OK
-
-GREATERTHAN:
-">"          OK
-
-LESSTHAN:
-"<"          OK
-
-GREATERTHANOREQUALS:
-">="         OK
-
-LESSTHANOREQUALS:
-"<="         OK
-
-COLON:
-":"          OK
-
-DOUBLE_QUOTE:   
-"\""         OK
-
-ID:
-"test_id"   OK
-""         FAIL
-"a"        OK
-"_"        OK
-"$"        FAIL 
-"_$"       OK
-"#"        FAIL
-"_#"       OK
-"1"        FAIL
-"A1"       OK
-"abcABC_abcABC0123_:$#" OK
-
-DECIMAL_INTEGER_LITERAL:
-"0" OK
-"-1" OK
-"1" OK
-"01" FAIL
-"10" OK
-"-10" OK
-"+150" OK
- 
-FLOATING_POINT_LITERAL:
-"0" FAIL
-"1.." FAIL
-"1." OK
-"-1.0" OK
-"1..0" FAIL
-"1...." FAIL
-"1.0.." FAIL
-"-1.02" OK
-"1e10" OK
-"1.2e-12" OK
-"0.9E-9" OK
-"+123.123456" OK
-
- 
\ No newline at end of file
diff --git a/source/java/org/alfresco/repo/security/permissions/impl/AbstractPermissionReference.java b/source/java/org/alfresco/repo/security/permissions/impl/AbstractPermissionReference.java
index 78e692549b..f89a3cb5ba 100644
--- a/source/java/org/alfresco/repo/security/permissions/impl/AbstractPermissionReference.java
+++ b/source/java/org/alfresco/repo/security/permissions/impl/AbstractPermissionReference.java
@@ -20,12 +20,12 @@ package org.alfresco.repo.security.permissions.impl;
 
 import org.alfresco.repo.security.permissions.PermissionReference;
 
-
 /**
  * This class provides common support for hash code and equality.
  * 
  * @author andyh
  */
+@SuppressWarnings("serial")
 public abstract class AbstractPermissionReference implements PermissionReference
 {
     private int hashcode = 0;
diff --git a/source/java/org/alfresco/repo/security/permissions/impl/SimplePermissionReference.java b/source/java/org/alfresco/repo/security/permissions/impl/SimplePermissionReference.java
index 46aeab41bb..48344d9b79 100644
--- a/source/java/org/alfresco/repo/security/permissions/impl/SimplePermissionReference.java
+++ b/source/java/org/alfresco/repo/security/permissions/impl/SimplePermissionReference.java
@@ -31,9 +31,6 @@ import org.alfresco.service.namespace.QName;
  */
 public final class SimplePermissionReference extends AbstractPermissionReference
 {   
-    /**
-     * 
-     */
     private static final long serialVersionUID = 637302438293417818L;
 
     private static ReadWriteLock lock = new ReentrantReadWriteLock();
@@ -43,8 +40,6 @@ public final class SimplePermissionReference extends AbstractPermissionReference
     /**
      * Factory method to create simple permission refrences
      * 
-     * @param qName
-     * @param name
      * @return a simple permission reference
      */
     public static SimplePermissionReference getPermissionReference(QName qName, String name)
diff --git a/source/java/org/alfresco/repo/node/locator/DocLibNodeLocator.java b/source/java/org/alfresco/repo/site/DocLibNodeLocator.java
similarity index 88%
rename from source/java/org/alfresco/repo/node/locator/DocLibNodeLocator.java
rename to source/java/org/alfresco/repo/site/DocLibNodeLocator.java
index 312774b9be..7b64820553 100644
--- a/source/java/org/alfresco/repo/node/locator/DocLibNodeLocator.java
+++ b/source/java/org/alfresco/repo/site/DocLibNodeLocator.java
@@ -17,13 +17,14 @@
  * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package org.alfresco.repo.node.locator;
+package org.alfresco.repo.site;
 
 import java.io.Serializable;
 import java.util.Map;
 
 import org.alfresco.repo.model.Repository;
-import org.alfresco.service.cmr.repository.NodeLocator;
+import org.alfresco.repo.nodelocator.AbstractNodeLocator;
+import org.alfresco.repo.nodelocator.NodeLocator;
 import org.alfresco.service.cmr.repository.NodeRef;
 import org.alfresco.service.cmr.site.SiteInfo;
 import org.alfresco.service.cmr.site.SiteService;
@@ -31,13 +32,13 @@ import org.alfresco.service.cmr.site.SiteService;
 /**
  * This {@link NodeLocator} identifies the site in which the source node resides and returns the Document Library container for that site.
  * If no site can be found or the site does not have a Document Library then the Company Home is returned.
+ * 
  * @author Nick Smith
  * @since 4.0
- *
  */
 public class DocLibNodeLocator extends AbstractNodeLocator
 {
-    public static final String NAME = "DocumentLibraryNodeLocator";
+    public static final String NAME = "doclib";
 
     private SiteService siteService;
     private Repository repositoryHelper;
@@ -54,17 +55,17 @@ public class DocLibNodeLocator extends AbstractNodeLocator
     public NodeRef getNode(NodeRef source, Map<String, Serializable> params)
     {
         NodeRef docLib = null;
-        if(source != null)
+        if (source != null)
         {
             SiteInfo siteInfo = siteService.getSite(source);
-            if(siteInfo != null)
+            if (siteInfo != null)
             {
                 String siteName = siteInfo.getShortName();
                 String containerId = SiteService.DOCUMENT_LIBRARY;
                 docLib = siteService.getContainer(siteName, containerId);
             }
         }
-        if(docLib == null)
+        if (docLib == null)
         {
             docLib = repositoryHelper.getCompanyHome();
         }
diff --git a/source/java/org/alfresco/repo/solr/Acl.java b/source/java/org/alfresco/repo/solr/Acl.java
new file mode 100644
index 0000000000..da132651ab
--- /dev/null
+++ b/source/java/org/alfresco/repo/solr/Acl.java
@@ -0,0 +1,34 @@
+/*
+ * Copyright (C) 2005-2011 Alfresco Software Limited.
+ *
+ * This file is part of Alfresco
+ *
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ */
+package org.alfresco.repo.solr;
+
+import java.util.List;
+
+/**
+ * Interface for SOLR changeset objects.
+ * 
+ * @author Derek Hulley
+ * @since 4.0
+ */
+public interface Acl
+{
+    Long getId();
+    Long getAclChangeSetId();
+    List<AclEntry> getEntries();
+}
diff --git a/source/java/org/alfresco/repo/domain/solr/AclChangeSet.java b/source/java/org/alfresco/repo/solr/AclChangeSet.java
similarity index 84%
rename from source/java/org/alfresco/repo/domain/solr/AclChangeSet.java
rename to source/java/org/alfresco/repo/solr/AclChangeSet.java
index 5eb8c0297e..848fddb273 100644
--- a/source/java/org/alfresco/repo/domain/solr/AclChangeSet.java
+++ b/source/java/org/alfresco/repo/solr/AclChangeSet.java
@@ -16,7 +16,7 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
  */
-package org.alfresco.repo.domain.solr;
+package org.alfresco.repo.solr;
 
 /**
  * Interface for SOLR changeset objects.
@@ -26,7 +26,7 @@ package org.alfresco.repo.domain.solr;
  */
 public interface AclChangeSet
 {
-    public Long getId();
-    public Long getCommitTimeMs();
-    public int getAclCount();
+    Long getId();
+    Long getCommitTimeMs();
+    int getAclCount();
 }
diff --git a/source/java/org/alfresco/repo/solr/AclChangeSetParameters.java b/source/java/org/alfresco/repo/solr/AclChangeSetParameters.java
new file mode 100644
index 0000000000..c5d78df05a
--- /dev/null
+++ b/source/java/org/alfresco/repo/solr/AclChangeSetParameters.java
@@ -0,0 +1,177 @@
+/*
+ * Copyright (C) 2005-2011 Alfresco Software Limited.
+ *
+ * This file is part of Alfresco
+ *
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ */
+package org.alfresco.repo.solr;
+
+import java.util.List;
+import java.util.Set;
+
+import org.alfresco.service.namespace.QName;
+
+/**
+ * Stores ACL change set query parameters
+ * 
+ * @author Derek Hulley
+ * @since 4.0
+ */
+public class AclChangeSetParameters
+{
+    private List<Long> transactionIds;
+    private Long fromTxnId;
+    private Long toTxnId;
+
+    private Long fromNodeId;
+    private Long toNodeId;
+
+    // default is 'all' results
+    private int maxResults = 0;
+
+    private String storeProtocol;
+    private String storeIdentifier;
+    
+    private Set<QName> includeNodeTypes;
+    private Set<QName> excludeNodeTypes;
+    
+    private Set<QName> includeAspects;
+    private Set<QName> excludeAspects;
+    
+    public int getMaxResults()
+    {
+        return maxResults;
+    }
+
+    public void setMaxResults(int maxResults)
+    {
+        this.maxResults = maxResults;
+    }
+
+    public boolean getStoreFilter()
+    {
+        return (storeProtocol != null || storeIdentifier != null);
+    }
+    
+    public void setStoreProtocol(String storeProtocol)
+    {
+        this.storeProtocol = storeProtocol;
+    }
+
+    public String getStoreProtocol()
+    {
+        return storeProtocol;
+    }
+
+    public void setStoreIdentifier(String storeIdentifier)
+    {
+        this.storeIdentifier = storeIdentifier;
+    }
+
+    public String getStoreIdentifier()
+    {
+        return storeIdentifier;
+    }
+    
+    public void setTransactionIds(List<Long> txnIds)
+    {
+        this.transactionIds = txnIds;
+    }
+
+    public List<Long> getTransactionIds()
+    {
+        return transactionIds;
+    }
+    
+    public Long getFromTxnId()
+    {
+        return fromTxnId;
+    }
+
+    public void setFromTxnId(Long fromTxnId)
+    {
+        this.fromTxnId = fromTxnId;
+    }
+
+    public Long getToTxnId()
+    {
+        return toTxnId;
+    }
+
+    public void setToTxnId(Long toTxnId)
+    {
+        this.toTxnId = toTxnId;
+    }
+
+    public Long getFromNodeId()
+    {
+        return fromNodeId;
+    }
+
+    public void setFromNodeId(Long fromNodeId)
+    {
+        this.fromNodeId = fromNodeId;
+    }
+
+    public Long getToNodeId()
+    {
+        return toNodeId;
+    }
+
+    public void setToNodeId(Long toNodeId)
+    {
+        this.toNodeId = toNodeId;
+    }
+
+    public Set<QName> getIncludeNodeTypes()
+    {
+        return includeNodeTypes;
+    }
+
+    public Set<QName> getExcludeNodeTypes()
+    {
+        return excludeNodeTypes;
+    }
+
+    public Set<QName> getIncludeAspects()
+    {
+        return includeAspects;
+    }
+
+    public Set<QName> getExcludeAspects()
+    {
+        return excludeAspects;
+    }
+
+    public void setIncludeNodeTypes(Set<QName> includeNodeTypes)
+    {
+        this.includeNodeTypes = includeNodeTypes;
+    }
+
+    public void setExcludeNodeTypes(Set<QName> excludeNodeTypes)
+    {
+        this.excludeNodeTypes = excludeNodeTypes;
+    }
+
+    public void setIncludeAspects(Set<QName> includeAspects)
+    {
+        this.includeAspects = includeAspects;
+    }
+
+    public void setExcludeAspects(Set<QName> excludeAspects)
+    {
+        this.excludeAspects = excludeAspects;
+    }
+}
diff --git a/source/java/org/alfresco/repo/solr/AclEntry.java b/source/java/org/alfresco/repo/solr/AclEntry.java
new file mode 100644
index 0000000000..817810b5e6
--- /dev/null
+++ b/source/java/org/alfresco/repo/solr/AclEntry.java
@@ -0,0 +1,33 @@
+/*
+ * Copyright (C) 2005-2011 Alfresco Software Limited.
+ *
+ * This file is part of Alfresco
+ *
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ */
+package org.alfresco.repo.solr;
+
+/**
+ * Interface for ACL ChangeSet entry details i.e. carries information about <b>alf_access_control_entry</b>.
+ * 
+ * @author Derek Hulley
+ * @since 4.0
+ */
+public interface AclEntry
+{
+    Long getId();
+    Long getAclId();
+    Long getAclPermissionId();
+    String getAclAuthority();
+}
diff --git a/source/java/org/alfresco/repo/solr/SOLRTrackingComponent.java b/source/java/org/alfresco/repo/solr/SOLRTrackingComponent.java
index 6d729f462b..f96e4ecc11 100644
--- a/source/java/org/alfresco/repo/solr/SOLRTrackingComponent.java
+++ b/source/java/org/alfresco/repo/solr/SOLRTrackingComponent.java
@@ -21,8 +21,6 @@ package org.alfresco.repo.solr;
 import java.util.List;
 
 import org.alfresco.repo.domain.node.Node;
-import org.alfresco.repo.domain.solr.AclChangeSet;
-import org.alfresco.repo.domain.solr.Transaction;
 
 /**
  * Interface for component to provide tracking data for SOLR.
diff --git a/source/java/org/alfresco/repo/solr/SOLRTrackingComponentImpl.java b/source/java/org/alfresco/repo/solr/SOLRTrackingComponentImpl.java
index 3c57bee975..4e63656606 100644
--- a/source/java/org/alfresco/repo/solr/SOLRTrackingComponentImpl.java
+++ b/source/java/org/alfresco/repo/solr/SOLRTrackingComponentImpl.java
@@ -32,9 +32,7 @@ import org.alfresco.repo.domain.node.Node;
 import org.alfresco.repo.domain.node.NodeDAO;
 import org.alfresco.repo.domain.node.NodeDAO.ChildAssocRefQueryCallback;
 import org.alfresco.repo.domain.qname.QNameDAO;
-import org.alfresco.repo.domain.solr.AclChangeSet;
 import org.alfresco.repo.domain.solr.SOLRDAO;
-import org.alfresco.repo.domain.solr.Transaction;
 import org.alfresco.repo.tenant.TenantService;
 import org.alfresco.service.cmr.dictionary.AspectDefinition;
 import org.alfresco.service.cmr.dictionary.DataTypeDefinition;
diff --git a/source/java/org/alfresco/repo/solr/SOLRTrackingComponentTest.java b/source/java/org/alfresco/repo/solr/SOLRTrackingComponentTest.java
index e543faf670..cd91bdabff 100644
--- a/source/java/org/alfresco/repo/solr/SOLRTrackingComponentTest.java
+++ b/source/java/org/alfresco/repo/solr/SOLRTrackingComponentTest.java
@@ -30,12 +30,7 @@ import junit.framework.TestCase;
 import org.alfresco.model.ContentModel;
 import org.alfresco.repo.domain.node.Node;
 import org.alfresco.repo.domain.node.NodeDAO;
-import org.alfresco.repo.domain.solr.Transaction;
 import org.alfresco.repo.security.authentication.AuthenticationComponent;
-import org.alfresco.repo.solr.MetaDataResultsFilter;
-import org.alfresco.repo.solr.NodeMetaData;
-import org.alfresco.repo.solr.NodeMetaDataParameters;
-import org.alfresco.repo.solr.NodeParameters;
 import org.alfresco.repo.solr.SOLRTrackingComponent.NodeMetaDataQueryCallback;
 import org.alfresco.repo.solr.SOLRTrackingComponent.NodeQueryCallback;
 import org.alfresco.repo.transaction.RetryingTransactionHelper;
@@ -99,6 +94,12 @@ public class SOLRTrackingComponentTest extends TestCase
         rootNodeRef = nodeService.getRootNode(storeRef);
     }
     
+    public void testGetAclChangeSets_Simple()
+    {
+        List<AclChangeSet> cs = solrTrackingComponent.getAclChangeSets(null, null, 50);
+        assertTrue("Expected results to be limited in number", cs.size() <= 50);
+    }
+    
     public void testGetNodeMetaData()
     {
         long startTime = System.currentTimeMillis();
@@ -555,64 +556,6 @@ public class SOLRTrackingComponentTest extends TestCase
             return true;
         }
 
-/*        private boolean compareProperties(Map<QName, Serializable> properties1, Map<QName, Serializable> properties2)
-        {
-            boolean match = true;
-            
-            if(properties1.size() != properties2.size())
-            {
-                match = false;
-            }
-            else
-            {
-                for(QName qname : properties1.keySet())
-                {
-                    Serializable value1 = properties1.get(qname);
-                    Serializable value2 = properties2.get(qname);
-                    if(value1 instanceof MLText)
-                    {
-                        if(!(value2 instanceof MLText))
-                        {
-                            match = false;
-                            break;
-                        }
-                        MLText ml1 = (MLText)value1;
-                        MLText ml2 = (MLText)value2;
-                        if(ml1.getDefaultValue().equals(ml2.getDefaultValue()))
-                        {
-                            match = false;
-                            break;
-                        }
-                    }
-                    else if(value1 instanceof ContentDataWithId)
-                    {
-                        if(!(value2 instanceof ContentDataWithId))
-                        {
-                            match = false;
-                            break;
-                        }
-                        ContentDataWithId cd1 = (ContentDataWithId)value1;
-                        ContentDataWithId cd2 = (ContentDataWithId)value2;
-                        if(cd1.getDefaultValue().equals(ml2.getDefaultValue()))
-                        {
-                            match = false;
-                            break;
-                        }
-                    }
-                    else
-                    {
-                        if(!value1.equals(value2))
-                        {
-                            match = false;
-                            break;
-                        }
-                    }
-                }
-            }
-
-            return match;
-        }*/
-
         @Override
         public boolean handleNodeMetaData(NodeMetaData nodeMetaData) {
             actualNodeMetaDataCount++;
diff --git a/source/java/org/alfresco/repo/domain/solr/Transaction.java b/source/java/org/alfresco/repo/solr/Transaction.java
similarity index 93%
rename from source/java/org/alfresco/repo/domain/solr/Transaction.java
rename to source/java/org/alfresco/repo/solr/Transaction.java
index 447c4d92ab..5dc652f8f5 100644
--- a/source/java/org/alfresco/repo/domain/solr/Transaction.java
+++ b/source/java/org/alfresco/repo/solr/Transaction.java
@@ -16,7 +16,7 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
  */
-package org.alfresco.repo.domain.solr;
+package org.alfresco.repo.solr;
 
 /**
  * Interface for SOLR transaction objects.
diff --git a/source/java/org/alfresco/service/cmr/publishing/BaseNodePublishStatus.java b/source/java/org/alfresco/service/cmr/publishing/BaseNodePublishStatus.java
new file mode 100644
index 0000000000..cf9fceaf04
--- /dev/null
+++ b/source/java/org/alfresco/service/cmr/publishing/BaseNodePublishStatus.java
@@ -0,0 +1,51 @@
+/*
+ * Copyright (C) 2005-2010 Alfresco Software Limited.
+ *
+ * This file is part of Alfresco
+ *
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package org.alfresco.service.cmr.publishing;
+
+import org.alfresco.service.cmr.repository.NodeRef;
+
+/**
+ * @author Brian
+ *
+ */
+public abstract class BaseNodePublishStatus implements NodePublishStatus
+{
+    private NodeRef nodeRef;
+    
+    /* (non-Javadoc)
+     * @see org.alfresco.service.cmr.publishing.NodePublishStatus#getNodeRef()
+     */
+    @Override
+    public NodeRef getNodeRef()
+    {
+        return nodeRef;
+    }
+
+    /* (non-Javadoc)
+     * @see org.alfresco.service.cmr.publishing.NodePublishStatus#getEnvironment()
+     */
+    @Override
+    public Environment getEnvironment()
+    {
+        // TODO Auto-generated method stub
+        return null;
+    }
+
+}
diff --git a/source/java/org/alfresco/service/cmr/publishing/Environment.java b/source/java/org/alfresco/service/cmr/publishing/Environment.java
new file mode 100644
index 0000000000..d19ffd43ea
--- /dev/null
+++ b/source/java/org/alfresco/service/cmr/publishing/Environment.java
@@ -0,0 +1,36 @@
+/*
+ * Copyright (C) 2005-2010 Alfresco Software Limited.
+ *
+ * This file is part of Alfresco
+ *
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ */
+package org.alfresco.service.cmr.publishing;
+
+import java.util.Collection;
+import java.util.List;
+import java.util.Map;
+
+import org.alfresco.service.cmr.repository.NodeRef;
+
+public interface Environment
+{
+    String getId();
+    
+    PublishingQueue getPublishingQueue();
+    
+    Map<NodeRef,NodePublishStatus> checkPublishStatus(Collection<NodeRef> nodes);
+    
+    List<PublishingEvent> getPublishingEvents(PublishingEventFilter filter);
+}
diff --git a/source/java/org/alfresco/service/cmr/publishing/MutablePublishingEvent.java b/source/java/org/alfresco/service/cmr/publishing/MutablePublishingEvent.java
new file mode 100644
index 0000000000..00a1ceb072
--- /dev/null
+++ b/source/java/org/alfresco/service/cmr/publishing/MutablePublishingEvent.java
@@ -0,0 +1,32 @@
+/*
+ * Copyright (C) 2005-2010 Alfresco Software Limited.
+ *
+ * This file is part of Alfresco
+ *
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package org.alfresco.service.cmr.publishing;
+
+import java.util.Calendar;
+
+/**
+ * @author Brian
+ *
+ */
+public interface MutablePublishingEvent extends PublishingEvent
+{
+    void setScheduledTime(Calendar time);
+    void setComment(String comment);
+}
diff --git a/source/java/org/alfresco/service/cmr/publishing/MutablePublishingPackage.java b/source/java/org/alfresco/service/cmr/publishing/MutablePublishingPackage.java
new file mode 100644
index 0000000000..bc1a6d731c
--- /dev/null
+++ b/source/java/org/alfresco/service/cmr/publishing/MutablePublishingPackage.java
@@ -0,0 +1,34 @@
+/*
+ * Copyright (C) 2005-2010 Alfresco Software Limited.
+ *
+ * This file is part of Alfresco
+ *
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ */
+package org.alfresco.service.cmr.publishing;
+
+import java.util.Collection;
+
+import org.alfresco.service.cmr.repository.NodeRef;
+
+public interface MutablePublishingPackage extends PublishingPackage
+{
+    void addNodesToUnpublish(NodeRef... nodesToRemove);
+
+    void addNodesToUnpublish(Collection<NodeRef> nodesToRemove);
+
+    void addNodesToPublish(NodeRef... nodesToPublish);
+    
+    void addNodesToPublish(Collection<NodeRef> nodesToPublish);
+}
diff --git a/source/java/org/alfresco/service/cmr/publishing/NodePublishStatus.java b/source/java/org/alfresco/service/cmr/publishing/NodePublishStatus.java
new file mode 100644
index 0000000000..4a9b33295d
--- /dev/null
+++ b/source/java/org/alfresco/service/cmr/publishing/NodePublishStatus.java
@@ -0,0 +1,43 @@
+/*
+ * Copyright (C) 2005-2010 Alfresco Software Limited.
+ *
+ * This file is part of Alfresco
+ *
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package org.alfresco.service.cmr.publishing;
+
+import org.alfresco.service.cmr.repository.NodeRef;
+
+/**
+ * @author Brian
+ *
+ */
+public interface NodePublishStatus
+{
+    enum Status {NOT_PUBLISHED, ON_QUEUE, PUBLISHED, PUBLISHED_AND_ON_QUEUE};
+    
+    <T> T visit(NodePublishStatusVisitor<T> visitor);
+    
+    NodeRef getNodeRef();
+    
+    Status getStatus();
+    
+    /**
+     * Obtain the environment related to this status
+     * @return
+     */
+    Environment getEnvironment();
+}
diff --git a/source/java/org/alfresco/service/cmr/publishing/NodePublishStatusNotPublished.java b/source/java/org/alfresco/service/cmr/publishing/NodePublishStatusNotPublished.java
new file mode 100644
index 0000000000..b53450f50d
--- /dev/null
+++ b/source/java/org/alfresco/service/cmr/publishing/NodePublishStatusNotPublished.java
@@ -0,0 +1,47 @@
+/*
+ * Copyright (C) 2005-2010 Alfresco Software Limited.
+ *
+ * This file is part of Alfresco
+ *
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package org.alfresco.service.cmr.publishing;
+
+/**
+ * @author Brian
+ *
+ */
+public class NodePublishStatusNotPublished extends BaseNodePublishStatus
+{
+
+    /* (non-Javadoc)
+     * @see org.alfresco.service.cmr.publishing.NodePublishStatus#visit(org.alfresco.service.cmr.publishing.NodePublishStatusVisitor)
+     */
+    @Override
+    public <T> T visit(NodePublishStatusVisitor<T> visitor)
+    {
+        return visitor.accept(this);
+    }
+
+    /* (non-Javadoc)
+     * @see org.alfresco.service.cmr.publishing.NodePublishStatus#getStatus()
+     */
+    @Override
+    public Status getStatus()
+    {
+        return Status.NOT_PUBLISHED;
+    }
+    
+}
diff --git a/source/java/org/alfresco/service/cmr/publishing/NodePublishStatusOnQueue.java b/source/java/org/alfresco/service/cmr/publishing/NodePublishStatusOnQueue.java
new file mode 100644
index 0000000000..32907928e0
--- /dev/null
+++ b/source/java/org/alfresco/service/cmr/publishing/NodePublishStatusOnQueue.java
@@ -0,0 +1,51 @@
+/*
+ * Copyright (C) 2005-2010 Alfresco Software Limited.
+ *
+ * This file is part of Alfresco
+ *
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package org.alfresco.service.cmr.publishing;
+
+/**
+ * @author Brian
+ *
+ */
+public class NodePublishStatusOnQueue extends BaseNodePublishStatus
+{
+
+    /* (non-Javadoc)
+     * @see org.alfresco.service.cmr.publishing.NodePublishStatus#visit(org.alfresco.service.cmr.publishing.NodePublishStatusVisitor)
+     */
+    @Override
+    public <T> T visit(NodePublishStatusVisitor<T> visitor)
+    {
+        return visitor.accept(this);
+    }
+
+    public PublishingEvent getQueuedPublishingEvent()
+    {
+        return null;
+    }
+
+    /* (non-Javadoc)
+     * @see org.alfresco.service.cmr.publishing.NodePublishStatus#getStatus()
+     */
+    @Override
+    public Status getStatus()
+    {
+        return Status.ON_QUEUE;
+    }
+}
diff --git a/source/java/org/alfresco/service/cmr/publishing/NodePublishStatusPublished.java b/source/java/org/alfresco/service/cmr/publishing/NodePublishStatusPublished.java
new file mode 100644
index 0000000000..5085b1e85e
--- /dev/null
+++ b/source/java/org/alfresco/service/cmr/publishing/NodePublishStatusPublished.java
@@ -0,0 +1,56 @@
+/*
+ * Copyright (C) 2005-2010 Alfresco Software Limited.
+ *
+ * This file is part of Alfresco
+ *
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package org.alfresco.service.cmr.publishing;
+
+/**
+ * @author Brian
+ *
+ */
+public class NodePublishStatusPublished extends BaseNodePublishStatus
+{
+
+    /* (non-Javadoc)
+     * @see org.alfresco.service.cmr.publishing.NodePublishStatus#visit(org.alfresco.service.cmr.publishing.NodePublishStatusVisitor)
+     */
+    @Override
+    public <T> T visit(NodePublishStatusVisitor<T> visitor)
+    {
+        return visitor.accept(this);
+    }
+    
+    /**
+     * Retrieve the most recent publishing event that affected (created or updated) the node relevant to this status.
+     * @return
+     */
+    public PublishingEvent getLatestPublishingEvent()
+    {
+        return null;
+    }
+
+    /* (non-Javadoc)
+     * @see org.alfresco.service.cmr.publishing.NodePublishStatus#getStatus()
+     */
+    @Override
+    public Status getStatus()
+    {
+        return Status.PUBLISHED;
+    }
+
+}
diff --git a/source/java/org/alfresco/service/cmr/publishing/NodePublishStatusPublishedAndOnQueue.java b/source/java/org/alfresco/service/cmr/publishing/NodePublishStatusPublishedAndOnQueue.java
new file mode 100644
index 0000000000..b301c2abdf
--- /dev/null
+++ b/source/java/org/alfresco/service/cmr/publishing/NodePublishStatusPublishedAndOnQueue.java
@@ -0,0 +1,60 @@
+/*
+ * Copyright (C) 2005-2010 Alfresco Software Limited.
+ *
+ * This file is part of Alfresco
+ *
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package org.alfresco.service.cmr.publishing;
+
+/**
+ * @author Brian
+ *
+ */
+public class NodePublishStatusPublishedAndOnQueue extends BaseNodePublishStatus
+{
+
+    /* (non-Javadoc)
+     * @see org.alfresco.service.cmr.publishing.NodePublishStatus#visit(org.alfresco.service.cmr.publishing.NodePublishStatusVisitor)
+     */
+    @Override
+    public <T> T visit(NodePublishStatusVisitor<T> visitor)
+    {
+        return visitor.accept(this);
+    }
+
+    public PublishingEvent getQueuedPublishingEvent()
+    {
+        return null;
+    }
+
+    /**
+     * Retrieve the most recent publishing event that affected (created or updated) the node relevant to this status.
+     * @return
+     */
+    public PublishingEvent getLatestPublishingEvent()
+    {
+        return null;
+    }
+
+    /* (non-Javadoc)
+     * @see org.alfresco.service.cmr.publishing.NodePublishStatus#getStatus()
+     */
+    @Override
+    public Status getStatus()
+    {
+        return Status.PUBLISHED_AND_ON_QUEUE;
+    }
+}
diff --git a/source/java/org/alfresco/service/cmr/publishing/NodePublishStatusVisitor.java b/source/java/org/alfresco/service/cmr/publishing/NodePublishStatusVisitor.java
new file mode 100644
index 0000000000..1d2218e7d6
--- /dev/null
+++ b/source/java/org/alfresco/service/cmr/publishing/NodePublishStatusVisitor.java
@@ -0,0 +1,32 @@
+/*
+ * Copyright (C) 2005-2010 Alfresco Software Limited.
+ *
+ * This file is part of Alfresco
+ *
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package org.alfresco.service.cmr.publishing;
+
+/**
+ * @author Brian
+ *
+ */
+public interface NodePublishStatusVisitor<T>
+{
+    T accept(NodePublishStatusNotPublished status);
+    T accept(NodePublishStatusOnQueue status);
+    T accept(NodePublishStatusPublished status);
+    T accept(NodePublishStatusPublishedAndOnQueue status);
+}
diff --git a/source/java/org/alfresco/service/cmr/publishing/PublishingEvent.java b/source/java/org/alfresco/service/cmr/publishing/PublishingEvent.java
new file mode 100644
index 0000000000..be0df99cd9
--- /dev/null
+++ b/source/java/org/alfresco/service/cmr/publishing/PublishingEvent.java
@@ -0,0 +1,69 @@
+/*
+ * Copyright (C) 2005-2010 Alfresco Software Limited.
+ *
+ * This file is part of Alfresco
+ *
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package org.alfresco.service.cmr.publishing;
+
+import java.util.Calendar;
+import java.util.Date;
+import java.util.Set;
+
+import org.alfresco.service.cmr.repository.NodeRef;
+
+/**
+ * @author Brian
+ *
+ */
+public interface PublishingEvent
+{
+    enum Status {SCHEDULED, IN_PROGRESS, COMPLETE, FAILED}
+    
+    String getId();
+    
+    Status getStatus();
+    
+    Calendar getScheduledTime();
+    
+    PublishingPackage getPackage();
+    
+    Date getCreatedTime();
+    
+    String getCreator();
+    
+    Date getModifiedTime();
+    
+    String getModifier();
+    
+    String getComment();
+    
+    /**
+     * Retrieve those publishing events that depend on this one
+     * @return
+     */
+    Set<PublishingEvent> getDependingEvents();
+    
+    /**
+     * Retrieve those publishing events on which this one depends
+     * @return
+     */
+    Set<PublishingEvent> getEventsDependedOn();
+
+    Set<NodeRef> getNodesDependedOn();
+    
+    MutablePublishingEvent edit();
+}
diff --git a/source/java/org/alfresco/service/cmr/publishing/PublishingEventFilter.java b/source/java/org/alfresco/service/cmr/publishing/PublishingEventFilter.java
new file mode 100644
index 0000000000..7060819f4b
--- /dev/null
+++ b/source/java/org/alfresco/service/cmr/publishing/PublishingEventFilter.java
@@ -0,0 +1,29 @@
+/*
+ * Copyright (C) 2005-2010 Alfresco Software Limited.
+ *
+ * This file is part of Alfresco
+ *
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package org.alfresco.service.cmr.publishing;
+
+/**
+ * @author Brian
+ *
+ */
+public interface PublishingEventFilter
+{
+
+}
diff --git a/source/java/org/alfresco/service/cmr/publishing/PublishingPackage.java b/source/java/org/alfresco/service/cmr/publishing/PublishingPackage.java
new file mode 100644
index 0000000000..6574291f7f
--- /dev/null
+++ b/source/java/org/alfresco/service/cmr/publishing/PublishingPackage.java
@@ -0,0 +1,26 @@
+/*
+ * Copyright (C) 2005-2010 Alfresco Software Limited.
+ *
+ * This file is part of Alfresco
+ *
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ */
+package org.alfresco.service.cmr.publishing;
+
+import java.util.Set;
+
+public interface PublishingPackage
+{
+    Set<PublishingPackageEntry> getEntries();
+}
diff --git a/source/java/org/alfresco/service/cmr/publishing/PublishingPackageEntry.java b/source/java/org/alfresco/service/cmr/publishing/PublishingPackageEntry.java
new file mode 100644
index 0000000000..734a55f3b0
--- /dev/null
+++ b/source/java/org/alfresco/service/cmr/publishing/PublishingPackageEntry.java
@@ -0,0 +1,33 @@
+/*
+ * Copyright (C) 2005-2010 Alfresco Software Limited.
+ *
+ * This file is part of Alfresco
+ *
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package org.alfresco.service.cmr.publishing;
+
+import org.alfresco.service.cmr.repository.NodeRef;
+import org.alfresco.service.cmr.version.Version;
+
+/**
+ * @author Brian
+ *
+ */
+public interface PublishingPackageEntry
+{
+    NodeRef getNodeRef();
+    Version getVersion();
+}
diff --git a/source/java/org/alfresco/service/cmr/publishing/PublishingQueue.java b/source/java/org/alfresco/service/cmr/publishing/PublishingQueue.java
new file mode 100644
index 0000000000..1d2adaee44
--- /dev/null
+++ b/source/java/org/alfresco/service/cmr/publishing/PublishingQueue.java
@@ -0,0 +1,38 @@
+/*
+ * Copyright (C) 2005-2010 Alfresco Software Limited.
+ *
+ * This file is part of Alfresco
+ *
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package org.alfresco.service.cmr.publishing;
+
+import java.util.Calendar;
+
+public interface PublishingQueue
+{
+    MutablePublishingPackage createPublishingPackage();
+    
+    /**
+     * Adds the supplied publishing package onto the queue.
+     * @param publishingPackage The publishing package that is to be enqueued
+     * @param schedule The time at which the new publishing event should be scheduled (optional - <code>null</code> indicates "as soon as possible")
+     * @param comment A comment to be stored with this new event (optional - may be <code>null</code>)
+     * @return A PublishingEvent object representing the newly scheduled event
+     */
+    PublishingEvent scheduleNewEvent(PublishingPackage publishingPackage, Calendar schedule, String comment);
+    
+    void cancelEvent(String eventId);
+}
diff --git a/source/java/org/alfresco/service/cmr/publishing/PublishingService.java b/source/java/org/alfresco/service/cmr/publishing/PublishingService.java
new file mode 100644
index 0000000000..011c81fc38
--- /dev/null
+++ b/source/java/org/alfresco/service/cmr/publishing/PublishingService.java
@@ -0,0 +1,36 @@
+/*
+ * Copyright (C) 2005-2010 Alfresco Software Limited.
+ *
+ * This file is part of Alfresco
+ *
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ */
+package org.alfresco.service.cmr.publishing;
+
+import java.util.Set;
+
+import org.alfresco.service.cmr.repository.NodeRef;
+
+public interface PublishingService
+{
+    Set<Environment> getEnvironments(String siteId);
+    
+    Environment getEnvironment(String siteId, String environmentName);
+    
+    Environment getEditorialEnvironment(String siteId);
+    
+    Set<NodeRef> getPublishingDependencies(NodeRef node);
+    
+    PublishingEvent getPublishingEvent(String id);
+}
diff --git a/source/java/org/alfresco/service/cmr/publishing/channels/Channel.java b/source/java/org/alfresco/service/cmr/publishing/channels/Channel.java
new file mode 100644
index 0000000000..39549a1c83
--- /dev/null
+++ b/source/java/org/alfresco/service/cmr/publishing/channels/Channel.java
@@ -0,0 +1,43 @@
+/*
+ * Copyright (C) 2005-2010 Alfresco Software Limited.
+ *
+ * This file is part of Alfresco
+ *
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package org.alfresco.service.cmr.publishing.channels;
+
+import org.alfresco.service.cmr.repository.NodeRef;
+
+/**
+ * @author Brian
+ *
+ */
+public interface Channel
+{
+    ChannelType getChannelType();
+    
+    /**
+     * Retrieve the node ref of the node that represents this channel in the editorial environment
+     * @return
+     */
+    NodeRef getNodeRef();
+    
+    /**
+     * Retrieve the name of this channel
+     * @return
+     */
+    String getName();
+}
diff --git a/source/java/org/alfresco/service/cmr/publishing/channels/ChannelService.java b/source/java/org/alfresco/service/cmr/publishing/channels/ChannelService.java
new file mode 100644
index 0000000000..bd16feec58
--- /dev/null
+++ b/source/java/org/alfresco/service/cmr/publishing/channels/ChannelService.java
@@ -0,0 +1,39 @@
+/*
+ * Copyright (C) 2005-2010 Alfresco Software Limited.
+ *
+ * This file is part of Alfresco
+ *
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package org.alfresco.service.cmr.publishing.channels;
+
+import java.io.Serializable;
+import java.util.List;
+import java.util.Map;
+
+import org.alfresco.service.namespace.QName;
+
+/**
+ * @author Brian
+ *
+ */
+public interface ChannelService
+{
+    void register(ChannelType channelType);
+    List<ChannelType> getChannelTypes();
+    Channel createChannel(String siteId, String channelTypeId, String name, Map<QName, Serializable> properties);
+    void deleteChannel(String siteId, String channelName);
+    List<Channel> getChannels(String siteId);
+}
diff --git a/source/java/org/alfresco/service/cmr/publishing/channels/ChannelType.java b/source/java/org/alfresco/service/cmr/publishing/channels/ChannelType.java
new file mode 100644
index 0000000000..48ba1f1bee
--- /dev/null
+++ b/source/java/org/alfresco/service/cmr/publishing/channels/ChannelType.java
@@ -0,0 +1,36 @@
+/*
+ * Copyright (C) 2005-2010 Alfresco Software Limited.
+ *
+ * This file is part of Alfresco
+ *
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package org.alfresco.service.cmr.publishing.channels;
+
+import java.util.Map;
+
+import org.alfresco.service.namespace.QName;
+
+/**
+ * @author Brian
+ *
+ */
+public interface ChannelType
+{
+    String getId();
+    Map<String,String> getCapabilities();
+    QName getChannelNodeType();
+    QName getContentRootNodeType();
+}
diff --git a/source/test/org/alfresco/repo/publishing/ChannelServiceImplTest.java b/source/test/org/alfresco/repo/publishing/ChannelServiceImplTest.java
new file mode 100644
index 0000000000..ab4a7cabbe
--- /dev/null
+++ b/source/test/org/alfresco/repo/publishing/ChannelServiceImplTest.java
@@ -0,0 +1,77 @@
+/*
+ * Copyright (C) 2005-2011 Alfresco Software Limited.
+ *
+ * This file is part of Alfresco
+ *
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package org.alfresco.repo.publishing;
+
+import static junit.framework.Assert.assertTrue;
+import static junit.framework.Assert.fail;
+
+import java.util.List;
+
+import javax.annotation.Resource;
+
+import org.alfresco.service.cmr.publishing.channels.ChannelService;
+import org.alfresco.service.cmr.publishing.channels.ChannelType;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+/**
+ * @author Nick Smith
+ * @since 4.0
+ *
+ */
+@RunWith(SpringJUnit4ClassRunner.class)
+@ContextConfiguration(locations = { "classpath:test/alfresco/test-web-publishing-context.xml"})
+public class ChannelServiceImplTest
+{
+    @Resource
+    ChannelService channelService;
+    
+    @Resource
+    MockChannelType mockChannelType;
+    
+    @Test
+    public void testRegister()
+    {
+        List<ChannelType> types = channelService.getChannelTypes();
+        
+        // Check the mock channel type is registered through Spring.
+        assertTrue(types.contains(mockChannelType));
+        
+        try
+        {
+            channelService.register(null);
+            fail("Exception expected when calling register(null)");
+        }
+        catch(IllegalArgumentException e)
+        {
+            //NOOP
+        }
+        try
+        {
+            channelService.register(mockChannelType);
+            fail("Exception expected when trying to register the same ChannelType twice");
+        }
+        catch(IllegalArgumentException e)
+        {
+            //NOOP
+        }
+    }
+}
diff --git a/source/test/org/alfresco/repo/publishing/MockChannelType.java b/source/test/org/alfresco/repo/publishing/MockChannelType.java
new file mode 100644
index 0000000000..90fe9a1e52
--- /dev/null
+++ b/source/test/org/alfresco/repo/publishing/MockChannelType.java
@@ -0,0 +1,75 @@
+/*
+ * Copyright (C) 2005-2011 Alfresco Software Limited.
+ *
+ * This file is part of Alfresco
+ *
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package org.alfresco.repo.publishing;
+
+import java.util.Map;
+
+import org.alfresco.service.namespace.QName;
+
+/**
+ * @author Nick Smith
+ * @since 4.0
+ *
+ */
+public class MockChannelType extends AbstractChannelType
+{
+    public final static String NAME = "MockChannelType";
+    
+    public MockChannelType()
+    {
+        super();
+    }
+    
+    /**
+    * {@inheritDoc}
+    */
+    @Override
+    public String getId()
+    {
+        return NAME;
+    }
+
+    /**
+    * {@inheritDoc}
+    */
+    @Override
+    public Map<String, String> getCapabilities()
+    {
+        return null;
+    }
+
+    /**
+    * {@inheritDoc}
+    */
+    @Override
+    public QName getChannelNodeType()
+    {
+        return null;
+    }
+
+    /**
+    * {@inheritDoc}
+    */
+    @Override
+    public QName getContentRootNodeType()
+    {
+        return null;
+    }
+}