Merged HEAD-BUG-FIX (Cloud33/4.3) to HEAD (Cloud33/4.3)

62931: Merged PLATFORM1 (Cloud33) to HEAD-BUG-FIX (Cloud33/4.3)
      62696: ACE-480  Split Data-Model into Lucene Independent and Legacy Lucene Project


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@62986 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Alan Davis
2014-02-20 14:59:18 +00:00
parent 3e55fd9ca1
commit 9dca412a8c
31 changed files with 327 additions and 347 deletions

View File

@@ -30,9 +30,9 @@ import org.alfresco.cmis.CMISPropertyDefinition;
import org.alfresco.cmis.CMISQueryException;
import org.alfresco.cmis.CMISScope;
import org.alfresco.cmis.CMISTypeDefinition;
import org.alfresco.repo.search.impl.lucene.AbstractLuceneQueryParser;
import org.alfresco.repo.search.impl.lucene.LuceneFunction;
import org.alfresco.repo.search.impl.lucene.LuceneQueryParserAdaptor;
import org.alfresco.repo.search.adaptor.lucene.LuceneFunction;
import org.alfresco.repo.search.adaptor.lucene.LuceneQueryParserAdaptor;
import org.alfresco.repo.search.adaptor.lucene.QueryConstants;
import org.alfresco.repo.search.impl.querymodel.FunctionArgument;
import org.alfresco.repo.search.impl.querymodel.FunctionEvaluationContext;
import org.alfresco.repo.search.impl.querymodel.PredicateMode;
@@ -72,31 +72,31 @@ public class CmisFunctionEvaluationContext implements FunctionEvaluationContext
static
{
EXPOSED_FIELDS.add(AbstractLuceneQueryParser.FIELD_PATH);
EXPOSED_FIELDS.add(AbstractLuceneQueryParser.FIELD_TEXT);
EXPOSED_FIELDS.add(AbstractLuceneQueryParser.FIELD_ID);
EXPOSED_FIELDS.add(AbstractLuceneQueryParser.FIELD_ISROOT);
EXPOSED_FIELDS.add(AbstractLuceneQueryParser.FIELD_ISNODE);
EXPOSED_FIELDS.add(AbstractLuceneQueryParser.FIELD_TX);
EXPOSED_FIELDS.add(AbstractLuceneQueryParser.FIELD_PARENT);
EXPOSED_FIELDS.add(AbstractLuceneQueryParser.FIELD_PRIMARYPARENT);
EXPOSED_FIELDS.add(AbstractLuceneQueryParser.FIELD_QNAME);
EXPOSED_FIELDS.add(AbstractLuceneQueryParser.FIELD_CLASS);
EXPOSED_FIELDS.add(AbstractLuceneQueryParser.FIELD_TYPE);
EXPOSED_FIELDS.add(AbstractLuceneQueryParser.FIELD_EXACTTYPE);
EXPOSED_FIELDS.add(AbstractLuceneQueryParser.FIELD_ASPECT);
EXPOSED_FIELDS.add(AbstractLuceneQueryParser.FIELD_EXACTASPECT);
EXPOSED_FIELDS.add(AbstractLuceneQueryParser.FIELD_ALL);
EXPOSED_FIELDS.add(AbstractLuceneQueryParser.FIELD_ISUNSET);
EXPOSED_FIELDS.add(AbstractLuceneQueryParser.FIELD_ISNULL);
EXPOSED_FIELDS.add(AbstractLuceneQueryParser.FIELD_ISNOTNULL);
EXPOSED_FIELDS.add(AbstractLuceneQueryParser.FIELD_FTSSTATUS);
EXPOSED_FIELDS.add(AbstractLuceneQueryParser.FIELD_ASSOCTYPEQNAME);
EXPOSED_FIELDS.add(AbstractLuceneQueryParser.FIELD_PRIMARYASSOCTYPEQNAME);
EXPOSED_FIELDS.add(AbstractLuceneQueryParser.FIELD_DBID);
EXPOSED_FIELDS.add(AbstractLuceneQueryParser.FIELD_TAG);
EXPOSED_FIELDS.add(AbstractLuceneQueryParser.FIELD_TENANT);
EXPOSED_FIELDS.add(AbstractLuceneQueryParser.FIELD_ANCESTOR);
EXPOSED_FIELDS.add(QueryConstants.FIELD_PATH);
EXPOSED_FIELDS.add(QueryConstants.FIELD_TEXT);
EXPOSED_FIELDS.add(QueryConstants.FIELD_ID);
EXPOSED_FIELDS.add(QueryConstants.FIELD_ISROOT);
EXPOSED_FIELDS.add(QueryConstants.FIELD_ISNODE);
EXPOSED_FIELDS.add(QueryConstants.FIELD_TX);
EXPOSED_FIELDS.add(QueryConstants.FIELD_PARENT);
EXPOSED_FIELDS.add(QueryConstants.FIELD_PRIMARYPARENT);
EXPOSED_FIELDS.add(QueryConstants.FIELD_QNAME);
EXPOSED_FIELDS.add(QueryConstants.FIELD_CLASS);
EXPOSED_FIELDS.add(QueryConstants.FIELD_TYPE);
EXPOSED_FIELDS.add(QueryConstants.FIELD_EXACTTYPE);
EXPOSED_FIELDS.add(QueryConstants.FIELD_ASPECT);
EXPOSED_FIELDS.add(QueryConstants.FIELD_EXACTASPECT);
EXPOSED_FIELDS.add(QueryConstants.FIELD_ALL);
EXPOSED_FIELDS.add(QueryConstants.FIELD_ISUNSET);
EXPOSED_FIELDS.add(QueryConstants.FIELD_ISNULL);
EXPOSED_FIELDS.add(QueryConstants.FIELD_ISNOTNULL);
EXPOSED_FIELDS.add(QueryConstants.FIELD_FTSSTATUS);
EXPOSED_FIELDS.add(QueryConstants.FIELD_ASSOCTYPEQNAME);
EXPOSED_FIELDS.add(QueryConstants.FIELD_PRIMARYASSOCTYPEQNAME);
EXPOSED_FIELDS.add(QueryConstants.FIELD_DBID);
EXPOSED_FIELDS.add(QueryConstants.FIELD_TAG);
EXPOSED_FIELDS.add(QueryConstants.FIELD_TENANT);
EXPOSED_FIELDS.add(QueryConstants.FIELD_ANCESTOR);
EXPOSED_FIELDS.add("d:"+DataTypeDefinition.ANY.getLocalName());