diff --git a/config/alfresco/core-services-context.xml b/config/alfresco/core-services-context.xml index 3a847ae50e..ff489c1561 100644 --- a/config/alfresco/core-services-context.xml +++ b/config/alfresco/core-services-context.xml @@ -614,6 +614,22 @@ + + + + + + + + + + + + + + + + diff --git a/config/alfresco/model/cmisModel.xml b/config/alfresco/model/cmisModel.xml deleted file mode 100644 index cdbf4b3452..0000000000 --- a/config/alfresco/model/cmisModel.xml +++ /dev/null @@ -1,390 +0,0 @@ - - - CMIS Model Definitions - 1.0 - - - - - - - - - - - - - - - - org.alfresco.repo.search.impl.lucene.analysis.AlfrescoStandardAnalyser - java.lang.String - - - - org.alfresco.repo.search.impl.lucene.analysis.AlfrescoStandardAnalyser - java.lang.String - - - - org.alfresco.repo.search.impl.lucene.analysis.AlfrescoStandardAnalyser - java.lang.String - - - - - - - - - - notallowed - allowed - required - - - - - - - - - - - - Object Id - The unique object id (a node ref) - cmis:id - true - false - false - - false - - - - Object Type Id - Id of the object’s type - cmis:id - true - false - false - - false - - - - Base Type Id - Id of the base object type for the object - cmis:id - true - false - false - - true - - - - Name - Name - d:text - false - false - false - - both - - - - Created by - The authority who created this object - d:text - true - false - false - - false - - - - Creation Date - The object creation date - d:datetime - true - false - false - - false - - - - Last Modified By - The authority who last modified this object - d:text - true - false - false - - false - - - - Last Modified Date - The date this object was last modified - d:datetime - true - false - false - - false - - - - Change token - Change Token - d:text - true - false - false - - - - Alfresco Node Ref - Alfresco Node Ref - cmis:id - true - false - false - - - - - - - Document - Document Type - cmisext:object - - - Is Immutable - Is the document immutable? - d:boolean - true - false - false - - - - Is Latest Version - Is this the latest version of the document? - d:boolean - true - false - false - - - - Is Major Version - Is this a major version of the document? - d:boolean - true - false - false - - - - Is Latest Major Version - Is this the latest major version of the document? - d:boolean - true - false - false - - - - Version Label - The version label - d:text - true - false - false - - - - Version series id - The version series id - cmis:id - true - false - false - - - - Is Version Series Checked Out - Is the version series checked out? - d:boolean - true - false - false - - - - Version Series Checked Out By - The authority who checked out this document version series - d:text - true - false - false - - - - Version Series Checked Out Id - The checked out version series id - cmis:id - true - false - false - - - - Checkin Comment - The checkin comment - d:text - true - false - false - - - - Content Stream Length - The length of the content stream - d:long - true - false - false - - false - - - - Content Stream MIME Type - The content stream MIME type - d:text - true - false - false - - false - - - - Content Stream Filename - The content stream filename - d:text - true - false - false - - true - - - - Content Stream Id - Id of the stream - cmis:id - true - false - false - - - - - - - Folder - Folder Type - cmisext:object - - - Parent Id - The parent id of the folder - cmis:id - true - false - false - - false - - - - Path - The fully qualified path to this folder/description - d:text - true - false - false - - - - Allowed Child Object Types Ids - The allowed child object type ids - cmis:id - true - false - true - - - - - - - Relationship - Relationship Type - cmisext:object - - - Source Id - The source id for the relationship - cmis:id - true - true - false - - - - Target Id - The target id for the relationship - cmis:id - true - true - false - - - - - - - Policy - Policy Type - cmisext:object - - - Policy Text - The policy text - d:text - true - true - false - - - - - - - Aspects - Aspects Type - cmis:policy - - - - \ No newline at end of file diff --git a/config/alfresco/opencmis-context.xml b/config/alfresco/opencmis-context.xml index b5b0f56ea3..82c22fa697 100644 --- a/config/alfresco/opencmis-context.xml +++ b/config/alfresco/opencmis-context.xml @@ -3,6 +3,32 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -55,20 +81,6 @@ - - - - - - - - - - - - - - diff --git a/source/java/org/alfresco/cmis/CMISAccessControlFormatEnum.java b/source/java/org/alfresco/cmis/CMISAccessControlFormatEnum.java deleted file mode 100644 index 4e04cc7ad4..0000000000 --- a/source/java/org/alfresco/cmis/CMISAccessControlFormatEnum.java +++ /dev/null @@ -1,64 +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 . - */ -package org.alfresco.cmis; - -/** - * @author andyh - * - */ -public enum CMISAccessControlFormatEnum implements EnumLabel -{ - /** - * Report only CMIS basic permissions - */ - CMIS_BASIC_PERMISSIONS("onlyBasicPermissions"), - - /** - * May report CMIS basic permission, repository specific permissions or a mixture of both. - */ - REPOSITORY_SPECIFIC_PERMISSIONS("repositorySpecificPermissions"); - - private String label; - - /** - * Construct - * - * @param label - */ - CMISAccessControlFormatEnum(String label) - { - this.label = label; - } - - /* - * (non-Javadoc) - * - * @see org.alfresco.cmis.EnumLabel#label() - */ - public String getLabel() - { - return label; - } - - /** - * Factory for CMISAclPropagationEnum - */ - public static EnumFactory FACTORY = new EnumFactory(CMISAccessControlFormatEnum.class, CMIS_BASIC_PERMISSIONS, true); - -} diff --git a/source/java/org/alfresco/cmis/CMISAccessControlService.java b/source/java/org/alfresco/cmis/CMISAccessControlService.java index 0e20cf8ad6..0a7edf48a6 100644 --- a/source/java/org/alfresco/cmis/CMISAccessControlService.java +++ b/source/java/org/alfresco/cmis/CMISAccessControlService.java @@ -20,6 +20,7 @@ package org.alfresco.cmis; import java.util.List; +import org.alfresco.opencmis.CMISAccessControlFormatEnum; import org.alfresco.service.cmr.repository.NodeRef; /** diff --git a/source/java/org/alfresco/cmis/CMISAclCapabilityEnum.java b/source/java/org/alfresco/cmis/CMISAclCapabilityEnum.java index d1cf6075e4..ca3ef62dcb 100644 --- a/source/java/org/alfresco/cmis/CMISAclCapabilityEnum.java +++ b/source/java/org/alfresco/cmis/CMISAclCapabilityEnum.java @@ -18,6 +18,9 @@ */ package org.alfresco.cmis; +import org.alfresco.opencmis.EnumFactory; +import org.alfresco.opencmis.EnumLabel; + /** * CMIS ACL capability * diff --git a/source/java/org/alfresco/cmis/CMISAclPropagationEnum.java b/source/java/org/alfresco/cmis/CMISAclPropagationEnum.java index 8f165e57e3..00cfa75d40 100644 --- a/source/java/org/alfresco/cmis/CMISAclPropagationEnum.java +++ b/source/java/org/alfresco/cmis/CMISAclPropagationEnum.java @@ -18,6 +18,9 @@ */ package org.alfresco.cmis; +import org.alfresco.opencmis.EnumFactory; +import org.alfresco.opencmis.EnumLabel; + /** * CMIS ACL propagation * diff --git a/source/java/org/alfresco/cmis/CMISAclSupportedPermissionEnum.java b/source/java/org/alfresco/cmis/CMISAclSupportedPermissionEnum.java index ced83d7253..d2869b4c01 100644 --- a/source/java/org/alfresco/cmis/CMISAclSupportedPermissionEnum.java +++ b/source/java/org/alfresco/cmis/CMISAclSupportedPermissionEnum.java @@ -18,6 +18,8 @@ */ package org.alfresco.cmis; +import org.alfresco.opencmis.EnumFactory; + /** * Specifies which types of permissions are supported.. * diff --git a/source/java/org/alfresco/cmis/CMISAllowedActionEnum.java b/source/java/org/alfresco/cmis/CMISAllowedActionEnum.java index 80cab202fd..19a86d7a63 100644 --- a/source/java/org/alfresco/cmis/CMISAllowedActionEnum.java +++ b/source/java/org/alfresco/cmis/CMISAllowedActionEnum.java @@ -23,6 +23,9 @@ import java.util.HashMap; import java.util.List; import java.util.Map; +import org.alfresco.opencmis.EnumFactory; +import org.alfresco.opencmis.EnumLabel; + /** * CMIS Allowed Action Enum * diff --git a/source/java/org/alfresco/cmis/CMISBaseObjectTypeIds.java b/source/java/org/alfresco/cmis/CMISBaseObjectTypeIds.java index 5bbc44a239..3ac8cf3c04 100644 --- a/source/java/org/alfresco/cmis/CMISBaseObjectTypeIds.java +++ b/source/java/org/alfresco/cmis/CMISBaseObjectTypeIds.java @@ -18,6 +18,9 @@ */ package org.alfresco.cmis; +import org.alfresco.opencmis.EnumFactory; +import org.alfresco.opencmis.EnumLabel; + /** * Enumeration of base Alfresco Object type Ids. Possible values:
* DOCUMENT,
diff --git a/source/java/org/alfresco/cmis/CMISCapabilityChanges.java b/source/java/org/alfresco/cmis/CMISCapabilityChanges.java index 8f8e0ceef2..5ac4253cc4 100644 --- a/source/java/org/alfresco/cmis/CMISCapabilityChanges.java +++ b/source/java/org/alfresco/cmis/CMISCapabilityChanges.java @@ -18,6 +18,9 @@ */ package org.alfresco.cmis; +import org.alfresco.opencmis.EnumFactory; +import org.alfresco.opencmis.EnumLabel; + /** * Enumeration of the CMIS Changes Capability * diff --git a/source/java/org/alfresco/cmis/CMISCardinalityEnum.java b/source/java/org/alfresco/cmis/CMISCardinalityEnum.java index fcc0a2648f..a461abd0fb 100644 --- a/source/java/org/alfresco/cmis/CMISCardinalityEnum.java +++ b/source/java/org/alfresco/cmis/CMISCardinalityEnum.java @@ -18,6 +18,9 @@ */ package org.alfresco.cmis; +import org.alfresco.opencmis.EnumFactory; +import org.alfresco.opencmis.EnumLabel; + /** * CMIS Property Cardinality Enum * diff --git a/source/java/org/alfresco/cmis/CMISChangeType.java b/source/java/org/alfresco/cmis/CMISChangeType.java index e7a35452bf..928a4c1bd7 100644 --- a/source/java/org/alfresco/cmis/CMISChangeType.java +++ b/source/java/org/alfresco/cmis/CMISChangeType.java @@ -18,6 +18,9 @@ */ package org.alfresco.cmis; +import org.alfresco.opencmis.EnumFactory; +import org.alfresco.opencmis.EnumLabel; + /** * Enumeration of the CMIS Change Type. Possible values:
* CREATED
diff --git a/source/java/org/alfresco/cmis/CMISContentStreamAllowedEnum.java b/source/java/org/alfresco/cmis/CMISContentStreamAllowedEnum.java index 70973e8404..538a300b92 100644 --- a/source/java/org/alfresco/cmis/CMISContentStreamAllowedEnum.java +++ b/source/java/org/alfresco/cmis/CMISContentStreamAllowedEnum.java @@ -18,6 +18,9 @@ */ package org.alfresco.cmis; +import org.alfresco.opencmis.EnumFactory; +import org.alfresco.opencmis.EnumLabel; + /** * CMIS Content Stream Allowed Enum * diff --git a/source/java/org/alfresco/cmis/CMISDataTypeEnum.java b/source/java/org/alfresco/cmis/CMISDataTypeEnum.java index be3384f147..765e70a385 100644 --- a/source/java/org/alfresco/cmis/CMISDataTypeEnum.java +++ b/source/java/org/alfresco/cmis/CMISDataTypeEnum.java @@ -18,6 +18,8 @@ */ package org.alfresco.cmis; +import org.alfresco.opencmis.EnumFactory; +import org.alfresco.opencmis.EnumLabel; import org.alfresco.service.cmr.dictionary.DataTypeDefinition; import org.alfresco.service.namespace.QName; diff --git a/source/java/org/alfresco/cmis/CMISJoinEnum.java b/source/java/org/alfresco/cmis/CMISJoinEnum.java index b9115fd124..dff61415fe 100644 --- a/source/java/org/alfresco/cmis/CMISJoinEnum.java +++ b/source/java/org/alfresco/cmis/CMISJoinEnum.java @@ -18,6 +18,9 @@ */ package org.alfresco.cmis; +import org.alfresco.opencmis.EnumFactory; +import org.alfresco.opencmis.EnumLabel; + /** * CMIS Join Enum * diff --git a/source/java/org/alfresco/cmis/CMISPropertyAccessor.java b/source/java/org/alfresco/cmis/CMISPropertyAccessor.java deleted file mode 100644 index e367bae7f0..0000000000 --- a/source/java/org/alfresco/cmis/CMISPropertyAccessor.java +++ /dev/null @@ -1,71 +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 . - */ -package org.alfresco.cmis; - -import java.io.Serializable; - -import org.alfresco.service.cmr.repository.AssociationRef; -import org.alfresco.service.cmr.repository.NodeRef; -import org.alfresco.service.namespace.QName; - -/** - * CMIS Property Accessor (get and set property values) - * - * @author davidc - */ -public interface CMISPropertyAccessor -{ - /** - * Get the CMIS Property Name - * - * @return - */ - public String getName(); - - /** - * Get the (directly) mapped Alfresco property (if a direct mapping exists) - * - * @return - */ - public QName getMappedProperty(); - - /** - * Get the property value for a node - * - * @param nodeRef - * @return - */ - public Serializable getValue(NodeRef nodeRef); - - /** - * Set the property value for a node - * - * @param nodeRef - * @Param value - */ - public void setValue(NodeRef nodeRef, Serializable value); - - /** - * Get the property value for an association - * - * @param nodeRef - * @return - */ - public Serializable getValue(AssociationRef assocRef); -} diff --git a/source/java/org/alfresco/cmis/CMISPropertyDefinition.java b/source/java/org/alfresco/cmis/CMISPropertyDefinition.java index 12cf358702..cbcc324dcc 100644 --- a/source/java/org/alfresco/cmis/CMISPropertyDefinition.java +++ b/source/java/org/alfresco/cmis/CMISPropertyDefinition.java @@ -20,6 +20,9 @@ package org.alfresco.cmis; import java.util.Collection; +import org.alfresco.opencmis.dictionary.CMISPropertyAccessor; +import org.alfresco.opencmis.dictionary.CMISPropertyLuceneBuilder; + /** * CMIS Property Definition @@ -159,5 +162,4 @@ public interface CMISPropertyDefinition * @return */ public CMISPropertyLuceneBuilder getPropertyLuceneBuilder(); - } diff --git a/source/java/org/alfresco/cmis/CMISPropertyLuceneBuilder.java b/source/java/org/alfresco/cmis/CMISPropertyLuceneBuilder.java deleted file mode 100644 index 0ec78921c1..0000000000 --- a/source/java/org/alfresco/cmis/CMISPropertyLuceneBuilder.java +++ /dev/null @@ -1,135 +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 . - */ -package org.alfresco.cmis; - -import java.io.Serializable; -import java.util.Collection; - -import org.alfresco.repo.search.impl.lucene.LuceneFunction; -import org.alfresco.repo.search.impl.lucene.LuceneQueryParser; -import org.alfresco.repo.search.impl.querymodel.PredicateMode; -import org.apache.lucene.queryParser.ParseException; -import org.apache.lucene.search.Query; - -/** - * CMIS Property Lucene Builder - * - * @author andyh - */ -public interface CMISPropertyLuceneBuilder -{ - /** - * @param lqp - * @param value - * @param mode - * @param luceneFunction - * @return the query - * @throws ParseException - */ - public Query buildLuceneEquality(LuceneQueryParser lqp, Serializable value, PredicateMode mode, LuceneFunction luceneFunction) throws ParseException; - - /** - * @param lqp - * @param not - * @return the query - * @throws ParseException - */ - public Query buildLuceneExists(LuceneQueryParser lqp, Boolean not) throws ParseException; - - /** - * @param lqp - * @param value - * @param mode - * @param luceneFunction - * @return the query - * @throws ParseException - */ - public Query buildLuceneGreaterThan(LuceneQueryParser lqp, Serializable value, PredicateMode mode, LuceneFunction luceneFunction) throws ParseException; - - /** - * @param lqp - * @param value - * @param mode - * @param luceneFunction - * @return the query - * @throws ParseException - */ - public Query buildLuceneGreaterThanOrEquals(LuceneQueryParser lqp, Serializable value, PredicateMode mode, LuceneFunction luceneFunction) throws ParseException; - - /** - * @param lqp - * @param values - * @param not - * @param mode - * @return the query - * @throws ParseException - */ - public Query buildLuceneIn(LuceneQueryParser lqp, Collection values, Boolean not, PredicateMode mode) throws ParseException; - - /** - * @param lqp - * @param value - * @param mode - * @param luceneFunction - * @return the query - * @throws ParseException - */ - public Query buildLuceneInequality(LuceneQueryParser lqp, Serializable value, PredicateMode mode, LuceneFunction luceneFunction) throws ParseException; - - /** - * @param lqp - * @param value - * @param mode - * @param luceneFunction - * @return the query - * @throws ParseException - */ - public Query buildLuceneLessThan(LuceneQueryParser lqp, Serializable value, PredicateMode mode, LuceneFunction luceneFunction) throws ParseException; - - /** - * @param lqp - * @param value - * @param mode - * @param luceneFunction - * @return the query - * @throws ParseException - */ - public Query buildLuceneLessThanOrEquals(LuceneQueryParser lqp, Serializable value, PredicateMode mode, LuceneFunction luceneFunction) throws ParseException; - - /** - * @param lqp - * @param value - * @param not - * @return the query - * @throws ParseException - */ - public Query buildLuceneLike(LuceneQueryParser lqp, Serializable value, Boolean not) throws ParseException; - - /** - * @param lqp TODO - * @return the sort field - */ - public String getLuceneSortField(LuceneQueryParser lqp); - - /** - * @return the field name - * - */ - public String getLuceneFieldName(); -} diff --git a/source/java/org/alfresco/cmis/CMISQueryEnum.java b/source/java/org/alfresco/cmis/CMISQueryEnum.java index 13206f2c99..4b5f423b26 100644 --- a/source/java/org/alfresco/cmis/CMISQueryEnum.java +++ b/source/java/org/alfresco/cmis/CMISQueryEnum.java @@ -18,6 +18,9 @@ */ package org.alfresco.cmis; +import org.alfresco.opencmis.EnumFactory; +import org.alfresco.opencmis.EnumLabel; + /** * CMIS Join Enum * diff --git a/source/java/org/alfresco/cmis/CMISRelationshipDirectionEnum.java b/source/java/org/alfresco/cmis/CMISRelationshipDirectionEnum.java index 39b8f432a3..a6d09d331e 100644 --- a/source/java/org/alfresco/cmis/CMISRelationshipDirectionEnum.java +++ b/source/java/org/alfresco/cmis/CMISRelationshipDirectionEnum.java @@ -18,6 +18,9 @@ */ package org.alfresco.cmis; +import org.alfresco.opencmis.EnumFactory; +import org.alfresco.opencmis.EnumLabel; + /** * CMIS Types Filter Enum * diff --git a/source/java/org/alfresco/cmis/CMISScope.java b/source/java/org/alfresco/cmis/CMISScope.java index c996b9aa7d..c743f6870d 100644 --- a/source/java/org/alfresco/cmis/CMISScope.java +++ b/source/java/org/alfresco/cmis/CMISScope.java @@ -18,6 +18,9 @@ */ package org.alfresco.cmis; +import org.alfresco.opencmis.EnumFactory; +import org.alfresco.opencmis.EnumLabel; + /** * The scope for a CMIS name diff --git a/source/java/org/alfresco/cmis/CMISTypesFilterEnum.java b/source/java/org/alfresco/cmis/CMISTypesFilterEnum.java index 79a4d6d4d4..4305022105 100644 --- a/source/java/org/alfresco/cmis/CMISTypesFilterEnum.java +++ b/source/java/org/alfresco/cmis/CMISTypesFilterEnum.java @@ -1,4 +1,4 @@ -/* +/* * Copyright (C) 2005-2010 Alfresco Software Limited. * * This file is part of Alfresco @@ -14,42 +14,45 @@ * 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 . - */ -package org.alfresco.cmis; - -/** - * CMIS Types Filter Enum - * - * @author davidc - */ -public enum CMISTypesFilterEnum implements EnumLabel -{ - DOCUMENTS("documents"), - FOLDERS("folders"), - POLICIES("policies"), - ANY("any"); - - - private String label; - - /** - * Construct - * - * @param label - */ - CMISTypesFilterEnum(String label) - { - this.label = label; - } - - /* (non-Javadoc) - * @see org.alfresco.cmis.EnumLabel#label() - */ - public String getLabel() - { - return label; - } - - public static EnumFactory FACTORY = new EnumFactory(CMISTypesFilterEnum.class, ANY); + * along with Alfresco. If not, see . + */ +package org.alfresco.cmis; + +import org.alfresco.opencmis.EnumFactory; +import org.alfresco.opencmis.EnumLabel; + +/** + * CMIS Types Filter Enum + * + * @author davidc + */ +public enum CMISTypesFilterEnum implements EnumLabel +{ + DOCUMENTS("documents"), + FOLDERS("folders"), + POLICIES("policies"), + ANY("any"); + + + private String label; + + /** + * Construct + * + * @param label + */ + CMISTypesFilterEnum(String label) + { + this.label = label; + } + + /* (non-Javadoc) + * @see org.alfresco.cmis.EnumLabel#label() + */ + public String getLabel() + { + return label; + } + + public static EnumFactory FACTORY = new EnumFactory(CMISTypesFilterEnum.class, ANY); } \ No newline at end of file diff --git a/source/java/org/alfresco/cmis/CMISUpdatabilityEnum.java b/source/java/org/alfresco/cmis/CMISUpdatabilityEnum.java index e639c85dd1..eab05808b7 100644 --- a/source/java/org/alfresco/cmis/CMISUpdatabilityEnum.java +++ b/source/java/org/alfresco/cmis/CMISUpdatabilityEnum.java @@ -18,6 +18,9 @@ */ package org.alfresco.cmis; +import org.alfresco.opencmis.EnumFactory; +import org.alfresco.opencmis.EnumLabel; + /** * CMIS Updatability Enum * diff --git a/source/java/org/alfresco/cmis/CMISVersioningStateEnum.java b/source/java/org/alfresco/cmis/CMISVersioningStateEnum.java index 5943a6c227..fc9bea5bbc 100644 --- a/source/java/org/alfresco/cmis/CMISVersioningStateEnum.java +++ b/source/java/org/alfresco/cmis/CMISVersioningStateEnum.java @@ -18,6 +18,9 @@ */ package org.alfresco.cmis; +import org.alfresco.opencmis.EnumFactory; +import org.alfresco.opencmis.EnumLabel; + /** * CMIS Versioning State Enumeration. * diff --git a/source/java/org/alfresco/cmis/EnumFactory.java b/source/java/org/alfresco/cmis/EnumFactory.java deleted file mode 100644 index f19ef5c015..0000000000 --- a/source/java/org/alfresco/cmis/EnumFactory.java +++ /dev/null @@ -1,154 +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 . - */ -package org.alfresco.cmis; - -import java.util.EnumSet; -import java.util.HashMap; -import java.util.Iterator; -import java.util.Map; -import java.util.TreeMap; - - -/** - * Enum Factory for managing mapping between Enum name and Enum label - * - * @author dcaruana - * - * @param - */ -public class EnumFactory> -{ - private E defaultEnum; - private Map labelMap = new HashMap(10); - - /** - * @param enumClass - */ - public EnumFactory(Class enumClass) - { - this(enumClass, null, false); - } - - /** - * @param enumClass - * @param defaultEnum - */ - public EnumFactory(Class enumClass, E defaultEnum) - { - this(enumClass, defaultEnum, false); - } - - /** - * @param enumClass - * @param defaultEnum - * @param caseSensitive case-sensitive lookup for Enum label - */ - public EnumFactory(Class enumClass, E defaultEnum, boolean caseSensitive) - { - this.defaultEnum = defaultEnum; - - // setup label map - labelMap = caseSensitive ? new HashMap(10) : new TreeMap(String.CASE_INSENSITIVE_ORDER); - EnumSet enumSet = EnumSet.allOf(enumClass); - Iterator iter = enumSet.iterator(); - while(iter.hasNext()) - { - E e = iter.next(); - if (e instanceof EnumLabel) - { - labelMap.put(((EnumLabel)e).getLabel(), e); - } - } - } - - /** - * Gets the default enum - * - * @return default enum (or null, if no default specified) - */ - public Enum getDefaultEnum() - { - return defaultEnum; - } - - /** - * Gets the default label - * - * @return label of default enum (or null, if no default specified) - */ - public String getDefaultLabel() - { - return label(defaultEnum); - } - - /** - * Gets the label for the specified enum - * - * @param e enum - * @return label (or null, if no label specified) - */ - public String label(E e) - { - if (e instanceof EnumLabel) - { - return ((EnumLabel)e).getLabel(); - } - return null; - } - - /** - * Is valid label? - * - * @param label - * @return true => valid, false => does not exist for this enum - */ - public boolean validLabel(String label) - { - return fromLabel(label) == null ? false : true; - } - - /** - * Gets enum from label - * - * @param label - * @return enum (or null, if no enum has specified label) - */ - public E fromLabel(String label) - { - return labelMap.get(label); - } - - /** - * Gets enum from label - * - * NOTE: If specified label is invalid, the default enum is returned - * - * @param label - * @return enum (or default enum, if label is invalid) - */ - public E toEnum(String label) - { - E e = (label == null) ? null : fromLabel(label); - if (e == null) - { - e = defaultEnum; - } - return e; - } -} diff --git a/source/java/org/alfresco/cmis/acl/CMISAccessControlServiceImpl.java b/source/java/org/alfresco/cmis/acl/CMISAccessControlServiceImpl.java index 946d59cfbf..fff11a36e6 100644 --- a/source/java/org/alfresco/cmis/acl/CMISAccessControlServiceImpl.java +++ b/source/java/org/alfresco/cmis/acl/CMISAccessControlServiceImpl.java @@ -29,7 +29,6 @@ import java.util.Map; import java.util.Set; import org.alfresco.cmis.CMISAccessControlEntry; -import org.alfresco.cmis.CMISAccessControlFormatEnum; import org.alfresco.cmis.CMISAccessControlReport; import org.alfresco.cmis.CMISAccessControlService; import org.alfresco.cmis.CMISAclCapabilityEnum; @@ -42,6 +41,7 @@ import org.alfresco.cmis.CMISPermissionDefinition; import org.alfresco.cmis.CMISPermissionMapping; import org.alfresco.cmis.CMISTypeDefinition; import org.alfresco.cmis.mapping.CMISMapping; +import org.alfresco.opencmis.CMISAccessControlFormatEnum; import org.alfresco.repo.security.authentication.AuthenticationUtil; import org.alfresco.repo.security.permissions.PermissionReference; import org.alfresco.repo.security.permissions.impl.AccessPermissionImpl; diff --git a/source/java/org/alfresco/cmis/acl/CMISAccessControlServiceTest.java b/source/java/org/alfresco/cmis/acl/CMISAccessControlServiceTest.java index e241b9ae4a..4149971c53 100644 --- a/source/java/org/alfresco/cmis/acl/CMISAccessControlServiceTest.java +++ b/source/java/org/alfresco/cmis/acl/CMISAccessControlServiceTest.java @@ -26,7 +26,6 @@ import java.util.Set; import org.alfresco.cmis.CMISAccessControlEntriesGroupedByPrincipalId; import org.alfresco.cmis.CMISAccessControlEntry; -import org.alfresco.cmis.CMISAccessControlFormatEnum; import org.alfresco.cmis.CMISAccessControlReport; import org.alfresco.cmis.CMISAccessControlService; import org.alfresco.cmis.CMISAclCapabilityEnum; @@ -37,6 +36,7 @@ import org.alfresco.cmis.CMISPermissionMapping; import org.alfresco.cmis.acl.CMISAccessControlServiceImpl.AccessPermissionComparator; import org.alfresco.cmis.mapping.BaseCMISTest; import org.alfresco.model.ContentModel; +import org.alfresco.opencmis.CMISAccessControlFormatEnum; import org.alfresco.repo.security.permissions.PermissionReference; import org.alfresco.service.cmr.repository.NodeRef; import org.alfresco.service.cmr.security.AccessPermission; diff --git a/source/java/org/alfresco/cmis/acl/CMISAllowedActionKeyTypeEnum.java b/source/java/org/alfresco/cmis/acl/CMISAllowedActionKeyTypeEnum.java index 03ffa52ed6..9610ffed7b 100644 --- a/source/java/org/alfresco/cmis/acl/CMISAllowedActionKeyTypeEnum.java +++ b/source/java/org/alfresco/cmis/acl/CMISAllowedActionKeyTypeEnum.java @@ -18,8 +18,8 @@ */ package org.alfresco.cmis.acl; -import org.alfresco.cmis.EnumFactory; -import org.alfresco.cmis.EnumLabel; +import org.alfresco.opencmis.EnumFactory; +import org.alfresco.opencmis.EnumLabel; /** * Part two of the allowable action key for the permission mappings diff --git a/source/java/org/alfresco/cmis/dictionary/CMISAbstractDictionaryService.java b/source/java/org/alfresco/cmis/dictionary/CMISAbstractDictionaryService.java index 56f4d3fafc..ffa76add95 100644 --- a/source/java/org/alfresco/cmis/dictionary/CMISAbstractDictionaryService.java +++ b/source/java/org/alfresco/cmis/dictionary/CMISAbstractDictionaryService.java @@ -195,7 +195,6 @@ public abstract class CMISAbstractDictionaryService extends AbstractLifecycleBea logger.debug(" Id: " + propDef.getPropertyId().getId()); logger.debug(" Owning Type: " + propDef.getOwningType().getTypeId()); logger.debug(" Property Accessor: " + propDef.getPropertyAccessor() + " , mappedProperty=" + propDef.getPropertyAccessor().getMappedProperty()); - logger.debug(" Property Lucene Builder: " + propDef.getPropertyLuceneBuilder()); } } diff --git a/source/java/org/alfresco/cmis/dictionary/CMISBasePropertyDefinition.java b/source/java/org/alfresco/cmis/dictionary/CMISBasePropertyDefinition.java index 60163cb066..9fd8ba2ae5 100644 --- a/source/java/org/alfresco/cmis/dictionary/CMISBasePropertyDefinition.java +++ b/source/java/org/alfresco/cmis/dictionary/CMISBasePropertyDefinition.java @@ -30,10 +30,10 @@ import org.alfresco.cmis.CMISPropertyDefinition; import org.alfresco.cmis.CMISPropertyId; import org.alfresco.cmis.CMISTypeDefinition; import org.alfresco.cmis.CMISUpdatabilityEnum; -import org.alfresco.cmis.CMISPropertyAccessor; -import org.alfresco.cmis.CMISPropertyLuceneBuilder; import org.alfresco.cmis.mapping.AbstractProperty; import org.alfresco.cmis.mapping.CMISMapping; +import org.alfresco.opencmis.dictionary.CMISPropertyAccessor; +import org.alfresco.opencmis.dictionary.CMISPropertyLuceneBuilder; import org.alfresco.repo.dictionary.IndexTokenisationMode; import org.alfresco.repo.dictionary.constraint.ListOfValuesConstraint; import org.alfresco.repo.dictionary.constraint.NumericRangeConstraint; diff --git a/source/java/org/alfresco/cmis/mapping/AbstractProperty.java b/source/java/org/alfresco/cmis/mapping/AbstractProperty.java index bb171537f8..b3e963576c 100644 --- a/source/java/org/alfresco/cmis/mapping/AbstractProperty.java +++ b/source/java/org/alfresco/cmis/mapping/AbstractProperty.java @@ -21,8 +21,8 @@ package org.alfresco.cmis.mapping; import java.io.Serializable; import java.util.Collection; -import org.alfresco.cmis.CMISPropertyAccessor; -import org.alfresco.cmis.CMISPropertyLuceneBuilder; +import org.alfresco.opencmis.dictionary.CMISPropertyAccessor; +import org.alfresco.opencmis.dictionary.CMISPropertyLuceneBuilder; import org.alfresco.repo.search.impl.lucene.LuceneFunction; import org.alfresco.repo.search.impl.lucene.LuceneQueryParser; import org.alfresco.repo.search.impl.querymodel.PredicateMode; diff --git a/source/java/org/alfresco/cmis/mapping/CMISMapping.java b/source/java/org/alfresco/cmis/mapping/CMISMapping.java index 018cbde47f..9f7c76d779 100644 --- a/source/java/org/alfresco/cmis/mapping/CMISMapping.java +++ b/source/java/org/alfresco/cmis/mapping/CMISMapping.java @@ -27,7 +27,6 @@ import java.util.LinkedHashMap; import java.util.Map; import java.util.Set; -import org.alfresco.cmis.CMISAccessControlFormatEnum; import org.alfresco.cmis.CMISAccessControlService; import org.alfresco.cmis.CMISActionEvaluator; import org.alfresco.cmis.CMISAllowedActionEnum; @@ -39,6 +38,7 @@ import org.alfresco.cmis.CMISServices; import org.alfresco.cmis.CMISTypeId; import org.alfresco.error.AlfrescoRuntimeException; import org.alfresco.model.ContentModel; +import org.alfresco.opencmis.CMISAccessControlFormatEnum; import org.alfresco.service.ServiceRegistry; import org.alfresco.service.cmr.dictionary.AspectDefinition; import org.alfresco.service.cmr.dictionary.AssociationDefinition; diff --git a/source/java/org/alfresco/cmis/search/CmisFunctionEvaluationContext.java b/source/java/org/alfresco/cmis/search/CmisFunctionEvaluationContext.java index 57c5faecec..e48bbb4399 100644 --- a/source/java/org/alfresco/cmis/search/CmisFunctionEvaluationContext.java +++ b/source/java/org/alfresco/cmis/search/CmisFunctionEvaluationContext.java @@ -453,5 +453,4 @@ public class CmisFunctionEvaluationContext implements FunctionEvaluationContext return propDef.getCardinality() == CMISCardinalityEnum.MULTI_VALUED; } - } diff --git a/source/java/org/alfresco/opencmis/CMISActionEvaluator.java b/source/java/org/alfresco/opencmis/CMISActionEvaluator.java deleted file mode 100644 index 08bc454c5c..0000000000 --- a/source/java/org/alfresco/opencmis/CMISActionEvaluator.java +++ /dev/null @@ -1,39 +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 . - */ -package org.alfresco.opencmis; - -import org.apache.chemistry.opencmis.commons.enums.Action; - -public interface CMISActionEvaluator -{ - /** - * Gets the CMIS Allowed Action - * - * @return - */ - public Action getAction(); - - /** - * Determines if an action is allowed on an object - * - * @param object - * @return - */ - public boolean isAllowed(T object); -} diff --git a/source/java/org/alfresco/opencmis/CMISConnector.java b/source/java/org/alfresco/opencmis/CMISConnector.java index fdc79dc31b..e0e76ced71 100644 --- a/source/java/org/alfresco/opencmis/CMISConnector.java +++ b/source/java/org/alfresco/opencmis/CMISConnector.java @@ -42,6 +42,7 @@ import javax.xml.datatype.DatatypeConfigurationException; import javax.xml.datatype.DatatypeFactory; import org.alfresco.model.ContentModel; +import org.alfresco.opencmis.dictionary.CMISActionEvaluator; import org.alfresco.opencmis.dictionary.CMISAllowedActionEnum; import org.alfresco.opencmis.dictionary.CMISDictionaryService; import org.alfresco.opencmis.dictionary.DocumentTypeDefinitionWrapper; diff --git a/source/java/org/alfresco/opencmis/CMISUtils.java b/source/java/org/alfresco/opencmis/CMISUtils.java deleted file mode 100644 index 5624ffb00b..0000000000 --- a/source/java/org/alfresco/opencmis/CMISUtils.java +++ /dev/null @@ -1,162 +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 . - */ -package org.alfresco.opencmis; - -import java.io.InputStream; -import java.io.ObjectInputStream; -import java.io.ObjectOutputStream; -import java.io.OutputStream; - -import org.apache.chemistry.opencmis.commons.exceptions.CmisRuntimeException; - -public class CMISUtils -{ - @SuppressWarnings("unchecked") - public static T copy(T source) - { - T target = null; - try - { - CopyOutputStream cos = new CopyOutputStream(); - ObjectOutputStream out = new ObjectOutputStream(cos); - out.writeObject(source); - out.flush(); - out.close(); - - ObjectInputStream in = new ObjectInputStream(cos.getInputStream()); - target = (T) in.readObject(); - } catch (Exception e) - { - throw new CmisRuntimeException("Object copy failed!", e); - } - - return target; - } - - private static class CopyOutputStream extends OutputStream - { - protected byte[] buf = null; - protected int size = 0; - - public CopyOutputStream() - { - this(16 * 1024); - } - - public CopyOutputStream(int initSize) - { - this.size = 0; - this.buf = new byte[initSize]; - } - - private void verifyBufferSize(int sz) - { - if (sz > buf.length) - { - byte[] old = buf; - buf = new byte[Math.max(sz, 2 * buf.length)]; - System.arraycopy(old, 0, buf, 0, old.length); - old = null; - } - } - - public final void write(byte b[]) - { - verifyBufferSize(size + b.length); - System.arraycopy(b, 0, buf, size, b.length); - size += b.length; - } - - public final void write(byte b[], int off, int len) - { - verifyBufferSize(size + len); - System.arraycopy(b, off, buf, size, len); - size += len; - } - - public final void write(int b) - { - verifyBufferSize(size + 1); - buf[size++] = (byte) b; - } - - public InputStream getInputStream() - { - return new CopyInputStream(buf, size); - } - } - - private static class CopyInputStream extends InputStream - { - protected byte[] buf = null; - protected int count = 0; - protected int pos = 0; - - public CopyInputStream(byte[] buf, int count) - { - this.buf = buf; - this.count = count; - } - - public final int available() - { - return count - pos; - } - - public final int read() - { - return (pos < count) ? (buf[pos++] & 0xff) : -1; - } - - public final int read(byte[] b, int off, int len) - { - if (pos >= count) - { - return -1; - } - - if ((pos + len) > count) - { - len = (count - pos); - } - - System.arraycopy(buf, pos, b, off, len); - pos += len; - - return len; - } - - public final long skip(long n) - { - if ((pos + n) > count) - { - n = count - pos; - } - - if (n < 0) - { - return 0; - } - - pos += n; - - return n; - } - } -} diff --git a/source/java/org/alfresco/opencmis/dictionary/AbstractTypeDefinitionWrapper.java b/source/java/org/alfresco/opencmis/dictionary/AbstractTypeDefinitionWrapper.java deleted file mode 100644 index 424ba77310..0000000000 --- a/source/java/org/alfresco/opencmis/dictionary/AbstractTypeDefinitionWrapper.java +++ /dev/null @@ -1,658 +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 . - */ -package org.alfresco.opencmis.dictionary; - -import java.io.Serializable; -import java.math.BigDecimal; -import java.math.BigInteger; -import java.util.ArrayList; -import java.util.Collection; -import java.util.Collections; -import java.util.GregorianCalendar; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -import org.alfresco.error.AlfrescoRuntimeException; -import org.alfresco.opencmis.CMISActionEvaluator; -import org.alfresco.opencmis.dictionary.CMISAbstractDictionaryService.DictionaryRegistry; -import org.alfresco.opencmis.mapping.AbstractProperty; -import org.alfresco.opencmis.mapping.CMISMapping; -import org.alfresco.opencmis.mapping.DirectProperty; -import org.alfresco.repo.dictionary.IndexTokenisationMode; -import org.alfresco.repo.dictionary.constraint.ListOfValuesConstraint; -import org.alfresco.repo.dictionary.constraint.NumericRangeConstraint; -import org.alfresco.repo.dictionary.constraint.StringLengthConstraint; -import org.alfresco.repo.search.impl.lucene.analysis.DateAnalyser; -import org.alfresco.repo.search.impl.lucene.analysis.DateTimeAnalyser; -import org.alfresco.repo.search.impl.lucene.analysis.DoubleAnalyser; -import org.alfresco.repo.search.impl.lucene.analysis.FloatAnalyser; -import org.alfresco.repo.search.impl.lucene.analysis.IntegerAnalyser; -import org.alfresco.repo.search.impl.lucene.analysis.LongAnalyser; -import org.alfresco.repo.search.impl.lucene.analysis.PathAnalyser; -import org.alfresco.repo.search.impl.lucene.analysis.VerbatimAnalyser; -import org.alfresco.service.ServiceRegistry; -import org.alfresco.service.cmr.dictionary.ClassDefinition; -import org.alfresco.service.cmr.dictionary.Constraint; -import org.alfresco.service.cmr.dictionary.ConstraintDefinition; -import org.alfresco.service.cmr.dictionary.DataTypeDefinition; -import org.alfresco.service.cmr.dictionary.DictionaryService; -import org.alfresco.service.namespace.QName; -import org.apache.chemistry.abdera.ext.utils.ISO8601DateFormat; -import org.apache.chemistry.opencmis.commons.PropertyIds; -import org.apache.chemistry.opencmis.commons.definitions.Choice; -import org.apache.chemistry.opencmis.commons.definitions.PropertyDefinition; -import org.apache.chemistry.opencmis.commons.definitions.TypeDefinition; -import org.apache.chemistry.opencmis.commons.enums.Action; -import org.apache.chemistry.opencmis.commons.enums.BaseTypeId; -import org.apache.chemistry.opencmis.commons.enums.Cardinality; -import org.apache.chemistry.opencmis.commons.enums.PropertyType; -import org.apache.chemistry.opencmis.commons.enums.Updatability; -import org.apache.chemistry.opencmis.commons.impl.dataobjects.AbstractPropertyDefinition; -import org.apache.chemistry.opencmis.commons.impl.dataobjects.AbstractTypeDefinition; -import org.apache.chemistry.opencmis.commons.impl.dataobjects.ChoiceImpl; -import org.apache.chemistry.opencmis.commons.impl.dataobjects.PropertyBooleanDefinitionImpl; -import org.apache.chemistry.opencmis.commons.impl.dataobjects.PropertyDateTimeDefinitionImpl; -import org.apache.chemistry.opencmis.commons.impl.dataobjects.PropertyDecimalDefinitionImpl; -import org.apache.chemistry.opencmis.commons.impl.dataobjects.PropertyHtmlDefinitionImpl; -import org.apache.chemistry.opencmis.commons.impl.dataobjects.PropertyIdDefinitionImpl; -import org.apache.chemistry.opencmis.commons.impl.dataobjects.PropertyIntegerDefinitionImpl; -import org.apache.chemistry.opencmis.commons.impl.dataobjects.PropertyStringDefinitionImpl; -import org.apache.chemistry.opencmis.commons.impl.dataobjects.PropertyUriDefinitionImpl; - -/** - * Base class for type definition wrappers. - * - * @author florian.mueller - */ -public abstract class AbstractTypeDefinitionWrapper implements TypeDefinitionWrapper, Serializable -{ - private static final long serialVersionUID = 1L; - - protected AbstractTypeDefinition typeDef; - protected AbstractTypeDefinition typeDefInclProperties; - - protected TypeDefinitionWrapper parent; - protected List children; - - protected QName alfrescoName = null; - protected QName alfrescoClass = null; - protected Map> actionEvaluators; - - protected Map propertiesById = new HashMap(); - protected Map propertiesByQueryName = new HashMap(); - protected Map propertiesByQName = new HashMap(); - - // interface - - public TypeDefinition getTypeDefinition(boolean includePropertyDefinitions) - { - if (includePropertyDefinitions) - { - return typeDefInclProperties; - } else - { - return typeDef; - } - } - - protected void setTypeDefinition(AbstractTypeDefinition typeDef, AbstractTypeDefinition typeDefInclProperties) - { - this.typeDef = typeDef; - this.typeDefInclProperties = typeDefInclProperties; - } - - @Override - public String getTypeId() - { - return typeDef.getId(); - } - - @Override - public BaseTypeId getBaseTypeId() - { - return typeDef.getBaseTypeId(); - } - - @Override - public boolean isBaseType() - { - return typeDef.getId().equals(typeDef.getBaseTypeId().value()); - } - - @Override - public QName getAlfrescoName() - { - return alfrescoName; - } - - @Override - public QName getAlfrescoClass() - { - return alfrescoClass; - } - - @Override - public TypeDefinitionWrapper getParent() - { - return parent; - } - - @Override - public List getChildren() - { - return children; - } - - @Override - public Map> getActionEvaluators() - { - return actionEvaluators; - } - - @Override - public Collection getProperties() - { - return propertiesById.values(); - } - - @Override - public PropertyDefintionWrapper getPropertyById(String propertyId) - { - return propertiesById.get(propertyId); - } - - @Override - public PropertyDefintionWrapper getPropertyByQueryName(String queryName) - { - return propertiesByQueryName.get(queryName); - } - - @Override - public PropertyDefintionWrapper getPropertyByQName(QName name) - { - return propertiesByQName.get(name); - } - - // create - - public abstract void connectParentAndSubTypes(CMISMapping cmisMapping, DictionaryRegistry registry, - DictionaryService dictionaryService); - - public abstract void resolveInheritance(CMISMapping cmisMapping, ServiceRegistry serviceRegistry, - DictionaryRegistry registry, DictionaryService dictionaryService); - - public void assertComplete() - { - if (typeDef == null) - throw new IllegalStateException("typeDef is not set"); - if (typeDefInclProperties == null) - throw new IllegalStateException("typeDefInclProperties is not set"); - if (alfrescoName == null) - throw new IllegalStateException("alfrescoName is not set"); - if (alfrescoClass == null) - throw new IllegalStateException("alfrescoClass is not set"); - if (propertiesById == null) - throw new IllegalStateException("propertiesById is not set"); - if (propertiesByQueryName == null) - throw new IllegalStateException("propertiesByQueryName is not set"); - if (propertiesByQName == null) - throw new IllegalStateException("propertiesByQName is not set"); - if (propertiesById.size() == 0) - throw new IllegalStateException("property map empty"); - if (propertiesById.size() != propertiesByQueryName.size()) - throw new IllegalStateException("property map mismatch"); - if (propertiesById.size() != propertiesByQName.size()) - throw new IllegalStateException("property map mismatch"); - } - - /** - * Adds all property definitions owned by that type. - */ - protected void createOwningPropertyDefinitions(CMISMapping cmisMapping, ServiceRegistry serviceRegistry, - ClassDefinition cmisClassDef) - { - PropertyDefinition propertyDefintion; - - for (org.alfresco.service.cmr.dictionary.PropertyDefinition alfrescoPropDef : cmisClassDef.getProperties() - .values()) - { - if (!isBaseType()) - { - if (!alfrescoPropDef.getContainerClass().equals(cmisClassDef)) - { - continue; - } - } - - // compile property id - String propertyId = cmisMapping.buildPrefixEncodedString(alfrescoPropDef.getName()); - - // create property definition - propertyDefintion = createPropertyDefinition(cmisMapping, propertyId, alfrescoPropDef.getName(), - alfrescoPropDef, false); - - // if the datatype is not supported, the property defintion will be - // null - if (propertyDefintion != null) - { - AbstractProperty propertyAccessor = cmisMapping.getPropertyAccessor(propertyId); - if (propertyAccessor == null) - { - propertyAccessor = new DirectProperty(serviceRegistry, propertyId, alfrescoPropDef.getName()); - } - - registerProperty(new BasePropertyDefintionWrapper(propertyDefintion, alfrescoPropDef.getName(), this, - propertyAccessor, propertyAccessor)); - } - } - } - - /** - * Registers a property definition with this type - */ - protected void registerProperty(PropertyDefintionWrapper propDefWrapper) - { - if (propDefWrapper == null) - { - return; - } - - if (propertiesById.containsKey(propDefWrapper.getPropertyId())) - { - throw new AlfrescoRuntimeException("Property defintion " + propDefWrapper.getPropertyId() - + " already exists on type " + typeDef.getId()); - } - - propertiesById.put(propDefWrapper.getPropertyId(), propDefWrapper); - propertiesByQueryName.put(propDefWrapper.getPropertyDefinition().getQueryName(), propDefWrapper); - propertiesByQName.put(propDefWrapper.getAlfrescoName(), propDefWrapper); - typeDefInclProperties.addPropertyDefinition(propDefWrapper.getPropertyDefinition()); - } - - /** - * Creates a property definition object. - */ - protected PropertyDefinition createPropertyDefinition(CMISMapping cmisMapping, String id, - QName alfrescoPropName, org.alfresco.service.cmr.dictionary.PropertyDefinition propDef, boolean inherited) - { - PropertyType datatype = cmisMapping.getDataType(propDef.getDataType()); - if (datatype == null) - { - return null; - } - - AbstractPropertyDefinition result = null; - - switch (datatype) - { - case BOOLEAN: - result = new PropertyBooleanDefinitionImpl(); - break; - case DATETIME: - result = new PropertyDateTimeDefinitionImpl(); - break; - case DECIMAL: - result = new PropertyDecimalDefinitionImpl(); - break; - case HTML: - result = new PropertyHtmlDefinitionImpl(); - break; - case ID: - result = new PropertyIdDefinitionImpl(); - break; - case INTEGER: - result = new PropertyIntegerDefinitionImpl(); - break; - case STRING: - result = new PropertyStringDefinitionImpl(); - break; - case URI: - result = new PropertyUriDefinitionImpl(); - break; - default: - throw new RuntimeException("Unknown datatype! Spec change?"); - } - - if (id.equals(PropertyIds.OBJECT_TYPE_ID) || id.equals(PropertyIds.SOURCE_ID) - || id.equals(PropertyIds.TARGET_ID)) - { - // the CMIS spec requirement - result.setUpdatability(Updatability.ONCREATE); - } else - { - result.setUpdatability(propDef.isProtected() ? Updatability.READONLY : Updatability.READWRITE); - } - - result.setId(id); - result.setLocalName(alfrescoPropName.getLocalName()); - result.setLocalNamespace(alfrescoPropName.getNamespaceURI()); - result.setDisplayName(propDef.getTitle() != null ? propDef.getTitle() : id); - result.setDescription(propDef.getDescription() != null ? propDef.getDescription() : result.getDisplayName()); - result.setPropertyType(datatype); - result.setCardinality(propDef.isMultiValued() ? Cardinality.MULTI : Cardinality.SINGLE); - result.setIsInherited(inherited); - result.setIsRequired(propDef.isMandatory()); - addDefaultValue(propDef.getDefaultValue(), result); - - // query and order - result.setQueryName(cmisMapping.buildPrefixEncodedString(alfrescoPropName)); - result.setIsQueryable(propDef.isIndexed()); - result.setIsOrderable(false); - - if (result.isQueryable()) - { - if (result.getCardinality() == Cardinality.SINGLE) - { - IndexTokenisationMode indexTokenisationMode = IndexTokenisationMode.TRUE; - if (propDef.getIndexTokenisationMode() != null) - { - indexTokenisationMode = propDef.getIndexTokenisationMode(); - } - - switch (indexTokenisationMode) - { - case BOTH: - case FALSE: - result.setIsOrderable(true); - break; - case TRUE: - default: - String analyserClassName = propDef.getDataType().getAnalyserClassName(); - if (propDef.getDataType().getName().equals(DataTypeDefinition.BOOLEAN)) - { - result.setIsOrderable(true); - } else if (analyserClassName.equals(DateTimeAnalyser.class.getCanonicalName()) - || analyserClassName.equals(DateAnalyser.class.getCanonicalName()) - || analyserClassName.equals(DoubleAnalyser.class.getCanonicalName()) - || analyserClassName.equals(FloatAnalyser.class.getCanonicalName()) - || analyserClassName.equals(IntegerAnalyser.class.getCanonicalName()) - || analyserClassName.equals(LongAnalyser.class.getCanonicalName()) - || analyserClassName.equals(PathAnalyser.class.getCanonicalName()) - || analyserClassName.equals(VerbatimAnalyser.class.getCanonicalName())) - { - result.setIsOrderable(true); - } - } - } - } - - // constraints and choices - for (ConstraintDefinition constraintDef : propDef.getConstraints()) - { - Constraint constraint = constraintDef.getConstraint(); - if (constraint instanceof ListOfValuesConstraint) - { - addChoiceList((ListOfValuesConstraint) constraint, result); - } - - if ((constraint instanceof StringLengthConstraint) && (result instanceof PropertyStringDefinitionImpl)) - { - StringLengthConstraint slc = (StringLengthConstraint) constraint; - ((PropertyStringDefinitionImpl) result).setMaxLength(BigInteger.valueOf(slc.getMaxLength())); - } - - if (constraint instanceof NumericRangeConstraint) - { - NumericRangeConstraint nrc = (NumericRangeConstraint) constraint; - if (result instanceof PropertyIntegerDefinitionImpl) - { - ((PropertyIntegerDefinitionImpl) result) - .setMinValue(BigInteger.valueOf(((Double) nrc.getMinValue()).longValue())); - ((PropertyIntegerDefinitionImpl) result) - .setMaxValue(BigInteger.valueOf(((Double) nrc.getMaxValue()).longValue())); - } - if (result instanceof PropertyDecimalDefinitionImpl) - { - ((PropertyDecimalDefinitionImpl) result).setMinValue(BigDecimal.valueOf(nrc.getMinValue())); - ((PropertyDecimalDefinitionImpl) result).setMaxValue(BigDecimal.valueOf(nrc.getMaxValue())); - } - } - } - - return result; - } - - @SuppressWarnings("unchecked") - private T convertValueFromString(String value, PropertyType datatype) - { - if (value == null) - { - return null; - } - - switch (datatype) - { - case BOOLEAN: - return (T) Boolean.valueOf(value); - case DATETIME: - GregorianCalendar cal = new GregorianCalendar(); - cal.setTime(ISO8601DateFormat.parse(value)); - return (T) cal; - case DECIMAL: - return (T) new BigDecimal(value); - case HTML: - return (T) value; - case ID: - return (T) value; - case INTEGER: - return (T) new BigInteger(value); - case STRING: - return (T) value; - case URI: - return (T) value; - default: - throw new RuntimeException("Unknown datatype! Spec change?"); - } - } - - /** - * Adds the default value to a property definition. - */ - private void addDefaultValue(String value, PropertyDefinition propDef) - { - if (value == null) - { - return; - } - - if (propDef instanceof PropertyBooleanDefinitionImpl) - { - PropertyBooleanDefinitionImpl propDefImpl = (PropertyBooleanDefinitionImpl) propDef; - propDefImpl.setDefaultValue(Collections.singletonList((Boolean) convertValueFromString(value, - PropertyType.BOOLEAN))); - } else if (propDef instanceof PropertyDateTimeDefinitionImpl) - { - PropertyDateTimeDefinitionImpl propDefImpl = (PropertyDateTimeDefinitionImpl) propDef; - propDefImpl.setDefaultValue(Collections.singletonList((GregorianCalendar) convertValueFromString(value, - PropertyType.DATETIME))); - } else if (propDef instanceof PropertyDecimalDefinitionImpl) - { - PropertyDecimalDefinitionImpl propDefImpl = (PropertyDecimalDefinitionImpl) propDef; - propDefImpl.setDefaultValue(Collections.singletonList((BigDecimal) convertValueFromString(value, - PropertyType.DECIMAL))); - } else if (propDef instanceof PropertyHtmlDefinitionImpl) - { - PropertyHtmlDefinitionImpl propDefImpl = (PropertyHtmlDefinitionImpl) propDef; - propDefImpl.setDefaultValue(Collections.singletonList((String) convertValueFromString(value, - PropertyType.HTML))); - } else if (propDef instanceof PropertyIdDefinitionImpl) - { - PropertyIdDefinitionImpl propDefImpl = (PropertyIdDefinitionImpl) propDef; - propDefImpl.setDefaultValue(Collections.singletonList((String) convertValueFromString(value, - PropertyType.ID))); - } else if (propDef instanceof PropertyIntegerDefinitionImpl) - { - PropertyIntegerDefinitionImpl propDefImpl = (PropertyIntegerDefinitionImpl) propDef; - propDefImpl.setDefaultValue(Collections.singletonList((BigInteger) convertValueFromString(value, - PropertyType.INTEGER))); - } else if (propDef instanceof PropertyStringDefinitionImpl) - { - PropertyStringDefinitionImpl propDefImpl = (PropertyStringDefinitionImpl) propDef; - propDefImpl.setDefaultValue(Collections.singletonList((String) convertValueFromString(value, - PropertyType.STRING))); - } else if (propDef instanceof PropertyUriDefinitionImpl) - { - PropertyUriDefinitionImpl propDefImpl = (PropertyUriDefinitionImpl) propDef; - propDefImpl.setDefaultValue(Collections.singletonList((String) convertValueFromString(value, - PropertyType.URI))); - } - } - - /** - * Adds choices to the property defintion. - */ - private void addChoiceList(ListOfValuesConstraint lovc, PropertyDefinition propDef) - { - if (propDef instanceof PropertyBooleanDefinitionImpl) - { - PropertyBooleanDefinitionImpl propDefImpl = (PropertyBooleanDefinitionImpl) propDef; - propDefImpl.setIsOpenChoice(false); - - List> choiceList = new ArrayList>(); - for (String allowed : lovc.getAllowedValues()) - { - ChoiceImpl choice = new ChoiceImpl(); - choice.setDisplayName(allowed); - choice.setValue(Collections.singletonList((Boolean) convertValueFromString(allowed, - PropertyType.BOOLEAN))); - - choiceList.add(choice); - } - - propDefImpl.setChoices(choiceList); - } else if (propDef instanceof PropertyDateTimeDefinitionImpl) - { - PropertyDateTimeDefinitionImpl propDefImpl = (PropertyDateTimeDefinitionImpl) propDef; - propDefImpl.setIsOpenChoice(false); - - List> choiceList = new ArrayList>(); - for (String allowed : lovc.getAllowedValues()) - { - ChoiceImpl choice = new ChoiceImpl(); - choice.setDisplayName(allowed); - choice.setValue(Collections.singletonList((GregorianCalendar) convertValueFromString(allowed, - PropertyType.DATETIME))); - - choiceList.add(choice); - } - - propDefImpl.setChoices(choiceList); - } else if (propDef instanceof PropertyDecimalDefinitionImpl) - { - PropertyDecimalDefinitionImpl propDefImpl = (PropertyDecimalDefinitionImpl) propDef; - propDefImpl.setIsOpenChoice(false); - - List> choiceList = new ArrayList>(); - for (String allowed : lovc.getAllowedValues()) - { - ChoiceImpl choice = new ChoiceImpl(); - choice.setDisplayName(allowed); - choice.setValue(Collections.singletonList((BigDecimal) convertValueFromString(allowed, - PropertyType.DECIMAL))); - - choiceList.add(choice); - } - - propDefImpl.setChoices(choiceList); - } else if (propDef instanceof PropertyHtmlDefinitionImpl) - { - PropertyHtmlDefinitionImpl propDefImpl = (PropertyHtmlDefinitionImpl) propDef; - propDefImpl.setIsOpenChoice(false); - - List> choiceList = new ArrayList>(); - for (String allowed : lovc.getAllowedValues()) - { - ChoiceImpl choice = new ChoiceImpl(); - choice.setDisplayName(allowed); - choice.setValue(Collections.singletonList((String) convertValueFromString(allowed, PropertyType.HTML))); - - choiceList.add(choice); - } - - propDefImpl.setChoices(choiceList); - } else if (propDef instanceof PropertyIdDefinitionImpl) - { - PropertyIdDefinitionImpl propDefImpl = (PropertyIdDefinitionImpl) propDef; - propDefImpl.setIsOpenChoice(false); - - List> choiceList = new ArrayList>(); - for (String allowed : lovc.getAllowedValues()) - { - ChoiceImpl choice = new ChoiceImpl(); - choice.setDisplayName(allowed); - choice.setValue(Collections.singletonList((String) convertValueFromString(allowed, PropertyType.ID))); - - choiceList.add(choice); - } - - propDefImpl.setChoices(choiceList); - } else if (propDef instanceof PropertyIntegerDefinitionImpl) - { - PropertyIntegerDefinitionImpl propDefImpl = (PropertyIntegerDefinitionImpl) propDef; - propDefImpl.setIsOpenChoice(false); - - List> choiceList = new ArrayList>(); - for (String allowed : lovc.getAllowedValues()) - { - ChoiceImpl choice = new ChoiceImpl(); - choice.setDisplayName(allowed); - choice.setValue(Collections.singletonList((BigInteger) convertValueFromString(allowed, - PropertyType.INTEGER))); - - choiceList.add(choice); - } - - propDefImpl.setChoices(choiceList); - } else if (propDef instanceof PropertyStringDefinitionImpl) - { - PropertyStringDefinitionImpl propDefImpl = (PropertyStringDefinitionImpl) propDef; - propDefImpl.setIsOpenChoice(false); - - List> choiceList = new ArrayList>(); - for (String allowed : lovc.getAllowedValues()) - { - ChoiceImpl choice = new ChoiceImpl(); - choice.setDisplayName(allowed); - choice.setValue(Collections - .singletonList((String) convertValueFromString(allowed, PropertyType.STRING))); - - choiceList.add(choice); - } - - propDefImpl.setChoices(choiceList); - } else if (propDef instanceof PropertyUriDefinitionImpl) - { - PropertyUriDefinitionImpl propDefImpl = (PropertyUriDefinitionImpl) propDef; - propDefImpl.setIsOpenChoice(false); - - List> choiceList = new ArrayList>(); - for (String allowed : lovc.getAllowedValues()) - { - ChoiceImpl choice = new ChoiceImpl(); - choice.setDisplayName(allowed); - choice.setValue(Collections.singletonList((String) convertValueFromString(allowed, PropertyType.URI))); - - choiceList.add(choice); - } - - propDefImpl.setChoices(choiceList); - } - } -} diff --git a/source/java/org/alfresco/opencmis/dictionary/BasePropertyDefintionWrapper.java b/source/java/org/alfresco/opencmis/dictionary/BasePropertyDefintionWrapper.java deleted file mode 100644 index f47506f9ab..0000000000 --- a/source/java/org/alfresco/opencmis/dictionary/BasePropertyDefintionWrapper.java +++ /dev/null @@ -1,84 +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 . - */ -package org.alfresco.opencmis.dictionary; - -import java.io.Serializable; - -import org.alfresco.cmis.CMISPropertyAccessor; -import org.alfresco.cmis.CMISPropertyLuceneBuilder; -import org.alfresco.service.namespace.QName; -import org.apache.chemistry.opencmis.commons.definitions.PropertyDefinition; - -public class BasePropertyDefintionWrapper implements PropertyDefintionWrapper, Serializable -{ - private static final long serialVersionUID = 1L; - - private PropertyDefinition propDef; - private QName alfrescoName; - private TypeDefinitionWrapper owningType; - private CMISPropertyAccessor accessor; - private CMISPropertyLuceneBuilder luceneBuilder; - - public BasePropertyDefintionWrapper(PropertyDefinition propDef, QName alfrescoName, - TypeDefinitionWrapper owningType, CMISPropertyAccessor accessor, CMISPropertyLuceneBuilder luceneBuilder) - { - this.propDef = propDef; - this.alfrescoName = alfrescoName; - this.owningType = owningType; - this.accessor = accessor; - this.luceneBuilder = luceneBuilder; - } - - @Override - public PropertyDefinition getPropertyDefinition() - { - return propDef; - } - - @Override - public String getPropertyId() - { - return propDef.getId(); - } - - @Override - public QName getAlfrescoName() - { - return alfrescoName; - } - - @Override - public TypeDefinitionWrapper getOwningType() - { - return owningType; - } - - @Override - public CMISPropertyAccessor getPropertyAccessor() - { - return accessor; - } - - @Override - public CMISPropertyLuceneBuilder getPropertyLuceneBuilder() - { - return luceneBuilder; - } - -} diff --git a/source/java/org/alfresco/opencmis/dictionary/CMISAbstractDictionaryService.java b/source/java/org/alfresco/opencmis/dictionary/CMISAbstractDictionaryService.java deleted file mode 100644 index dcea262168..0000000000 --- a/source/java/org/alfresco/opencmis/dictionary/CMISAbstractDictionaryService.java +++ /dev/null @@ -1,428 +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 . - */ -package org.alfresco.opencmis.dictionary; - -import java.util.ArrayList; -import java.util.Collections; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.concurrent.ConcurrentHashMap; - -import org.alfresco.error.AlfrescoRuntimeException; -import org.alfresco.opencmis.mapping.CMISMapping; -import org.alfresco.repo.dictionary.DictionaryDAO; -import org.alfresco.repo.dictionary.DictionaryListener; -import org.alfresco.repo.tenant.TenantService; -import org.alfresco.service.ServiceRegistry; -import org.alfresco.service.cmr.dictionary.DictionaryService; -import org.alfresco.service.namespace.QName; -import org.apache.chemistry.opencmis.commons.enums.BaseTypeId; -import org.apache.chemistry.opencmis.commons.enums.PropertyType; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.springframework.context.ApplicationEvent; -import org.springframework.extensions.surf.util.AbstractLifecycleBean; - -/** - * Common CMIS Dictionary Support including registry of Types. - * - * @author davidc - * @author florian.mueller - */ -public abstract class CMISAbstractDictionaryService extends AbstractLifecycleBean implements CMISDictionaryService, - DictionaryListener -{ - // Logger - protected static final Log logger = LogFactory.getLog(CMISAbstractDictionaryService.class); - - // service dependencies - private DictionaryDAO dictionaryDAO; - protected CMISMapping cmisMapping; - protected DictionaryService dictionaryService; - protected TenantService tenantService; - protected ServiceRegistry serviceRegistry; - - /** - * Set the mapping service - * - * @param cmisMapping - */ - public void setOpenCMISMapping(CMISMapping cmisMapping) - { - this.cmisMapping = cmisMapping; - } - - /** - * Set the dictionary Service - * - * @param dictionaryService - */ - public void setDictionaryService(DictionaryService dictionaryService) - { - this.dictionaryService = dictionaryService; - } - - /** - * Set the dictionary DAO - * - * @param dictionaryDAO - */ - public void setDictionaryDAO(DictionaryDAO dictionaryDAO) - { - this.dictionaryDAO = dictionaryDAO; - } - - /** - * Set the tenant Service - * - * @param tenantService - */ - public void setTenantService(TenantService tenantService) - { - this.tenantService = tenantService; - } - - /** - * Set the service registry - * - * @param serviceRegistry - */ - public void setServiceRegistry(ServiceRegistry serviceRegistry) - { - this.serviceRegistry = serviceRegistry; - } - - /** CMIS Dictionary Registry (tenant-aware) */ - private Map registryMap = new ConcurrentHashMap(4); - - /** - * CMIS Dictionary registry - * - * Index of CMIS Type Definitions - */ - /* package */class DictionaryRegistry - { - // Type Definitions Index - Map typeDefsByQName = new HashMap(); - Map assocDefsByQName = new HashMap(); - - Map typeDefsByTypeId = new HashMap(); - Map typeDefsByQueryName = new HashMap(); - List baseTypes = new ArrayList(); - - Map propDefbyPropId = new HashMap(); - Map propDefbyQueryName = new HashMap(); - - /** - * Register type definition. - * - * @param typeDef - */ - public void registerTypeDefinition(AbstractTypeDefinitionWrapper typeDef) - { - AbstractTypeDefinitionWrapper existingTypeDef = typeDefsByTypeId.get(typeDef.getTypeId()); - if (existingTypeDef != null) - { - throw new AlfrescoRuntimeException("Type " + typeDef.getTypeId() + " already registered"); - } - - typeDefsByTypeId.put(typeDef.getTypeId(), typeDef); - QName typeQName = typeDef.getAlfrescoName(); - if (typeQName != null) - { - if ((typeDef instanceof RelationshipTypeDefintionWrapper) && !typeDef.isBaseType()) - { - assocDefsByQName.put(typeQName, typeDef); - } else - { - typeDefsByQName.put(typeQName, typeDef); - } - } - - typeDefsByQueryName.put(typeDef.getTypeDefinition(false).getQueryName(), typeDef); - - if (logger.isDebugEnabled()) - { - logger.debug("Registered type " + typeDef.getTypeId() + " (scope=" + typeDef.getBaseTypeId() + ")"); - logger.debug(" QName: " + typeDef.getAlfrescoName()); - logger.debug(" Table: " + typeDef.getTypeDefinition(false).getQueryName()); - logger.debug(" Action Evaluators: " + typeDef.getActionEvaluators().size()); - } - } - - /** - * Register property definitions. - * - * @param typeDef - */ - public void registerPropertyDefinitions(AbstractTypeDefinitionWrapper typeDef) - { - for (PropertyDefintionWrapper propDef : typeDef.getProperties()) - { - if (propDef.getPropertyDefinition().isInherited()) - { - continue; - } - - propDefbyPropId.put(propDef.getPropertyId(), propDef); - propDefbyQueryName.put(propDef.getPropertyDefinition().getQueryName(), propDef); - } - } - - /* - * (non-Javadoc) - * - * @see java.lang.Object#toString() - */ - @Override - public String toString() - { - StringBuilder builder = new StringBuilder(); - builder.append("DictionaryRegistry["); - builder.append("Types=").append(typeDefsByTypeId.size()).append(", "); - builder.append("Base Types=").append(baseTypes.size()).append(", "); - builder.append("]"); - return builder.toString(); - } - } - - private DictionaryRegistry getRegistry() - { - String tenantDomain = tenantService.getCurrentUserDomain(); - DictionaryRegistry registry = registryMap.get(tenantDomain); - if (registry == null) - { - init(); - registry = registryMap.get(tenantDomain); - } - return registry; - } - - public TypeDefinitionWrapper findType(String typeId) - { - return getRegistry().typeDefsByTypeId.get(typeId); - } - - public TypeDefinitionWrapper findTypeForClass(QName clazz, BaseTypeId... matchingScopes) - { - // searching for relationship - boolean scopeByRelationship = false; - for (BaseTypeId scope : matchingScopes) - { - if (scope == BaseTypeId.CMIS_RELATIONSHIP) - { - scopeByRelationship = true; - break; - } - } - - // locate type in registry - clazz = cmisMapping.getCmisType(clazz); - TypeDefinitionWrapper typeDef = null; - if (scopeByRelationship) - { - typeDef = getRegistry().assocDefsByQName.get(clazz); - } else - { - typeDef = getRegistry().typeDefsByQName.get(clazz); - if (typeDef == null) - { - typeDef = getRegistry().assocDefsByQName.get(clazz); - } - } - - // ensure matches one of provided matching scopes - TypeDefinitionWrapper matchingTypeDef = (matchingScopes.length == 0) ? typeDef : null; - if (typeDef != null) - { - for (BaseTypeId scope : matchingScopes) - { - if (typeDef.getBaseTypeId() == scope) - { - matchingTypeDef = typeDef; - break; - } - } - } - - return matchingTypeDef; - } - - public TypeDefinitionWrapper findNodeType(QName clazz) - { - return getRegistry().typeDefsByQName.get(cmisMapping.getCmisType(clazz)); - } - - public TypeDefinitionWrapper findAssocType(QName clazz) - { - return getRegistry().assocDefsByQName.get(cmisMapping.getCmisType(clazz)); - } - - public TypeDefinitionWrapper findTypeByQueryName(String queryName) - { - return getRegistry().typeDefsByQueryName.get(queryName); - } - - public QName getAlfrescoClass(QName name) - { - return cmisMapping.getAlfrescoClass(name); - } - - public PropertyDefintionWrapper findProperty(String propId) - { - return getRegistry().propDefbyPropId.get(propId); - } - - @Override - public PropertyDefintionWrapper findPropertyByQueryName(String queryName) - { - return getRegistry().propDefbyQueryName.get(queryName); - } - - public List getBaseTypes() - { - return Collections.unmodifiableList(getRegistry().baseTypes); - } - - public List getAllTypes() - { - return Collections.unmodifiableList(new ArrayList(getRegistry().typeDefsByTypeId - .values())); - } - - public PropertyType findDataType(QName dataType) - { - return cmisMapping.getDataType(dataType); - } - - public QName findAlfrescoDataType(PropertyType propertyType) - { - return cmisMapping.getAlfrescoDataType(propertyType); - } - - /** - * Factory for creating CMIS Definitions - * - * @param registry - */ - abstract protected void createDefinitions(DictionaryRegistry registry); - - /** - * Dictionary Initialization - creates a new registry - */ - private void init() - { - DictionaryRegistry registry = new DictionaryRegistry(); - - if (logger.isDebugEnabled()) - logger.debug("Creating type definitions..."); - - // phase 1: construct type definitions and link them together - createDefinitions(registry); - for (AbstractTypeDefinitionWrapper objectTypeDef : registry.typeDefsByTypeId.values()) - { - objectTypeDef.connectParentAndSubTypes(cmisMapping, registry, dictionaryService); - } - - // phase 2: register base types and inherit property definitions - for (AbstractTypeDefinitionWrapper typeDef : registry.typeDefsByTypeId.values()) - { - if (typeDef.getTypeDefinition(false).getParentTypeId() == null) - { - registry.baseTypes.add(typeDef); - typeDef.resolveInheritance(cmisMapping, serviceRegistry, registry, dictionaryService); - } - } - - // phase 3: register properties - for (AbstractTypeDefinitionWrapper typeDef : registry.typeDefsByTypeId.values()) - { - registry.registerPropertyDefinitions(typeDef); - } - - // phase 4: assert valid - for (AbstractTypeDefinitionWrapper typeDef : registry.typeDefsByTypeId.values()) - { - typeDef.assertComplete(); - } - - // publish new registry - registryMap.put(tenantService.getCurrentUserDomain(), registry); - - if (logger.isInfoEnabled()) - logger.info("Initialized CMIS Dictionary. Types:" + registry.typeDefsByTypeId.size() + ", Base Types:" - + registry.baseTypes.size()); - } - - /* - * (non-Javadoc) - * - * @see org.alfresco.repo.dictionary.DictionaryListener#onInit() - */ - public void onDictionaryInit() - { - } - - /* - * (non-Javadoc) - * - * @see org.alfresco.repo.dictionary.DictionaryListener#afterInit() - */ - public void afterDictionaryInit() - { - init(); - } - - /* - * (non-Javadoc) - * - * @see - * org.alfresco.repo.dictionary.DictionaryListener#afterDictionaryDestroy() - */ - public void afterDictionaryDestroy() - { - registryMap.remove(tenantService.getCurrentUserDomain()); - } - - /* - * (non-Javadoc) - * - * @see - * org.springframework.extensions.surf.util.AbstractLifecycleBean#onBootstrap - * (org.springframework.context.ApplicationEvent) - */ - protected void onBootstrap(ApplicationEvent event) - { - afterDictionaryInit(); - dictionaryDAO.register(this); - } - - /* - * (non-Javadoc) - * - * @see - * org.springframework.extensions.surf.util.AbstractLifecycleBean#onShutdown - * (org.springframework.context.ApplicationEvent) - */ - protected void onShutdown(ApplicationEvent event) - { - } - -} diff --git a/source/java/org/alfresco/opencmis/dictionary/CMISDictionaryService.java b/source/java/org/alfresco/opencmis/dictionary/CMISDictionaryService.java deleted file mode 100644 index 715ad3292f..0000000000 --- a/source/java/org/alfresco/opencmis/dictionary/CMISDictionaryService.java +++ /dev/null @@ -1,89 +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 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 License for more details. - * - * You should have received a copy of the GNU Lesser General License - * along with Alfresco. If not, see . - */ -package org.alfresco.opencmis.dictionary; - -import java.util.List; - -import org.alfresco.service.namespace.QName; -import org.apache.chemistry.opencmis.commons.enums.BaseTypeId; -import org.apache.chemistry.opencmis.commons.enums.PropertyType; - -/** - * Service to query the CMIS meta model - * - * @author davidc - */ -public interface CMISDictionaryService -{ - /** - * Find type for type id - * - * @param typeId - * @return - */ - TypeDefinitionWrapper findType(String typeId); - - /** - * Find type for Alfresco class name. Optionally, constrain match to one of - * specified CMIS scopes - * - * @param clazz - * @param matchingScopes - * @return - */ - TypeDefinitionWrapper findTypeForClass(QName clazz, BaseTypeId... matchingScopes); - - TypeDefinitionWrapper findNodeType(QName clazz); - - TypeDefinitionWrapper findAssocType(QName clazz); - - PropertyDefintionWrapper findProperty(String propId); - - PropertyDefintionWrapper findPropertyByQueryName(String queryName); - - /** - * Find a type by its query name - * - * @param queryName - * @return - */ - TypeDefinitionWrapper findTypeByQueryName(String queryName); - - /** - * Get Base Types - */ - List getBaseTypes(); - - /** - * Get all Types - * - * @return - */ - List getAllTypes(); - - /** - * Find data type - * - * @param dataType - * @return - */ - PropertyType findDataType(QName dataType); - - QName findAlfrescoDataType(PropertyType propertyType); -} diff --git a/source/java/org/alfresco/opencmis/dictionary/CMISStrictDictionaryService.java b/source/java/org/alfresco/opencmis/dictionary/CMISStrictDictionaryService.java deleted file mode 100644 index c4a97b1e44..0000000000 --- a/source/java/org/alfresco/opencmis/dictionary/CMISStrictDictionaryService.java +++ /dev/null @@ -1,117 +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 . - */ -package org.alfresco.opencmis.dictionary; - -import java.util.Collection; - -import org.alfresco.cmis.mapping.CMISMapping; -import org.alfresco.service.cmr.dictionary.AssociationDefinition; -import org.alfresco.service.cmr.dictionary.ClassDefinition; -import org.alfresco.service.namespace.QName; -import org.apache.chemistry.opencmis.commons.enums.BaseTypeId; - -/** - * CMIS Dictionary which provides Types that strictly conform to the CMIS - * specification. - * - * That is, only maps types to one of root Document, Folder, Relationship & - * Policy. - * - * @author davidc - */ -public class CMISStrictDictionaryService extends CMISAbstractDictionaryService -{ - - @Override - protected void createDefinitions(DictionaryRegistry registry) - { - createTypeDefs(registry, dictionaryService.getAllTypes()); - createAssocDefs(registry, dictionaryService.getAllAssociations()); - createTypeDefs(registry, dictionaryService.getAllAspects()); - } - - /** - * Create Type Definitions - * - * @param registry - * @param classQNames - */ - private void createTypeDefs(DictionaryRegistry registry, Collection classQNames) - { - for (QName classQName : classQNames) - { - // skip items that are remapped to CMIS model - if (cmisMapping.isRemappedType(classQName)) - continue; - - // create appropriate kind of type definition - ClassDefinition classDef = dictionaryService.getClass(classQName); - String typeId = null; - AbstractTypeDefinitionWrapper objectTypeDef = null; - if (cmisMapping.isValidCmisDocument(classQName)) - { - typeId = cmisMapping.getCmisTypeId(BaseTypeId.CMIS_DOCUMENT, classQName); - objectTypeDef = new DocumentTypeDefinitionWrapper(cmisMapping, serviceRegistry, typeId, classDef); - } else if (cmisMapping.isValidCmisFolder(classQName)) - { - typeId = cmisMapping.getCmisTypeId(BaseTypeId.CMIS_FOLDER, classQName); - objectTypeDef = new FolderTypeDefintionWrapper(cmisMapping, serviceRegistry, typeId, classDef); - } else if (cmisMapping.isValidCmisPolicy(classQName)) - { - typeId = cmisMapping.getCmisTypeId(BaseTypeId.CMIS_POLICY, classQName); - objectTypeDef = new PolicyTypeDefintionWrapper(cmisMapping, serviceRegistry, typeId, classDef); - } - - if (objectTypeDef != null) - { - registry.registerTypeDefinition(objectTypeDef); - } - } - } - - /** - * Create Relationship Definitions - * - * @param registry - * @param classQNames - */ - private void createAssocDefs(DictionaryRegistry registry, Collection classQNames) - { - // register base type - String typeId = cmisMapping.getCmisTypeId(BaseTypeId.CMIS_RELATIONSHIP, CMISMapping.RELATIONSHIP_QNAME); - RelationshipTypeDefintionWrapper objectTypeDef = new RelationshipTypeDefintionWrapper(cmisMapping, - serviceRegistry, typeId, dictionaryService.getClass(CMISMapping.RELATIONSHIP_QNAME)); - - registry.registerTypeDefinition(objectTypeDef); - - // register all other relationships - for (QName classQName : classQNames) - { - if (!cmisMapping.isValidCmisRelationship(classQName)) - continue; - - // create appropriate kind of type definition - AssociationDefinition assocDef = dictionaryService.getAssociation(classQName); - typeId = cmisMapping.getCmisTypeId(BaseTypeId.CMIS_RELATIONSHIP, classQName); - objectTypeDef = new RelationshipTypeDefintionWrapper(cmisMapping, typeId, assocDef); - - registry.registerTypeDefinition(objectTypeDef); - } - } -} diff --git a/source/java/org/alfresco/opencmis/dictionary/DocumentTypeDefinitionWrapper.java b/source/java/org/alfresco/opencmis/dictionary/DocumentTypeDefinitionWrapper.java deleted file mode 100644 index 80d1b21b2e..0000000000 --- a/source/java/org/alfresco/opencmis/dictionary/DocumentTypeDefinitionWrapper.java +++ /dev/null @@ -1,85 +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 . - */ -package org.alfresco.opencmis.dictionary; - -import org.alfresco.opencmis.CMISUtils; -import org.alfresco.opencmis.mapping.CMISMapping; -import org.alfresco.service.ServiceRegistry; -import org.alfresco.service.cmr.dictionary.ClassDefinition; -import org.alfresco.service.namespace.QName; -import org.apache.chemistry.opencmis.commons.enums.BaseTypeId; -import org.apache.chemistry.opencmis.commons.enums.ContentStreamAllowed; -import org.apache.chemistry.opencmis.commons.impl.dataobjects.DocumentTypeDefinitionImpl; - -public class DocumentTypeDefinitionWrapper extends ShadowTypeDefinitionWrapper -{ - private static final long serialVersionUID = 1L; - - private DocumentTypeDefinitionImpl typeDef; - private DocumentTypeDefinitionImpl typeDefInclProperties; - - public DocumentTypeDefinitionWrapper(CMISMapping cmisMapping, ServiceRegistry serviceRegistry, String typeId, - ClassDefinition cmisClassDef) - { - alfrescoName = cmisClassDef.getName(); - alfrescoClass = cmisMapping.getAlfrescoClass(alfrescoName); - - typeDef = new DocumentTypeDefinitionImpl(); - - typeDef.setBaseTypeId(BaseTypeId.CMIS_DOCUMENT); - typeDef.setId(typeId); - typeDef.setLocalName(alfrescoName.getLocalName()); - typeDef.setLocalNamespace(alfrescoName.getNamespaceURI()); - - if (BaseTypeId.CMIS_DOCUMENT.value().equals(typeId)) - { - typeDef.setQueryName(typeId); - typeDef.setParentTypeId(null); - } else - { - typeDef.setQueryName(cmisMapping.buildPrefixEncodedString(alfrescoName)); - QName parentQName = cmisMapping.getCmisType(cmisClassDef.getParentName()); - if (cmisMapping.isValidCmisDocument(parentQName)) - { - typeDef.setParentTypeId(cmisMapping.getCmisTypeId(BaseTypeId.CMIS_DOCUMENT, parentQName)); - } - } - - typeDef.setDisplayName((cmisClassDef.getTitle() != null) ? cmisClassDef.getTitle() : typeId); - typeDef.setDescription(cmisClassDef.getDescription() != null ? cmisClassDef.getDescription() : typeDef - .getDisplayName()); - - typeDef.setIsCreatable(true); - typeDef.setIsQueryable(true); - typeDef.setIsFulltextIndexed(true); - typeDef.setIsControllablePolicy(false); - typeDef.setIsControllableAcl(true); - typeDef.setIsIncludedInSupertypeQuery(cmisClassDef.getIncludedInSuperTypeQuery()); - typeDef.setIsFileable(true); - typeDef.setContentStreamAllowed(ContentStreamAllowed.ALLOWED); - typeDef.setIsVersionable(true); - - typeDefInclProperties = CMISUtils.copy(typeDef); - setTypeDefinition(typeDef, typeDefInclProperties); - - createOwningPropertyDefinitions(cmisMapping, serviceRegistry, cmisClassDef); - - actionEvaluators = cmisMapping.getActionEvaluators(BaseTypeId.CMIS_DOCUMENT); - } -} diff --git a/source/java/org/alfresco/opencmis/dictionary/FolderTypeDefintionWrapper.java b/source/java/org/alfresco/opencmis/dictionary/FolderTypeDefintionWrapper.java deleted file mode 100644 index a45de14daf..0000000000 --- a/source/java/org/alfresco/opencmis/dictionary/FolderTypeDefintionWrapper.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 . - */ -package org.alfresco.opencmis.dictionary; - -import org.alfresco.model.ContentModel; -import org.alfresco.opencmis.CMISUtils; -import org.alfresco.opencmis.mapping.CMISMapping; -import org.alfresco.service.ServiceRegistry; -import org.alfresco.service.cmr.dictionary.ClassDefinition; -import org.alfresco.service.namespace.QName; -import org.apache.chemistry.opencmis.commons.enums.BaseTypeId; -import org.apache.chemistry.opencmis.commons.impl.dataobjects.FolderTypeDefinitionImpl; - -public class FolderTypeDefintionWrapper extends ShadowTypeDefinitionWrapper -{ - private static final long serialVersionUID = 1L; - - private FolderTypeDefinitionImpl typeDef; - private FolderTypeDefinitionImpl typeDefInclProperties; - - public FolderTypeDefintionWrapper(CMISMapping cmisMapping, ServiceRegistry serviceRegistry, String typeId, - ClassDefinition cmisClassDef) - { - alfrescoName = cmisClassDef.getName(); - alfrescoClass = cmisMapping.getAlfrescoClass(alfrescoName); - - typeDef = new FolderTypeDefinitionImpl(); - - typeDef.setBaseTypeId(BaseTypeId.CMIS_FOLDER); - typeDef.setId(typeId); - typeDef.setLocalName(alfrescoName.getLocalName()); - typeDef.setLocalNamespace(alfrescoName.getNamespaceURI()); - - boolean isSystemFolder = false; - if (BaseTypeId.CMIS_FOLDER.value().equals(typeId)) - { - typeDef.setQueryName(typeId); - typeDef.setParentTypeId(null); - } else - { - typeDef.setQueryName(cmisMapping.buildPrefixEncodedString(alfrescoName)); - QName parentQName = cmisMapping.getCmisType(cmisClassDef.getParentName()); - if (cmisMapping.isValidCmisFolder(parentQName)) - { - typeDef.setParentTypeId(cmisMapping.getCmisTypeId(BaseTypeId.CMIS_FOLDER, parentQName)); - } - - if (alfrescoName.equals(ContentModel.TYPE_SYSTEM_FOLDER) - || serviceRegistry.getDictionaryService().isSubClass(alfrescoName, ContentModel.TYPE_SYSTEM_FOLDER)) - { - isSystemFolder = true; - } - } - - typeDef.setDisplayName((cmisClassDef.getTitle() != null) ? cmisClassDef.getTitle() : typeId); - typeDef.setDescription(cmisClassDef.getDescription() != null ? cmisClassDef.getDescription() : typeDef - .getDisplayName()); - - typeDef.setIsCreatable(!isSystemFolder); - typeDef.setIsQueryable(true); - typeDef.setIsFulltextIndexed(true); - typeDef.setIsControllablePolicy(false); - typeDef.setIsControllableAcl(true); - typeDef.setIsIncludedInSupertypeQuery(cmisClassDef.getIncludedInSuperTypeQuery()); - typeDef.setIsFileable(true); - - typeDefInclProperties = CMISUtils.copy(typeDef); - setTypeDefinition(typeDef, typeDefInclProperties); - - createOwningPropertyDefinitions(cmisMapping, serviceRegistry, cmisClassDef); - - actionEvaluators = cmisMapping.getActionEvaluators(BaseTypeId.CMIS_FOLDER); - } -} diff --git a/source/java/org/alfresco/opencmis/dictionary/PolicyTypeDefintionWrapper.java b/source/java/org/alfresco/opencmis/dictionary/PolicyTypeDefintionWrapper.java deleted file mode 100644 index b7bf3b1c74..0000000000 --- a/source/java/org/alfresco/opencmis/dictionary/PolicyTypeDefintionWrapper.java +++ /dev/null @@ -1,195 +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 . - */ -package org.alfresco.opencmis.dictionary; - -import java.util.ArrayList; -import java.util.Collection; - -import org.alfresco.error.AlfrescoRuntimeException; -import org.alfresco.opencmis.CMISUtils; -import org.alfresco.opencmis.dictionary.CMISAbstractDictionaryService.DictionaryRegistry; -import org.alfresco.opencmis.mapping.CMISMapping; -import org.alfresco.service.ServiceRegistry; -import org.alfresco.service.cmr.dictionary.ClassDefinition; -import org.alfresco.service.cmr.dictionary.DictionaryService; -import org.alfresco.service.namespace.QName; -import org.apache.chemistry.opencmis.commons.definitions.PropertyDefinition; -import org.apache.chemistry.opencmis.commons.enums.BaseTypeId; -import org.apache.chemistry.opencmis.commons.impl.dataobjects.PolicyTypeDefinitionImpl; - -public class PolicyTypeDefintionWrapper extends AbstractTypeDefinitionWrapper -{ - private static final long serialVersionUID = 1L; - - private PolicyTypeDefinitionImpl typeDef; - private PolicyTypeDefinitionImpl typeDefInclProperties; - - public PolicyTypeDefintionWrapper(CMISMapping cmisMapping, ServiceRegistry serviceRegistry, String typeId, - ClassDefinition cmisClassDef) - { - alfrescoName = cmisClassDef.getName(); - alfrescoClass = cmisMapping.getAlfrescoClass(alfrescoName); - - typeDef = new PolicyTypeDefinitionImpl(); - - typeDef.setBaseTypeId(BaseTypeId.CMIS_POLICY); - typeDef.setId(typeId); - typeDef.setLocalName(alfrescoName.getLocalName()); - typeDef.setLocalNamespace(alfrescoName.getNamespaceURI()); - - if (BaseTypeId.CMIS_POLICY.value().equals(typeId)) - { - typeDef.setQueryName(typeId); - typeDef.setParentTypeId(null); - } else - { - typeDef.setQueryName(cmisMapping.buildPrefixEncodedString(alfrescoName)); - QName parentQName = cmisMapping.getCmisType(cmisClassDef.getParentName()); - if (parentQName == null) - { - typeDef.setParentTypeId(cmisMapping.getCmisTypeId(CMISMapping.ASPECTS_QNAME)); - } else if (cmisMapping.isValidCmisPolicy(parentQName)) - { - typeDef.setParentTypeId(cmisMapping.getCmisTypeId(BaseTypeId.CMIS_POLICY, parentQName)); - } - } - - typeDef.setDisplayName((cmisClassDef.getTitle() != null) ? cmisClassDef.getTitle() : typeId); - typeDef.setDescription(cmisClassDef.getDescription() != null ? cmisClassDef.getDescription() : typeDef - .getDisplayName()); - - typeDef.setIsCreatable(false); - typeDef.setIsQueryable(true); - typeDef.setIsFulltextIndexed(true); - typeDef.setIsControllablePolicy(false); - typeDef.setIsControllableAcl(false); - typeDef.setIsIncludedInSupertypeQuery(cmisClassDef.getIncludedInSuperTypeQuery()); - typeDef.setIsFileable(true); - - typeDefInclProperties = CMISUtils.copy(typeDef); - setTypeDefinition(typeDef, typeDefInclProperties); - - createOwningPropertyDefinitions(cmisMapping, serviceRegistry, cmisClassDef); - - actionEvaluators = cmisMapping.getActionEvaluators(BaseTypeId.CMIS_POLICY); - } - - public void connectParentAndSubTypes(CMISMapping cmisMapping, DictionaryRegistry registry, - DictionaryService dictionaryService) - { - // find parent - if (typeDef.getParentTypeId() != null) - { - parent = registry.typeDefsByTypeId.get(typeDef.getParentTypeId()); - } else - { - if (!isBaseType()) - { - throw new AlfrescoRuntimeException("Type " + typeDef.getId() + " has no parent!"); - } - - parent = null; - } - - // find children - children = new ArrayList(); - Collection childrenNames = null; - - if (isBaseType()) - { - // add the "Aspects" type to the CMIS Policy type - childrenNames = new ArrayList(); - childrenNames.add(CMISMapping.ASPECTS_QNAME); - } else if (getAlfrescoName().equals(CMISMapping.ASPECTS_QNAME)) - { - // add all root aspects to the "Aspects" type - childrenNames = new ArrayList(); - - String aspectsTypeId = cmisMapping.getCmisTypeId(CMISMapping.ASPECTS_QNAME); - for (AbstractTypeDefinitionWrapper tdw : registry.typeDefsByTypeId.values()) - { - String parentId = tdw.getTypeDefinition(false).getParentTypeId(); - if ((parentId != null) && parentId.equals(aspectsTypeId)) - { - childrenNames.add(tdw.getAlfrescoName()); - } - } - } else - { - // add all non-root aspects to their parent - childrenNames = dictionaryService.getSubAspects(cmisMapping.getAlfrescoClass(getAlfrescoName()), false); - } - - for (QName childName : childrenNames) - { - if (cmisMapping.isValidCmisPolicy(childName)) - { - TypeDefinitionWrapper child = registry.typeDefsByQName.get(childName); - - if (child == null) - { - throw new AlfrescoRuntimeException("Failed to retrieve sub type for type id " + childName - + " for parent type " + getAlfrescoName() + "!"); - } - children.add(child); - } else - { - System.out.println("Not a policy: " + childName); - } - } - } - - public void resolveInheritance(CMISMapping cmisMapping, ServiceRegistry serviceRegistry, - DictionaryRegistry registry, DictionaryService dictionaryService) - { - PropertyDefinition propertyDefintion; - - if (parent != null) - { - for (PropertyDefintionWrapper propDef : parent.getProperties()) - { - if (propertiesById.containsKey(propDef.getPropertyId())) - { - continue; - } - - org.alfresco.service.cmr.dictionary.PropertyDefinition alfrescoPropDef = dictionaryService.getProperty( - propDef.getOwningType().getAlfrescoName(), propDef.getAlfrescoName()); - - propertyDefintion = createPropertyDefinition(cmisMapping, propDef.getPropertyId(), - alfrescoPropDef.getName(), alfrescoPropDef, true); - - if (propertyDefintion != null) - { - registerProperty(new BasePropertyDefintionWrapper(propertyDefintion, alfrescoPropDef.getName(), - propDef.getOwningType(), propDef.getPropertyAccessor(), propDef.getPropertyLuceneBuilder())); - } - } - } - - for (TypeDefinitionWrapper child : children) - { - if (child instanceof AbstractTypeDefinitionWrapper) - { - ((AbstractTypeDefinitionWrapper) child).resolveInheritance(cmisMapping, serviceRegistry, registry, - dictionaryService); - } - } - } -} diff --git a/source/java/org/alfresco/opencmis/dictionary/PropertyDefintionWrapper.java b/source/java/org/alfresco/opencmis/dictionary/PropertyDefintionWrapper.java deleted file mode 100644 index e92384f991..0000000000 --- a/source/java/org/alfresco/opencmis/dictionary/PropertyDefintionWrapper.java +++ /dev/null @@ -1,39 +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 . - */ -package org.alfresco.opencmis.dictionary; - -import org.alfresco.cmis.CMISPropertyAccessor; -import org.alfresco.cmis.CMISPropertyLuceneBuilder; -import org.alfresco.service.namespace.QName; -import org.apache.chemistry.opencmis.commons.definitions.PropertyDefinition; - -public interface PropertyDefintionWrapper -{ - PropertyDefinition getPropertyDefinition(); - - String getPropertyId(); - - QName getAlfrescoName(); - - TypeDefinitionWrapper getOwningType(); - - CMISPropertyAccessor getPropertyAccessor(); - - CMISPropertyLuceneBuilder getPropertyLuceneBuilder(); -} diff --git a/source/java/org/alfresco/opencmis/dictionary/RelationshipTypeDefintionWrapper.java b/source/java/org/alfresco/opencmis/dictionary/RelationshipTypeDefintionWrapper.java deleted file mode 100644 index 4819728df3..0000000000 --- a/source/java/org/alfresco/opencmis/dictionary/RelationshipTypeDefintionWrapper.java +++ /dev/null @@ -1,193 +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 . - */ -package org.alfresco.opencmis.dictionary; - -import java.util.ArrayList; -import java.util.Collections; - -import org.alfresco.error.AlfrescoRuntimeException; -import org.alfresco.opencmis.CMISUtils; -import org.alfresco.opencmis.dictionary.CMISAbstractDictionaryService.DictionaryRegistry; -import org.alfresco.opencmis.mapping.CMISMapping; -import org.alfresco.service.ServiceRegistry; -import org.alfresco.service.cmr.dictionary.AssociationDefinition; -import org.alfresco.service.cmr.dictionary.ClassDefinition; -import org.alfresco.service.cmr.dictionary.DictionaryService; -import org.apache.chemistry.opencmis.commons.definitions.PropertyDefinition; -import org.apache.chemistry.opencmis.commons.enums.BaseTypeId; -import org.apache.chemistry.opencmis.commons.impl.dataobjects.RelationshipTypeDefinitionImpl; - -public class RelationshipTypeDefintionWrapper extends AbstractTypeDefinitionWrapper -{ - private static final long serialVersionUID = 1L; - - private RelationshipTypeDefinitionImpl typeDef; - private RelationshipTypeDefinitionImpl typeDefInclProperties; - - public RelationshipTypeDefintionWrapper(CMISMapping cmisMapping, ServiceRegistry serviceRegistry, String typeId, - ClassDefinition cmisClassDef) - { - alfrescoName = cmisClassDef.getName(); - alfrescoClass = cmisMapping.getAlfrescoClass(alfrescoName); - - typeDef = new RelationshipTypeDefinitionImpl(); - - typeDef.setBaseTypeId(BaseTypeId.CMIS_RELATIONSHIP); - typeDef.setId(typeId); - typeDef.setLocalName(alfrescoName.getLocalName()); - typeDef.setLocalNamespace(alfrescoName.getNamespaceURI()); - - if (BaseTypeId.CMIS_RELATIONSHIP.value().equals(typeId)) - { - typeDef.setQueryName(typeId); - typeDef.setParentTypeId(null); - } else - { - typeDef.setQueryName(cmisMapping.buildPrefixEncodedString(alfrescoName)); - typeDef.setParentTypeId(BaseTypeId.CMIS_RELATIONSHIP.value()); - } - - typeDef.setDisplayName(cmisClassDef.getTitle() != null ? cmisClassDef.getTitle() : typeId); - typeDef.setDescription(cmisClassDef.getDescription() != null ? cmisClassDef.getDescription() : typeDef - .getDisplayName()); - - typeDef.setIsCreatable(true); - typeDef.setIsQueryable(false); - typeDef.setIsFulltextIndexed(false); - typeDef.setIsControllablePolicy(false); - typeDef.setIsControllableAcl(false); - typeDef.setIsIncludedInSupertypeQuery(true); - typeDef.setIsFileable(false); - - typeDefInclProperties = CMISUtils.copy(typeDef); - setTypeDefinition(typeDef, typeDefInclProperties); - - createOwningPropertyDefinitions(cmisMapping, serviceRegistry, cmisClassDef); - - actionEvaluators = cmisMapping.getActionEvaluators(BaseTypeId.CMIS_RELATIONSHIP); - } - - public RelationshipTypeDefintionWrapper(CMISMapping cmisMapping, String typeId, AssociationDefinition cmisAssocDef) - { - alfrescoName = cmisAssocDef.getName(); - alfrescoClass = cmisMapping.getAlfrescoClass(alfrescoName); - - typeDef = new RelationshipTypeDefinitionImpl(); - - typeDef.setBaseTypeId(BaseTypeId.CMIS_RELATIONSHIP); - typeDef.setId(typeId); - typeDef.setLocalName(alfrescoName.getLocalName()); - typeDef.setLocalNamespace(alfrescoName.getNamespaceURI()); - - typeDef.setQueryName(cmisMapping.buildPrefixEncodedString(alfrescoName)); - typeDef.setParentTypeId(BaseTypeId.CMIS_RELATIONSHIP.value()); - - typeDef.setDisplayName(cmisAssocDef.getTitle() != null ? cmisAssocDef.getTitle() : typeId); - typeDef.setDescription(cmisAssocDef.getDescription() != null ? cmisAssocDef.getDescription() : typeDef - .getDisplayName()); - - typeDef.setIsCreatable(true); - typeDef.setIsQueryable(false); - typeDef.setIsFulltextIndexed(false); - typeDef.setIsControllablePolicy(false); - typeDef.setIsControllableAcl(false); - typeDef.setIsIncludedInSupertypeQuery(true); - typeDef.setIsFileable(false); - - String sourceTypeId = cmisMapping.getCmisTypeId(cmisMapping - .getCmisType(cmisAssocDef.getSourceClass().getName())); - if (sourceTypeId != null) - { - typeDef.setAllowedSourceTypes(Collections.singletonList(sourceTypeId)); - } - - String targetTypeId = cmisMapping.getCmisTypeId(cmisMapping - .getCmisType(cmisAssocDef.getTargetClass().getName())); - if (targetTypeId != null) - { - typeDef.setAllowedTargetTypes(Collections.singletonList(targetTypeId)); - } - - typeDefInclProperties = CMISUtils.copy(typeDef); - setTypeDefinition(typeDef, typeDefInclProperties); - - actionEvaluators = cmisMapping.getActionEvaluators(BaseTypeId.CMIS_RELATIONSHIP); - } - - public void connectParentAndSubTypes(CMISMapping cmisMapping, DictionaryRegistry registry, - DictionaryService dictionaryService) - { - // find parent - if (typeDef.getParentTypeId() != null) - { - parent = registry.typeDefsByTypeId.get(typeDef.getParentTypeId()); - } else - { - if (!isBaseType()) - { - throw new AlfrescoRuntimeException("Type " + typeDef.getId() + " has no parent!"); - } - - parent = null; - } - - // find children - children = new ArrayList(); - if (isBaseType()) - { - for (TypeDefinitionWrapper child : registry.assocDefsByQName.values()) - { - children.add(child); - } - } - } - - public void resolveInheritance(CMISMapping cmisMapping, ServiceRegistry serviceRegistry, - DictionaryRegistry registry, DictionaryService dictionaryService) - { - PropertyDefinition propertyDefintion; - - if (parent != null) - { - for (PropertyDefintionWrapper propDef : parent.getProperties()) - { - org.alfresco.service.cmr.dictionary.PropertyDefinition alfrescoPropDef = dictionaryService.getProperty( - propDef.getOwningType().getAlfrescoName(), propDef.getAlfrescoName()); - - propertyDefintion = createPropertyDefinition(cmisMapping, propDef.getPropertyId(), - alfrescoPropDef.getName(), alfrescoPropDef, true); - - if (propertyDefintion != null) - { - registerProperty(new BasePropertyDefintionWrapper(propertyDefintion, alfrescoPropDef.getName(), - propDef.getOwningType(), propDef.getPropertyAccessor(), propDef.getPropertyLuceneBuilder())); - } - } - } - - for (TypeDefinitionWrapper child : children) - { - if (child instanceof AbstractTypeDefinitionWrapper) - { - ((AbstractTypeDefinitionWrapper) child).resolveInheritance(cmisMapping, serviceRegistry, registry, - dictionaryService); - } - } - } -} diff --git a/source/java/org/alfresco/opencmis/dictionary/ShadowTypeDefinitionWrapper.java b/source/java/org/alfresco/opencmis/dictionary/ShadowTypeDefinitionWrapper.java deleted file mode 100644 index 8b7bd70bc4..0000000000 --- a/source/java/org/alfresco/opencmis/dictionary/ShadowTypeDefinitionWrapper.java +++ /dev/null @@ -1,111 +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 . - */ -package org.alfresco.opencmis.dictionary; - -import java.util.ArrayList; -import java.util.Collection; - -import org.alfresco.error.AlfrescoRuntimeException; -import org.alfresco.opencmis.dictionary.CMISAbstractDictionaryService.DictionaryRegistry; -import org.alfresco.opencmis.mapping.CMISMapping; -import org.alfresco.service.ServiceRegistry; -import org.alfresco.service.cmr.dictionary.DictionaryService; -import org.alfresco.service.namespace.QName; -import org.apache.chemistry.opencmis.commons.definitions.PropertyDefinition; - -public abstract class ShadowTypeDefinitionWrapper extends AbstractTypeDefinitionWrapper -{ - - private static final long serialVersionUID = 1L; - - public void connectParentAndSubTypes(CMISMapping cmisMapping, DictionaryRegistry registry, - DictionaryService dictionaryService) - { - // find parent - if (typeDef.getParentTypeId() != null) - { - parent = registry.typeDefsByTypeId.get(typeDef.getParentTypeId()); - } else - { - if (!isBaseType()) - { - throw new AlfrescoRuntimeException("Type " + typeDef.getId() + " has no parent!"); - } - - parent = null; - } - - // find children - children = new ArrayList(); - Collection childrenNames = dictionaryService.getSubTypes(cmisMapping.getAlfrescoClass(getAlfrescoName()), - false); - for (QName childName : childrenNames) - { - if (cmisMapping.isValidCmisObject(getBaseTypeId(), childName)) - { - TypeDefinitionWrapper child = registry.typeDefsByQName.get(childName); - - if (child == null) - { - throw new AlfrescoRuntimeException("Failed to retrieve sub type for type id " + childName - + " for parent type " + getAlfrescoName() + "!"); - } - children.add(child); - } - } - } - - public void resolveInheritance(CMISMapping cmisMapping, ServiceRegistry serviceRegistry, - DictionaryRegistry registry, DictionaryService dictionaryService) - { - PropertyDefinition propertyDefintion; - - if (parent != null) - { - for (PropertyDefintionWrapper propDef : parent.getProperties()) - { - if (propertiesById.containsKey(propDef.getPropertyId())) - { - continue; - } - - org.alfresco.service.cmr.dictionary.PropertyDefinition alfrescoPropDef = dictionaryService.getProperty( - propDef.getOwningType().getAlfrescoName(), propDef.getAlfrescoName()); - - propertyDefintion = createPropertyDefinition(cmisMapping, propDef.getPropertyId(), - alfrescoPropDef.getName(), alfrescoPropDef, true); - - if (propertyDefintion != null) - { - registerProperty(new BasePropertyDefintionWrapper(propertyDefintion, alfrescoPropDef.getName(), - propDef.getOwningType(), propDef.getPropertyAccessor(), propDef.getPropertyLuceneBuilder())); - } - } - } - - for (TypeDefinitionWrapper child : children) - { - if (child instanceof AbstractTypeDefinitionWrapper) - { - ((AbstractTypeDefinitionWrapper) child).resolveInheritance(cmisMapping, serviceRegistry, registry, - dictionaryService); - } - } - } -} diff --git a/source/java/org/alfresco/opencmis/dictionary/TypeDefinitionWrapper.java b/source/java/org/alfresco/opencmis/dictionary/TypeDefinitionWrapper.java deleted file mode 100644 index c026e72f96..0000000000 --- a/source/java/org/alfresco/opencmis/dictionary/TypeDefinitionWrapper.java +++ /dev/null @@ -1,58 +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 . - */ -package org.alfresco.opencmis.dictionary; - -import java.util.Collection; -import java.util.List; -import java.util.Map; - -import org.alfresco.opencmis.CMISActionEvaluator; -import org.alfresco.service.namespace.QName; -import org.apache.chemistry.opencmis.commons.definitions.TypeDefinition; -import org.apache.chemistry.opencmis.commons.enums.Action; -import org.apache.chemistry.opencmis.commons.enums.BaseTypeId; - -public interface TypeDefinitionWrapper -{ - TypeDefinition getTypeDefinition(boolean includePropertyDefinitions); - - String getTypeId(); - - BaseTypeId getBaseTypeId(); - - boolean isBaseType(); - - QName getAlfrescoName(); - - QName getAlfrescoClass(); - - TypeDefinitionWrapper getParent(); - - List getChildren(); - - Collection getProperties(); - - PropertyDefintionWrapper getPropertyById(String propertyId); - - PropertyDefintionWrapper getPropertyByQueryName(String queryName); - - PropertyDefintionWrapper getPropertyByQName(QName name); - - Map> getActionEvaluators(); -} diff --git a/source/java/org/alfresco/opencmis/mapping/AbstractActionEvaluator.java b/source/java/org/alfresco/opencmis/mapping/AbstractActionEvaluator.java index e38e382028..b2d7f98914 100644 --- a/source/java/org/alfresco/opencmis/mapping/AbstractActionEvaluator.java +++ b/source/java/org/alfresco/opencmis/mapping/AbstractActionEvaluator.java @@ -18,7 +18,7 @@ */ package org.alfresco.opencmis.mapping; -import org.alfresco.opencmis.CMISActionEvaluator; +import org.alfresco.opencmis.dictionary.CMISActionEvaluator; import org.alfresco.service.ServiceRegistry; import org.apache.chemistry.opencmis.commons.enums.Action; diff --git a/source/java/org/alfresco/opencmis/mapping/AbstractProperty.java b/source/java/org/alfresco/opencmis/mapping/AbstractProperty.java index cdaa2e217a..21aa5cdb49 100644 --- a/source/java/org/alfresco/opencmis/mapping/AbstractProperty.java +++ b/source/java/org/alfresco/opencmis/mapping/AbstractProperty.java @@ -19,19 +19,12 @@ package org.alfresco.opencmis.mapping; import java.io.Serializable; -import java.util.Collection; -import org.alfresco.cmis.CMISPropertyAccessor; -import org.alfresco.cmis.CMISPropertyLuceneBuilder; -import org.alfresco.repo.search.impl.lucene.LuceneFunction; -import org.alfresco.repo.search.impl.lucene.LuceneQueryParser; -import org.alfresco.repo.search.impl.querymodel.PredicateMode; +import org.alfresco.opencmis.dictionary.CMISPropertyAccessor; import org.alfresco.service.ServiceRegistry; import org.alfresco.service.cmr.repository.AssociationRef; import org.alfresco.service.cmr.repository.NodeRef; import org.alfresco.service.namespace.QName; -import org.apache.lucene.queryParser.ParseException; -import org.apache.lucene.search.Query; /** * Base class for all property accessors @@ -39,7 +32,7 @@ import org.apache.lucene.search.Query; * @author andyh * */ -public abstract class AbstractProperty implements CMISPropertyAccessor, CMISPropertyLuceneBuilder +public abstract class AbstractProperty implements CMISPropertyAccessor { private ServiceRegistry serviceRegistry; private String propertyName; @@ -82,72 +75,19 @@ public abstract class AbstractProperty implements CMISPropertyAccessor, CMISProp return null; } - - public Query buildLuceneEquality(LuceneQueryParser lqp, Serializable value, PredicateMode mode, LuceneFunction luceneFunction) throws ParseException - { - return null; - } - - public Query buildLuceneExists(LuceneQueryParser lqp, Boolean not) throws ParseException - { - return null; - } - - public Query buildLuceneGreaterThan(LuceneQueryParser lqp, Serializable value, PredicateMode mode, LuceneFunction luceneFunction) throws ParseException - { - return null; - } - - public Query buildLuceneGreaterThanOrEquals(LuceneQueryParser lqp, Serializable value, PredicateMode mode, LuceneFunction luceneFunction) throws ParseException - { - return null; - } - - public Query buildLuceneIn(LuceneQueryParser lqp, Collection values, Boolean not, PredicateMode mode) throws ParseException - { - return null; - } - - public Query buildLuceneInequality(LuceneQueryParser lqp, Serializable value, PredicateMode mode, LuceneFunction luceneFunction) throws ParseException - { - return null; - } - - public Query buildLuceneLessThan(LuceneQueryParser lqp, Serializable value, PredicateMode mode, LuceneFunction luceneFunction) throws ParseException - { - return null; - } - - public Query buildLuceneLessThanOrEquals(LuceneQueryParser lqp, Serializable value, PredicateMode mode, LuceneFunction luceneFunction) throws ParseException - { - return null; - } - - public Query buildLuceneLike(LuceneQueryParser lqp, Serializable value, Boolean not) throws ParseException - { - return null; - } - - public String getLuceneFieldName() - { - throw new UnsupportedOperationException(); - } - - public String getLuceneSortField(LuceneQueryParser lqp) - { - throw new UnsupportedOperationException(); - } - + @Override public Serializable getValue(NodeRef nodeRef) { throw new UnsupportedOperationException(); } + @Override public void setValue(NodeRef nodeRef, Serializable value) { throw new UnsupportedOperationException(); } + @Override public Serializable getValue(AssociationRef assocRef) { throw new UnsupportedOperationException(); diff --git a/source/java/org/alfresco/opencmis/mapping/AbstractSimpleProperty.java b/source/java/org/alfresco/opencmis/mapping/AbstractSimpleProperty.java deleted file mode 100644 index d5532b4075..0000000000 --- a/source/java/org/alfresco/opencmis/mapping/AbstractSimpleProperty.java +++ /dev/null @@ -1,240 +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 . - */ -package org.alfresco.opencmis.mapping; - -import java.io.Serializable; -import java.util.Collection; - -import org.alfresco.repo.search.impl.lucene.AnalysisMode; -import org.alfresco.repo.search.impl.lucene.LuceneFunction; -import org.alfresco.repo.search.impl.lucene.LuceneQueryParser; -import org.alfresco.repo.search.impl.querymodel.PredicateMode; -import org.alfresco.service.ServiceRegistry; -import org.alfresco.service.cmr.dictionary.DataTypeDefinition; -import org.alfresco.service.cmr.repository.datatype.DefaultTypeConverter; -import org.alfresco.service.namespace.QName; -import org.apache.lucene.index.Term; -import org.apache.lucene.queryParser.ParseException; -import org.apache.lucene.search.BooleanQuery; -import org.apache.lucene.search.MatchAllDocsQuery; -import org.apache.lucene.search.Query; -import org.apache.lucene.search.TermQuery; -import org.apache.lucene.search.BooleanClause.Occur; - -/** - * Common support for lucene query building. - * - * @author andyh - * - */ -public abstract class AbstractSimpleProperty extends AbstractProperty -{ - - protected AbstractSimpleProperty(ServiceRegistry serviceRegistry, String propertyName) - { - super(serviceRegistry, propertyName); - } - - protected abstract String getValueAsString(Serializable value); - - protected String getRangeMax() - { - return "\uFFFF"; - } - - protected String getRangeMin() - { - return "\u0000"; - } - - protected abstract DataTypeDefinition getInDataType(); - - protected abstract QName getQNameForExists(); - - /* - * (non-Javadoc) - * @see org.alfresco.cmis.property.PropertyLuceneBuilder#buildLuceneEquality(org.alfresco.repo.search.impl.lucene.LuceneQueryParser, java.io.Serializable, org.alfresco.repo.search.impl.querymodel.PredicateMode) - */ - public Query buildLuceneEquality(LuceneQueryParser lqp, Serializable value, PredicateMode mode, LuceneFunction luceneFunction) throws ParseException - { - return lqp.getFieldQuery(getLuceneFieldName(), getValueAsString(value), AnalysisMode.IDENTIFIER, luceneFunction); - } - - /* - * (non-Javadoc) - * @see org.alfresco.cmis.property.PropertyLuceneBuilder#buildLuceneExists(org.alfresco.repo.search.impl.lucene.LuceneQueryParser, java.lang.Boolean) - */ - public Query buildLuceneExists(LuceneQueryParser lqp, Boolean not) throws ParseException - { - if (not) - { - return lqp.getFieldQuery("ISNULL", getQNameForExists().toString(), AnalysisMode.DEFAULT, LuceneFunction.FIELD); - } - else - { - return lqp.getFieldQuery("ISNOTNULL", getQNameForExists().toString(), AnalysisMode.DEFAULT, LuceneFunction.FIELD); - } - } - - /* - * (non-Javadoc) - * @see org.alfresco.cmis.property.PropertyLuceneBuilder#buildLuceneGreaterThan(org.alfresco.repo.search.impl.lucene.LuceneQueryParser, java.io.Serializable, org.alfresco.repo.search.impl.querymodel.PredicateMode) - */ - public Query buildLuceneGreaterThan(LuceneQueryParser lqp, Serializable value, PredicateMode mode, LuceneFunction luceneFunction) throws ParseException - { - String field = getLuceneFieldName(); - String stringValue = getValueAsString(value); - return lqp.getRangeQuery(field, stringValue, getRangeMax(), false, true, AnalysisMode.IDENTIFIER, luceneFunction); - } - - /* - * (non-Javadoc) - * @see org.alfresco.cmis.property.PropertyLuceneBuilder#buildLuceneGreaterThanOrEquals(org.alfresco.repo.search.impl.lucene.LuceneQueryParser, java.io.Serializable, org.alfresco.repo.search.impl.querymodel.PredicateMode) - */ - public Query buildLuceneGreaterThanOrEquals(LuceneQueryParser lqp, Serializable value, PredicateMode mode, LuceneFunction luceneFunction) throws ParseException - { - String field = getLuceneFieldName(); - String stringValue = getValueAsString(value); - return lqp.getRangeQuery(field, stringValue, getRangeMax(), true, true, AnalysisMode.IDENTIFIER, luceneFunction); - } - - /* - * (non-Javadoc) - * @see org.alfresco.cmis.property.PropertyLuceneBuilder#buildLuceneIn(org.alfresco.repo.search.impl.lucene.LuceneQueryParser, java.util.Collection, java.lang.Boolean, org.alfresco.repo.search.impl.querymodel.PredicateMode) - */ - public Query buildLuceneIn(LuceneQueryParser lqp, Collection values, Boolean not, PredicateMode mode) throws ParseException - { - String field = getLuceneFieldName(); - - // Check type conversion - - @SuppressWarnings("unused") - Object converted = DefaultTypeConverter.INSTANCE.convert(getInDataType(), values); - Collection asStrings = DefaultTypeConverter.INSTANCE.convert(String.class, values); - - if (asStrings.size() == 0) - { - if (not) - { - return new MatchAllDocsQuery(); - } - else - { - return new TermQuery(new Term("NO_TOKENS", "__")); - } - } - else if (asStrings.size() == 1) - { - String value = asStrings.iterator().next(); - if (not) - { - return lqp.getDoesNotMatchFieldQuery(field, value, AnalysisMode.IDENTIFIER, LuceneFunction.FIELD); - } - else - { - return lqp.getFieldQuery(field, value, AnalysisMode.IDENTIFIER, LuceneFunction.FIELD); - } - } - else - { - BooleanQuery booleanQuery = new BooleanQuery(); - if (not) - { - booleanQuery.add(new MatchAllDocsQuery(), Occur.MUST); - } - for (String value : asStrings) - { - Query any = lqp.getFieldQuery(field, value, AnalysisMode.IDENTIFIER, LuceneFunction.FIELD); - if (not) - { - booleanQuery.add(any, Occur.MUST_NOT); - } - else - { - booleanQuery.add(any, Occur.SHOULD); - } - } - return booleanQuery; - } - } - - /* - * (non-Javadoc) - * @see org.alfresco.cmis.property.PropertyLuceneBuilder#buildLuceneInequality(org.alfresco.repo.search.impl.lucene.LuceneQueryParser, java.io.Serializable, org.alfresco.repo.search.impl.querymodel.PredicateMode) - */ - public Query buildLuceneInequality(LuceneQueryParser lqp, Serializable value, PredicateMode mode, LuceneFunction luceneFunction) throws ParseException - { - String field = getLuceneFieldName(); - String stringValue = getValueAsString(value); - return lqp.getDoesNotMatchFieldQuery(field, stringValue, AnalysisMode.IDENTIFIER, luceneFunction); - } - - /* - * (non-Javadoc) - * @see org.alfresco.cmis.property.PropertyLuceneBuilder#buildLuceneLessThan(org.alfresco.repo.search.impl.lucene.LuceneQueryParser, java.io.Serializable, org.alfresco.repo.search.impl.querymodel.PredicateMode) - */ - public Query buildLuceneLessThan(LuceneQueryParser lqp, Serializable value, PredicateMode mode, LuceneFunction luceneFunction) throws ParseException - { - String field = getLuceneFieldName(); - String stringValue = getValueAsString(value); - return lqp.getRangeQuery(field, getRangeMin(), stringValue, true, false, AnalysisMode.IDENTIFIER, luceneFunction); - } - - /* - * (non-Javadoc) - * @see org.alfresco.cmis.property.PropertyLuceneBuilder#buildLuceneLessThanOrEquals(org.alfresco.repo.search.impl.lucene.LuceneQueryParser, java.io.Serializable, org.alfresco.repo.search.impl.querymodel.PredicateMode) - */ - public Query buildLuceneLessThanOrEquals(LuceneQueryParser lqp, Serializable value, PredicateMode mode, LuceneFunction luceneFunction) throws ParseException - { - String field = getLuceneFieldName(); - String stringValue = getValueAsString(value); - return lqp.getRangeQuery(field, getRangeMin(), stringValue, true, true, AnalysisMode.IDENTIFIER, luceneFunction); - } - - /* - * (non-Javadoc) - * @see org.alfresco.cmis.property.PropertyLuceneBuilder#buildLuceneLike(org.alfresco.repo.search.impl.lucene.LuceneQueryParser, java.io.Serializable, java.lang.Boolean) - */ - public Query buildLuceneLike(LuceneQueryParser lqp, Serializable value, Boolean not) throws ParseException - { - String field = getLuceneFieldName(); - String stringValue = getValueAsString(value); - - if (not) - { - BooleanQuery booleanQuery = new BooleanQuery(); - booleanQuery.add(new MatchAllDocsQuery(), Occur.MUST); - booleanQuery.add(lqp.getLikeQuery(field, stringValue, AnalysisMode.IDENTIFIER), Occur.MUST_NOT); - return booleanQuery; - } - else - { - return lqp.getLikeQuery(field, stringValue, AnalysisMode.IDENTIFIER); - } - } - - /* - * (non-Javadoc) - * @see org.alfresco.cmis.property.PropertyLuceneBuilder#getLuceneSortField() - */ - public String getLuceneSortField(LuceneQueryParser lqp) - { - return getLuceneFieldName(); - } -} diff --git a/source/java/org/alfresco/opencmis/mapping/BaseTypeIdProperty.java b/source/java/org/alfresco/opencmis/mapping/BaseTypeIdProperty.java index 659182e3a5..d532993f28 100644 --- a/source/java/org/alfresco/opencmis/mapping/BaseTypeIdProperty.java +++ b/source/java/org/alfresco/opencmis/mapping/BaseTypeIdProperty.java @@ -19,28 +19,14 @@ package org.alfresco.opencmis.mapping; import java.io.Serializable; -import java.util.Collection; -import org.alfresco.cmis.CMISQueryException; -import org.alfresco.cmis.CMISScope; -import org.alfresco.cmis.CMISTypeDefinition; -import org.alfresco.repo.search.impl.lucene.AnalysisMode; -import org.alfresco.repo.search.impl.lucene.LuceneFunction; -import org.alfresco.repo.search.impl.lucene.LuceneQueryParser; -import org.alfresco.repo.search.impl.querymodel.PredicateMode; +import org.alfresco.opencmis.dictionary.CMISDictionaryService; import org.alfresco.service.ServiceRegistry; import org.alfresco.service.cmr.repository.AssociationRef; import org.alfresco.service.cmr.repository.NodeRef; -import org.alfresco.service.cmr.repository.datatype.DefaultTypeConverter; import org.alfresco.service.namespace.QName; import org.apache.chemistry.opencmis.commons.PropertyIds; -import org.apache.lucene.index.Term; -import org.apache.lucene.queryParser.ParseException; -import org.apache.lucene.search.BooleanClause.Occur; -import org.apache.lucene.search.BooleanQuery; -import org.apache.lucene.search.MatchAllDocsQuery; -import org.apache.lucene.search.Query; -import org.apache.lucene.search.TermQuery; +import org.apache.chemistry.opencmis.commons.enums.BaseTypeId; /** * Get the CMIS object type id property @@ -49,14 +35,17 @@ import org.apache.lucene.search.TermQuery; */ public class BaseTypeIdProperty extends AbstractProperty { + private CMISDictionaryService dictionaryService; + /** * Construct * * @param serviceRegistry */ - public BaseTypeIdProperty(ServiceRegistry serviceRegistry) + public BaseTypeIdProperty(ServiceRegistry serviceRegistry, CMISDictionaryService dictionaryService) { super(serviceRegistry, PropertyIds.BASE_TYPE_ID); + this.dictionaryService = dictionaryService; } /* @@ -66,7 +55,7 @@ public class BaseTypeIdProperty extends AbstractProperty public Serializable getValue(NodeRef nodeRef) { QName type = getServiceRegistry().getNodeService().getType(nodeRef); - return getServiceRegistry().getCMISDictionaryService().findTypeForClass(type).getBaseType().getTypeId().getId(); + return dictionaryService.findTypeForClass(type).getBaseTypeId().value(); } /* @@ -75,113 +64,6 @@ public class BaseTypeIdProperty extends AbstractProperty */ public Serializable getValue(AssociationRef assocRef) { - QName type = assocRef.getTypeQName(); - return getServiceRegistry().getCMISDictionaryService().findTypeForClass(type, CMISScope.RELATIONSHIP).getBaseType().getTypeId().getId(); - } - - @Override - public Query buildLuceneEquality(LuceneQueryParser lqp, Serializable value, PredicateMode mode, LuceneFunction luceneFunction) throws ParseException - { - return lqp.getFieldQuery("TYPE", getBaseType(getValueAsString(value)), AnalysisMode.IDENTIFIER, luceneFunction); - } - - @Override - public Query buildLuceneInequality(LuceneQueryParser lqp, Serializable value, PredicateMode mode, LuceneFunction luceneFunction) throws ParseException - { - return lqp.getDoesNotMatchFieldQuery("TYPE", getBaseType(getValueAsString(value)), AnalysisMode.IDENTIFIER, luceneFunction); - } - - @Override - public Query buildLuceneIn(LuceneQueryParser lqp, Collection values, Boolean not, PredicateMode mode) throws ParseException - { - String field = "TYPE"; - - // Check type conversion - - - Collection asStrings = DefaultTypeConverter.INSTANCE.convert(String.class, values); - - if (asStrings.size() == 0) - { - if (not) - { - return new MatchAllDocsQuery(); - } - else - { - return new TermQuery(new Term("NO_TOKENS", "__")); - } - } - else if (asStrings.size() == 1) - { - String value = asStrings.iterator().next(); - if (not) - { - return lqp.getDoesNotMatchFieldQuery(field, getBaseType(value), AnalysisMode.IDENTIFIER, LuceneFunction.FIELD); - } - else - { - return lqp.getFieldQuery(field, getBaseType(value), AnalysisMode.IDENTIFIER, LuceneFunction.FIELD); - } - } - else - { - BooleanQuery booleanQuery = new BooleanQuery(); - if (not) - { - booleanQuery.add(new MatchAllDocsQuery(), Occur.MUST); - } - for (String value : asStrings) - { - Query any = lqp.getFieldQuery(field, getBaseType(value), AnalysisMode.IDENTIFIER, LuceneFunction.FIELD); - if (not) - { - booleanQuery.add(any, Occur.MUST_NOT); - } - else - { - booleanQuery.add(any, Occur.SHOULD); - } - } - return booleanQuery; - } - } - - @Override - public Query buildLuceneExists(LuceneQueryParser lqp, Boolean not) throws ParseException - { - if (not) - { - return new TermQuery(new Term("NO_TOKENS", "__")); - } - else - { - return new MatchAllDocsQuery(); - } - } - - - private String getBaseType(String tableName) - { - CMISTypeDefinition typeDef = getServiceRegistry().getCMISDictionaryService().findTypeByQueryName(tableName); - if (typeDef == null) - { - throw new CMISQueryException("Unknwon base type: " + tableName); - } - if(!typeDef.getBaseType().equals(typeDef)) - { - throw new CMISQueryException("Not a base type: " + tableName); - } - if(!typeDef.isQueryable()) - { - throw new CMISQueryException("Base type is not queryable: " + tableName); - } - return typeDef.getTypeId().getQName().toString(); - } - - private String getValueAsString(Serializable value) - { - String asString = DefaultTypeConverter.INSTANCE.convert(String.class, value); - return asString; + return BaseTypeId.CMIS_RELATIONSHIP.value(); } } diff --git a/source/java/org/alfresco/opencmis/mapping/CMISMapping.java b/source/java/org/alfresco/opencmis/mapping/CMISMapping.java deleted file mode 100644 index 91d05b0e1c..0000000000 --- a/source/java/org/alfresco/opencmis/mapping/CMISMapping.java +++ /dev/null @@ -1,871 +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 . - */ -package org.alfresco.opencmis.mapping; - -import java.io.Serializable; -import java.util.ArrayList; -import java.util.Collection; -import java.util.Collections; -import java.util.HashMap; -import java.util.LinkedHashMap; -import java.util.Map; -import java.util.Set; - -import org.alfresco.cmis.CMISAccessControlFormatEnum; -import org.alfresco.error.AlfrescoRuntimeException; -import org.alfresco.model.ContentModel; -import org.alfresco.opencmis.CMISActionEvaluator; -import org.alfresco.opencmis.CMISConnector; -import org.alfresco.service.ServiceRegistry; -import org.alfresco.service.cmr.dictionary.AspectDefinition; -import org.alfresco.service.cmr.dictionary.AssociationDefinition; -import org.alfresco.service.cmr.dictionary.DataTypeDefinition; -import org.alfresco.service.cmr.repository.AssociationRef; -import org.alfresco.service.cmr.repository.NodeRef; -import org.alfresco.service.cmr.security.PermissionService; -import org.alfresco.service.namespace.NamespaceService; -import org.alfresco.service.namespace.QName; -import org.alfresco.util.Pair; -import org.apache.chemistry.opencmis.commons.PropertyIds; -import org.apache.chemistry.opencmis.commons.enums.Action; -import org.apache.chemistry.opencmis.commons.enums.BaseTypeId; -import org.apache.chemistry.opencmis.commons.enums.PropertyType; -import org.apache.chemistry.opencmis.commons.exceptions.CmisInvalidArgumentException; -import org.apache.chemistry.opencmis.commons.exceptions.CmisRuntimeException; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.springframework.beans.factory.InitializingBean; - -/** - * CMIS <-> Alfresco mappings - * - * @author andyh - */ -public class CMISMapping implements InitializingBean -{ - // Logger - protected static final Log logger = LogFactory.getLog(CMISMapping.class); - - /** - * The Alfresco CMIS Namespace - */ - public static String CMIS_MODEL_NS = "cmis"; - public static String CMIS_MODEL_URI = "http://www.alfresco.org/model/cmis/1.0/cs01"; - - public static String CMIS_EXT_NS = "cmisext"; - public static String CMIS_EXT_URI = "http://www.alfresco.org/model/cmis/1.0/cs01ext"; - - /** - * The Alfresco CMIS Model name. - */ - public static String CMIS_MODEL_NAME = "cmismodel"; - - /** - * The QName for the Alfresco CMIS Model. - */ - public static QName CMIS_MODEL_QNAME = QName.createQName(CMIS_MODEL_URI, CMIS_MODEL_NAME); - - // CMIS Data Types - public static QName CMIS_DATATYPE_ID = QName.createQName(CMIS_MODEL_URI, "id"); - public static QName CMIS_DATATYPE_URI = QName.createQName(CMIS_MODEL_URI, "uri"); - public static QName CMIS_DATATYPE_XML = QName.createQName(CMIS_MODEL_URI, "xml"); - public static QName CMIS_DATATYPE_HTML = QName.createQName(CMIS_MODEL_URI, "html"); - - // CMIS Types - public static QName OBJECT_QNAME = QName.createQName(CMIS_EXT_URI, "object"); - public static QName DOCUMENT_QNAME = QName.createQName(CMIS_MODEL_URI, "document"); - public static QName FOLDER_QNAME = QName.createQName(CMIS_MODEL_URI, "folder"); - public static QName RELATIONSHIP_QNAME = QName.createQName(CMIS_MODEL_URI, "relationship"); - public static QName POLICY_QNAME = QName.createQName(CMIS_MODEL_URI, "policy"); - public static QName ASPECTS_QNAME = QName.createQName(CMIS_EXT_URI, "aspects"); - - // CMIS Internal Type Ids - public static String OBJECT_TYPE_ID = "cmisext:object"; - - /** - * Basic permissions. - */ - public static final String CMIS_READ = "cmis:read"; - public static final String CMIS_WRITE = "cmis:write"; - public static final String CMIS_ALL = "cmis:all"; - - // Service Dependencies - private ServiceRegistry serviceRegistry; - private CMISConnector cmisConnector; - - // Mappings - private Map mapAlfrescoQNameToTypeId = new HashMap(); - private Map mapCmisQNameToAlfrescoQName = new HashMap(); - private Map mapAlfrescoQNameToCmisQName = new HashMap(); - private Map mapAlfrescoToCmisDataType = new HashMap(); - private Map mapCmisDataTypeToAlfresco = new HashMap(); - private Map propertyAccessors = new HashMap(); - private Map>> actionEvaluators = new HashMap>>(); - - /* - * (non-Javadoc) - * - * @see - * org.springframework.beans.factory.InitializingBean#afterPropertiesSet() - */ - public void afterPropertiesSet() throws Exception - { - // - // Type Mappings - // - - mapAlfrescoQNameToTypeId.put(OBJECT_QNAME, OBJECT_TYPE_ID); - mapAlfrescoQNameToTypeId.put(DOCUMENT_QNAME, BaseTypeId.CMIS_DOCUMENT.value()); - mapAlfrescoQNameToTypeId.put(FOLDER_QNAME, BaseTypeId.CMIS_FOLDER.value()); - mapAlfrescoQNameToTypeId.put(RELATIONSHIP_QNAME, BaseTypeId.CMIS_RELATIONSHIP.value()); - mapAlfrescoQNameToTypeId.put(POLICY_QNAME, BaseTypeId.CMIS_POLICY.value()); - - mapAlfrescoQNameToCmisQName.put(ContentModel.TYPE_CONTENT, DOCUMENT_QNAME); - mapAlfrescoQNameToCmisQName.put(ContentModel.TYPE_FOLDER, FOLDER_QNAME); - - mapCmisQNameToAlfrescoQName.put(DOCUMENT_QNAME, ContentModel.TYPE_CONTENT); - mapCmisQNameToAlfrescoQName.put(FOLDER_QNAME, ContentModel.TYPE_FOLDER); - mapCmisQNameToAlfrescoQName.put(RELATIONSHIP_QNAME, null); - mapCmisQNameToAlfrescoQName.put(POLICY_QNAME, null); - - // - // Data Type Mappings - // - - mapAlfrescoToCmisDataType.put(DataTypeDefinition.ANY, null); - mapAlfrescoToCmisDataType.put(DataTypeDefinition.ASSOC_REF, null); - mapAlfrescoToCmisDataType.put(DataTypeDefinition.BOOLEAN, PropertyType.BOOLEAN); - mapAlfrescoToCmisDataType.put(DataTypeDefinition.CATEGORY, PropertyType.ID); - mapAlfrescoToCmisDataType.put(DataTypeDefinition.CHILD_ASSOC_REF, null); - mapAlfrescoToCmisDataType.put(DataTypeDefinition.CONTENT, null); - mapAlfrescoToCmisDataType.put(DataTypeDefinition.DATE, PropertyType.DATETIME); - mapAlfrescoToCmisDataType.put(DataTypeDefinition.DATETIME, PropertyType.DATETIME); - mapAlfrescoToCmisDataType.put(DataTypeDefinition.DOUBLE, PropertyType.DECIMAL); - mapAlfrescoToCmisDataType.put(DataTypeDefinition.FLOAT, PropertyType.DECIMAL); - mapAlfrescoToCmisDataType.put(DataTypeDefinition.INT, PropertyType.INTEGER); - mapAlfrescoToCmisDataType.put(DataTypeDefinition.LOCALE, null); - mapAlfrescoToCmisDataType.put(DataTypeDefinition.PERIOD, null); - mapAlfrescoToCmisDataType.put(DataTypeDefinition.LONG, PropertyType.INTEGER); - mapAlfrescoToCmisDataType.put(DataTypeDefinition.MLTEXT, PropertyType.STRING); - mapAlfrescoToCmisDataType.put(DataTypeDefinition.NODE_REF, PropertyType.ID); - mapAlfrescoToCmisDataType.put(DataTypeDefinition.PATH, null); - mapAlfrescoToCmisDataType.put(DataTypeDefinition.QNAME, null); - mapAlfrescoToCmisDataType.put(DataTypeDefinition.TEXT, PropertyType.STRING); - mapAlfrescoToCmisDataType.put(CMIS_DATATYPE_ID, PropertyType.ID); - mapAlfrescoToCmisDataType.put(CMIS_DATATYPE_URI, PropertyType.URI); - mapAlfrescoToCmisDataType.put(CMIS_DATATYPE_HTML, PropertyType.HTML); - - mapCmisDataTypeToAlfresco.put(PropertyType.ID, DataTypeDefinition.TEXT); - mapCmisDataTypeToAlfresco.put(PropertyType.INTEGER, DataTypeDefinition.LONG); - mapCmisDataTypeToAlfresco.put(PropertyType.STRING, DataTypeDefinition.TEXT); - mapCmisDataTypeToAlfresco.put(PropertyType.DECIMAL, DataTypeDefinition.DOUBLE); - mapCmisDataTypeToAlfresco.put(PropertyType.BOOLEAN, DataTypeDefinition.BOOLEAN); - mapCmisDataTypeToAlfresco.put(PropertyType.DATETIME, DataTypeDefinition.DATETIME); - mapCmisDataTypeToAlfresco.put(PropertyType.URI, DataTypeDefinition.TEXT); - mapCmisDataTypeToAlfresco.put(PropertyType.HTML, DataTypeDefinition.TEXT); - - // - // Property Mappings - // - - registerPropertyAccessor(new ObjectIdProperty(serviceRegistry)); - registerPropertyAccessor(new NodeRefProperty(serviceRegistry)); - registerPropertyAccessor(new ObjectTypeIdProperty(serviceRegistry)); - registerPropertyAccessor(new BaseTypeIdProperty(serviceRegistry)); - 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 FixedValueProperty(serviceRegistry, PropertyIds.CHANGE_TOKEN, null)); - registerPropertyAccessor(new DirectProperty(serviceRegistry, PropertyIds.NAME, ContentModel.PROP_NAME) - { - @Override - public Serializable getValue(AssociationRef assocRef) - { - // Let's use the association ref as the name - return assocRef.toString(); - } - }); - registerPropertyAccessor(new IsImmutableProperty(serviceRegistry)); - registerPropertyAccessor(new IsLatestVersionProperty(serviceRegistry)); - registerPropertyAccessor(new IsMajorVersionProperty(serviceRegistry)); - registerPropertyAccessor(new IsLatestMajorVersionProperty(serviceRegistry)); - registerPropertyAccessor(new VersionLabelProperty(serviceRegistry)); - registerPropertyAccessor(new VersionSeriesIdProperty(serviceRegistry)); - registerPropertyAccessor(new IsVersionSeriesCheckedOutProperty(serviceRegistry)); - registerPropertyAccessor(new VersionSeriesCheckedOutByProperty(serviceRegistry)); - registerPropertyAccessor(new VersionSeriesCheckedOutIdProperty(serviceRegistry)); - registerPropertyAccessor(new CheckinCommentProperty(serviceRegistry)); - 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 ParentProperty(serviceRegistry)); - registerPropertyAccessor(new PathProperty(serviceRegistry, cmisConnector)); - registerPropertyAccessor(new AllowedChildObjectTypeIdsProperty(serviceRegistry, this)); - registerPropertyAccessor(new SourceIdProperty(serviceRegistry)); - registerPropertyAccessor(new TargetIdProperty(serviceRegistry)); - - // - // Action Evaluator Mappings - // - - // NOTE: The order of evaluators is important - they must be in the - // order as specified in CMIS-Core.xsd - // so that schema validation passes - - registerEvaluator(BaseTypeId.CMIS_DOCUMENT, - new CurrentVersionEvaluator(serviceRegistry, new PermissionActionEvaluator(serviceRegistry, - Action.CAN_DELETE_OBJECT, PermissionService.DELETE_NODE), false)); - registerEvaluator(BaseTypeId.CMIS_DOCUMENT, new CurrentVersionEvaluator(serviceRegistry, - new PermissionActionEvaluator(serviceRegistry, Action.CAN_UPDATE_PROPERTIES, - PermissionService.WRITE_PROPERTIES), false)); - registerEvaluator(BaseTypeId.CMIS_DOCUMENT, new PermissionActionEvaluator(serviceRegistry, - Action.CAN_GET_PROPERTIES, PermissionService.READ_PROPERTIES)); - registerEvaluator(BaseTypeId.CMIS_DOCUMENT, new FixedValueActionEvaluator(serviceRegistry, - Action.CAN_GET_OBJECT_RELATIONSHIPS, true)); - registerEvaluator(BaseTypeId.CMIS_DOCUMENT, new ParentActionEvaluator(new PermissionActionEvaluator( - serviceRegistry, Action.CAN_GET_OBJECT_PARENTS, PermissionService.READ_PERMISSIONS))); - // Is CAN_MOVE correct mapping? - registerEvaluator(BaseTypeId.CMIS_DOCUMENT, new CurrentVersionEvaluator(serviceRegistry, - new PermissionActionEvaluator(serviceRegistry, Action.CAN_MOVE_OBJECT, PermissionService.DELETE_NODE), - false)); - registerEvaluator(BaseTypeId.CMIS_DOCUMENT, new CurrentVersionEvaluator(serviceRegistry, - new PermissionActionEvaluator(serviceRegistry, Action.CAN_DELETE_CONTENT_STREAM, - 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 CurrentVersionEvaluator(serviceRegistry, - new PermissionActionEvaluator(serviceRegistry, Action.CAN_SET_CONTENT_STREAM, - PermissionService.WRITE_CONTENT), false)); - registerEvaluator(BaseTypeId.CMIS_DOCUMENT, new FixedValueActionEvaluator(serviceRegistry, - Action.CAN_GET_ALL_VERSIONS, true)); - registerEvaluator(BaseTypeId.CMIS_DOCUMENT, new CurrentVersionEvaluator(serviceRegistry, - new ParentActionEvaluator(new PermissionActionEvaluator(serviceRegistry, - Action.CAN_ADD_OBJECT_TO_FOLDER, PermissionService.LINK_CHILDREN)), false)); - // Is CAN_REMOVE_FROM_FOLDER correct mapping? - registerEvaluator(BaseTypeId.CMIS_DOCUMENT, new CurrentVersionEvaluator(serviceRegistry, - new ParentActionEvaluator(new FixedValueActionEvaluator(serviceRegistry, - Action.CAN_REMOVE_OBJECT_FROM_FOLDER, true)), false)); - registerEvaluator(BaseTypeId.CMIS_DOCUMENT, new PermissionActionEvaluator(serviceRegistry, - Action.CAN_GET_CONTENT_STREAM, PermissionService.READ_CONTENT)); - registerEvaluator(BaseTypeId.CMIS_DOCUMENT, new FixedValueActionEvaluator(serviceRegistry, - Action.CAN_APPLY_POLICY, false)); - registerEvaluator(BaseTypeId.CMIS_DOCUMENT, new FixedValueActionEvaluator(serviceRegistry, - Action.CAN_GET_APPLIED_POLICIES, true)); - registerEvaluator(BaseTypeId.CMIS_DOCUMENT, new FixedValueActionEvaluator(serviceRegistry, - Action.CAN_REMOVE_POLICY, false)); - registerEvaluator(BaseTypeId.CMIS_DOCUMENT, new CurrentVersionEvaluator(serviceRegistry, - new FixedValueActionEvaluator(serviceRegistry, Action.CAN_CREATE_RELATIONSHIP, true), false)); - registerEvaluator(BaseTypeId.CMIS_DOCUMENT, new FixedValueActionEvaluator(serviceRegistry, - Action.CAN_GET_RENDITIONS, true)); - registerEvaluator(BaseTypeId.CMIS_DOCUMENT, new PermissionActionEvaluator(serviceRegistry, Action.CAN_GET_ACL, - PermissionService.READ_PERMISSIONS)); - registerEvaluator(BaseTypeId.CMIS_DOCUMENT, new CurrentVersionEvaluator(serviceRegistry, - new PermissionActionEvaluator(serviceRegistry, Action.CAN_APPLY_ACL, - PermissionService.CHANGE_PERMISSIONS), false)); - - registerEvaluator(BaseTypeId.CMIS_FOLDER, - new RootFolderEvaluator(serviceRegistry, cmisConnector, new PermissionActionEvaluator(serviceRegistry, - Action.CAN_DELETE_OBJECT, PermissionService.DELETE_NODE), false)); - registerEvaluator(BaseTypeId.CMIS_FOLDER, new PermissionActionEvaluator(serviceRegistry, - Action.CAN_UPDATE_PROPERTIES, PermissionService.WRITE_PROPERTIES)); - registerEvaluator(BaseTypeId.CMIS_FOLDER, new PermissionActionEvaluator(serviceRegistry, - Action.CAN_GET_FOLDER_TREE, PermissionService.READ_CHILDREN)); - registerEvaluator(BaseTypeId.CMIS_FOLDER, new PermissionActionEvaluator(serviceRegistry, - Action.CAN_GET_PROPERTIES, PermissionService.READ_PROPERTIES)); - registerEvaluator(BaseTypeId.CMIS_FOLDER, new FixedValueActionEvaluator(serviceRegistry, - Action.CAN_GET_OBJECT_RELATIONSHIPS, true)); - registerEvaluator(BaseTypeId.CMIS_FOLDER, new ParentActionEvaluator(new PermissionActionEvaluator( - serviceRegistry, Action.CAN_GET_OBJECT_PARENTS, PermissionService.READ_PERMISSIONS))); - registerEvaluator(BaseTypeId.CMIS_FOLDER, new RootFolderEvaluator(serviceRegistry, cmisConnector, - new ParentActionEvaluator(new PermissionActionEvaluator(serviceRegistry, Action.CAN_GET_FOLDER_PARENT, - PermissionService.READ_PERMISSIONS)), false)); - registerEvaluator(BaseTypeId.CMIS_FOLDER, new PermissionActionEvaluator(serviceRegistry, - Action.CAN_GET_DESCENDANTS, PermissionService.READ_CHILDREN)); - // Is CAN_MOVE_OBJECT correct mapping? - registerEvaluator(BaseTypeId.CMIS_FOLDER, new RootFolderEvaluator(serviceRegistry, cmisConnector, - new PermissionActionEvaluator(serviceRegistry, Action.CAN_MOVE_OBJECT, PermissionService.DELETE_NODE), - false)); - registerEvaluator(BaseTypeId.CMIS_FOLDER, new FixedValueActionEvaluator(serviceRegistry, - Action.CAN_APPLY_POLICY, false)); - registerEvaluator(BaseTypeId.CMIS_FOLDER, new FixedValueActionEvaluator(serviceRegistry, - Action.CAN_GET_APPLIED_POLICIES, true)); - registerEvaluator(BaseTypeId.CMIS_FOLDER, new FixedValueActionEvaluator(serviceRegistry, - Action.CAN_REMOVE_POLICY, false)); - registerEvaluator(BaseTypeId.CMIS_FOLDER, new PermissionActionEvaluator(serviceRegistry, - Action.CAN_GET_CHILDREN, PermissionService.READ_CHILDREN)); - registerEvaluator(BaseTypeId.CMIS_FOLDER, new PermissionActionEvaluator(serviceRegistry, - Action.CAN_CREATE_DOCUMENT, PermissionService.CREATE_CHILDREN)); - registerEvaluator(BaseTypeId.CMIS_FOLDER, new PermissionActionEvaluator(serviceRegistry, - Action.CAN_CREATE_FOLDER, PermissionService.CREATE_CHILDREN)); - registerEvaluator(BaseTypeId.CMIS_FOLDER, new PermissionActionEvaluator(serviceRegistry, - Action.CAN_CREATE_RELATIONSHIP, PermissionService.CREATE_ASSOCIATIONS)); - registerEvaluator(BaseTypeId.CMIS_FOLDER, new RootFolderEvaluator(serviceRegistry, cmisConnector, - new PermissionActionEvaluator(serviceRegistry, Action.CAN_DELETE_TREE, PermissionService.DELETE_NODE), - false)); - registerEvaluator(BaseTypeId.CMIS_FOLDER, new PermissionActionEvaluator(serviceRegistry, Action.CAN_GET_ACL, - PermissionService.READ_PERMISSIONS)); - registerEvaluator(BaseTypeId.CMIS_FOLDER, new PermissionActionEvaluator(serviceRegistry, Action.CAN_APPLY_ACL, - PermissionService.CHANGE_PERMISSIONS)); - - registerEvaluator(BaseTypeId.CMIS_RELATIONSHIP, new FixedValueActionEvaluator(serviceRegistry, - Action.CAN_DELETE_OBJECT, true)); - registerEvaluator(BaseTypeId.CMIS_RELATIONSHIP, new FixedValueActionEvaluator(serviceRegistry, - Action.CAN_UPDATE_PROPERTIES, false)); - registerEvaluator(BaseTypeId.CMIS_RELATIONSHIP, new FixedValueActionEvaluator(serviceRegistry, - Action.CAN_GET_PROPERTIES, true)); - registerEvaluator(BaseTypeId.CMIS_RELATIONSHIP, new FixedValueActionEvaluator(serviceRegistry, - Action.CAN_GET_ACL, false)); - registerEvaluator(BaseTypeId.CMIS_RELATIONSHIP, new FixedValueActionEvaluator(serviceRegistry, - Action.CAN_APPLY_ACL, false)); - - registerEvaluator(BaseTypeId.CMIS_POLICY, new FixedValueActionEvaluator(serviceRegistry, - Action.CAN_DELETE_OBJECT, false)); - registerEvaluator(BaseTypeId.CMIS_POLICY, new FixedValueActionEvaluator(serviceRegistry, - Action.CAN_UPDATE_PROPERTIES, false)); - registerEvaluator(BaseTypeId.CMIS_POLICY, new FixedValueActionEvaluator(serviceRegistry, - Action.CAN_GET_PROPERTIES, false)); - registerEvaluator(BaseTypeId.CMIS_POLICY, new FixedValueActionEvaluator(serviceRegistry, - Action.CAN_GET_OBJECT_PARENTS, false)); - registerEvaluator(BaseTypeId.CMIS_POLICY, new FixedValueActionEvaluator(serviceRegistry, - Action.CAN_MOVE_OBJECT, false)); - registerEvaluator(BaseTypeId.CMIS_POLICY, new FixedValueActionEvaluator(serviceRegistry, - Action.CAN_ADD_OBJECT_TO_FOLDER, false)); - registerEvaluator(BaseTypeId.CMIS_POLICY, new FixedValueActionEvaluator(serviceRegistry, - Action.CAN_REMOVE_OBJECT_FROM_FOLDER, false)); - registerEvaluator(BaseTypeId.CMIS_POLICY, new FixedValueActionEvaluator(serviceRegistry, - Action.CAN_GET_OBJECT_RELATIONSHIPS, false)); - registerEvaluator(BaseTypeId.CMIS_POLICY, new FixedValueActionEvaluator(serviceRegistry, - Action.CAN_GET_ACL, false)); - registerEvaluator(BaseTypeId.CMIS_POLICY, new FixedValueActionEvaluator(serviceRegistry, - Action.CAN_APPLY_ACL, false)); - - } - - /** - * @param serviceRegistry - */ - public void setServiceRegistry(ServiceRegistry serviceRegistry) - { - this.serviceRegistry = serviceRegistry; - } - - public void setCmisConnector(CMISConnector cmisConnector) - { - this.cmisConnector = cmisConnector; - } - - /** - * @return namespaceService - */ - /* package */NamespaceService getNamespaceService() - { - return serviceRegistry.getNamespaceService(); - } - - /** - * Gets the CMIS Type Id given the Alfresco QName for the type in any - * Alfresco model - * - * @param typeQName - * @return - */ - public String getCmisTypeId(BaseTypeId scope, QName typeQName) - { - String typeId = mapAlfrescoQNameToTypeId.get(typeQName); - if (typeId == null) - { - String p = null; - switch (scope) - { - case CMIS_DOCUMENT: - p = "D"; - break; - case CMIS_FOLDER: - p = "F"; - break; - case CMIS_RELATIONSHIP: - p = "R"; - break; - case CMIS_POLICY: - p = "P"; - break; - default: - throw new CmisRuntimeException("Invalid base type!"); - } - - return p + ":" + typeQName.toPrefixString(serviceRegistry.getNamespaceService()); - } else - { - return typeId; - } - } - - public String getCmisTypeId(QName classQName) - { - if (classQName.equals(ContentModel.TYPE_CONTENT)) - { - return getCmisTypeId(BaseTypeId.CMIS_DOCUMENT, classQName); - } - if (classQName.equals(ContentModel.TYPE_FOLDER)) - { - return getCmisTypeId(BaseTypeId.CMIS_FOLDER, classQName); - } - if (classQName.equals(CMISMapping.RELATIONSHIP_QNAME)) - { - return getCmisTypeId(BaseTypeId.CMIS_RELATIONSHIP, classQName); - } - if (classQName.equals(CMISMapping.POLICY_QNAME)) - { - return getCmisTypeId(BaseTypeId.CMIS_POLICY, classQName); - } - if (classQName.equals(CMISMapping.ASPECTS_QNAME)) - { - return getCmisTypeId(BaseTypeId.CMIS_POLICY, classQName); - } - if (isValidCmisDocument(classQName)) - { - return getCmisTypeId(BaseTypeId.CMIS_DOCUMENT, classQName); - } - if (isValidCmisFolder(classQName)) - { - return getCmisTypeId(BaseTypeId.CMIS_FOLDER, classQName); - } - if (isValidCmisRelationship(classQName)) - { - return getCmisTypeId(BaseTypeId.CMIS_RELATIONSHIP, classQName); - } - if (isValidCmisPolicy(classQName)) - { - return getCmisTypeId(BaseTypeId.CMIS_POLICY, classQName); - } - - return null; - } - - public String buildPrefixEncodedString(QName qname) - { - return qname.toPrefixString(serviceRegistry.getNamespaceService()); - } - - public QName getAlfrescoName(String typeId) - { - // Is it an Alfresco type id? - if (typeId.length() < 4 || typeId.charAt(1) != ':') - { - throw new CmisInvalidArgumentException("Malformed type id '" + typeId + "'"); - } - - return QName.createQName(typeId.substring(2), serviceRegistry.getNamespaceService()); - } - - /** - * Is this a valid cmis document or folder type (not a relationship) - * - * @param dictionaryService - * @param typeQName - * @return - */ - public boolean isValidCmisDocumentOrFolder(QName typeQName) - { - return isValidCmisFolder(typeQName) || isValidCmisDocument(typeQName); - } - - public boolean isValidCmisObject(BaseTypeId scope, QName qname) - { - switch (scope) - { - case CMIS_DOCUMENT: - return isValidCmisDocument(qname); - case CMIS_FOLDER: - return isValidCmisFolder(qname); - case CMIS_POLICY: - return isValidCmisPolicy(qname); - case CMIS_RELATIONSHIP: - return isValidCmisRelationship(qname); - } - - return false; - } - - /** - * Is this a valid CMIS folder type? - * - * @param dictionaryService - * @param typeQName - * @return - */ - public boolean isValidCmisFolder(QName typeQName) - { - if (typeQName == null) - { - return false; - } - if (typeQName.equals(FOLDER_QNAME)) - { - return true; - } - - if (serviceRegistry.getDictionaryService().isSubClass(typeQName, ContentModel.TYPE_FOLDER)) - { - if (typeQName.equals(ContentModel.TYPE_FOLDER)) - { - return false; - } else - { - return true; - } - } - - return false; - } - - /** - * Is this a valid CMIS document type? - * - * @param dictionaryService - * @param typeQName - * @return - */ - public boolean isValidCmisDocument(QName typeQName) - { - if (typeQName == null) - { - return false; - } - if (typeQName.equals(DOCUMENT_QNAME)) - { - return true; - } - - if (serviceRegistry.getDictionaryService().isSubClass(typeQName, ContentModel.TYPE_CONTENT)) - { - if (typeQName.equals(ContentModel.TYPE_CONTENT)) - { - return false; - } else - { - return true; - } - } - return false; - } - - /** - * Is this a valid CMIS policy type? - * - * @param dictionaryService - * @param typeQName - * @return - */ - public boolean isValidCmisPolicy(QName typeQName) - { - if (typeQName == null) - { - return false; - } - if (typeQName.equals(POLICY_QNAME)) - { - return true; - } - if (typeQName.equals(ASPECTS_QNAME)) - { - return true; - } - - AspectDefinition aspectDef = serviceRegistry.getDictionaryService().getAspect(typeQName); - if (aspectDef == null) - { - return false; - } - - if (aspectDef.getName().equals(ContentModel.ASPECT_VERSIONABLE) - || aspectDef.getName().equals(ContentModel.ASPECT_AUDITABLE) - || aspectDef.getName().equals(ContentModel.ASPECT_REFERENCEABLE)) - { - return false; - } - return true; - } - - /** - * Is an association valid in CMIS? It must be a non-child relationship and - * the source and target must both be valid CMIS types. - * - * @param dictionaryService - * @param associationQName - * @return - */ - public boolean isValidCmisRelationship(QName associationQName) - { - if (associationQName == null) - { - return false; - } - if (associationQName.equals(RELATIONSHIP_QNAME)) - { - return true; - } - AssociationDefinition associationDefinition = serviceRegistry.getDictionaryService().getAssociation( - associationQName); - if (associationDefinition == null) - { - return false; - } - if (associationDefinition.isChild()) - { - return false; - } - return true; - } - - /** - * Given an Alfresco model type map it to the appropriate type. Maps - * cm:folder and cm:content to the CMIS definitions - */ - public QName getCmisType(QName typeQName) - { - QName mapped = mapAlfrescoQNameToCmisQName.get(typeQName); - if (mapped != null) - { - return mapped; - } - return typeQName; - } - - /** - * Is Alfresco Type mapped to an alternative CMIS Type? - */ - public boolean isRemappedType(QName typeQName) - { - return mapAlfrescoQNameToCmisQName.containsKey(typeQName); - } - - /** - * Given a CMIS model type map it to the appropriate Alfresco type. - * - * @param cmisTypeQName - * @return - */ - public QName getAlfrescoClass(QName cmisTypeQName) - { - QName mapped = mapCmisQNameToAlfrescoQName.get(cmisTypeQName); - if (mapped != null) - { - return mapped; - } - return cmisTypeQName; - } - - /** - * Get the CMIS property type for a property - * - * @param dictionaryService - * @param propertyQName - * @return - */ - public PropertyType getDataType(DataTypeDefinition datatype) - { - return getDataType(datatype.getName()); - } - - public PropertyType getDataType(QName dataType) - { - return mapAlfrescoToCmisDataType.get(dataType); - } - - public QName getAlfrescoDataType(PropertyType propertyType) - { - return mapCmisDataTypeToAlfresco.get(propertyType); - } - - /** - * @param namespaceService - * @param propertyQName - * @return - */ - public String getCmisPropertyId(QName propertyQName) - { - return propertyQName.toPrefixString(serviceRegistry.getNamespaceService()); - } - - /** - * Get a Property Accessor - */ - public AbstractProperty getPropertyAccessor(String propertyId) - { - return propertyAccessors.get(propertyId); - } - - /** - * Register pre-defined Property Accessor - * - * @param propertyAccessor - */ - private void registerPropertyAccessor(AbstractProperty propertyAccessor) - { - propertyAccessors.put(propertyAccessor.getName(), propertyAccessor); - } - - /** - * Gets the Action Evaluators applicable for the given CMIS Scope - */ - public Map> getActionEvaluators(BaseTypeId scope) - { - Map> evaluators = actionEvaluators.get(scope); - if (evaluators == null) - { - evaluators = Collections.emptyMap(); - } - return evaluators; - } - - /** - * Register an Action Evaluator - * - * @param scope - * @param evaluator - */ - private void registerEvaluator(BaseTypeId scope, CMISActionEvaluator evaluator) - { - Map> evaluators = actionEvaluators.get(scope); - if (evaluators == null) - { - evaluators = new LinkedHashMap>(); - actionEvaluators.put(scope, evaluators); - } - if (evaluators.get(evaluator.getAction()) != null) - { - throw new AlfrescoRuntimeException("Already registered Action Evaluator " + evaluator.getAction() - + " for scope " + scope); - } - evaluators.put(evaluator.getAction(), evaluator); - - if (logger.isDebugEnabled()) - logger.debug("Registered Action Evaluator: scope=" + scope + ", evaluator=" + evaluator); - } - - public Collection> getReportedPermissions(String permission, Set permissions, - boolean hasFull, boolean isDirect, CMISAccessControlFormatEnum format) - { - ArrayList> answer = new ArrayList>(20); - // indirect - - if (hasFull) - { - answer.add(new Pair(CMIS_READ, false)); - answer.add(new Pair(CMIS_WRITE, false)); - answer.add(new Pair(CMIS_ALL, false)); - } - - for (String perm : permissions) - { - if (PermissionService.READ.equals(perm)) - { - answer.add(new Pair(CMIS_READ, false)); - } else if (PermissionService.WRITE.equals(perm)) - { - answer.add(new Pair(CMIS_WRITE, false)); - } else if (PermissionService.ALL_PERMISSIONS.equals(perm)) - { - answer.add(new Pair(CMIS_READ, false)); - answer.add(new Pair(CMIS_WRITE, false)); - answer.add(new Pair(CMIS_ALL, false)); - } - - if (hasFull) - { - answer.add(new Pair(CMIS_READ, false)); - answer.add(new Pair(CMIS_WRITE, false)); - answer.add(new Pair(CMIS_ALL, false)); - } - } - - // permission - - if (format == CMISAccessControlFormatEnum.REPOSITORY_SPECIFIC_PERMISSIONS) - { - if (PermissionService.READ.equals(permission)) - { - answer.add(new Pair(CMIS_READ, false)); - answer.add(new Pair(permission, isDirect)); - } else if (PermissionService.WRITE.equals(permission)) - { - answer.add(new Pair(CMIS_WRITE, false)); - answer.add(new Pair(permission, isDirect)); - } else if (PermissionService.ALL_PERMISSIONS.equals(permission)) - { - answer.add(new Pair(CMIS_ALL, false)); - answer.add(new Pair(permission, isDirect)); - } else - { - answer.add(new Pair(permission, isDirect)); - } - } else if (format == CMISAccessControlFormatEnum.CMIS_BASIC_PERMISSIONS) - { - if (PermissionService.READ.equals(permission)) - { - answer.add(new Pair(CMIS_READ, isDirect)); - } else if (PermissionService.WRITE.equals(permission)) - { - answer.add(new Pair(CMIS_WRITE, isDirect)); - } else if (PermissionService.ALL_PERMISSIONS.equals(permission)) - { - answer.add(new Pair(CMIS_ALL, isDirect)); - } else - { - // else nothing - } - } - - return answer; - } - - /** - * @param permission - * @return permission to set - */ - public String getSetPermission(String permission) - { - if (permission.equals(CMIS_READ)) - { - return PermissionService.READ; - } else if (permission.equals(CMIS_WRITE)) - { - return PermissionService.WRITE; - } else if (permission.equals(CMIS_ALL)) - { - return PermissionService.ALL_PERMISSIONS; - } else - { - return permission; - } - } - -} diff --git a/source/java/org/alfresco/opencmis/mapping/ContentStreamLengthProperty.java b/source/java/org/alfresco/opencmis/mapping/ContentStreamLengthProperty.java index 65f0c69b76..e994314764 100644 --- a/source/java/org/alfresco/opencmis/mapping/ContentStreamLengthProperty.java +++ b/source/java/org/alfresco/opencmis/mapping/ContentStreamLengthProperty.java @@ -22,11 +22,9 @@ import java.io.Serializable; import org.alfresco.model.ContentModel; import org.alfresco.service.ServiceRegistry; -import org.alfresco.service.cmr.dictionary.DataTypeDefinition; import org.alfresco.service.cmr.repository.ContentData; import org.alfresco.service.cmr.repository.NodeRef; import org.alfresco.service.cmr.repository.datatype.DefaultTypeConverter; -import org.alfresco.service.namespace.QName; import org.apache.chemistry.opencmis.commons.PropertyIds; /** @@ -34,7 +32,7 @@ import org.apache.chemistry.opencmis.commons.PropertyIds; * * @author andyh */ -public class ContentStreamLengthProperty extends AbstractSimpleProperty +public class ContentStreamLengthProperty extends AbstractProperty { /** * Construct @@ -65,31 +63,4 @@ public class ContentStreamLengthProperty extends AbstractSimpleProperty return 0L; } } - - public String getLuceneFieldName() - { - StringBuilder field = new StringBuilder(128); - field.append("@"); - field.append(ContentModel.PROP_CONTENT); - field.append(".size"); - return field.toString(); - } - - protected String getValueAsString(Serializable value) - { - Object converted = DefaultTypeConverter.INSTANCE.convert(getServiceRegistry().getDictionaryService() - .getDataType(DataTypeDefinition.LONG), value); - String asString = DefaultTypeConverter.INSTANCE.convert(String.class, converted); - return asString; - } - - protected QName getQNameForExists() - { - return ContentModel.PROP_CONTENT; - } - - protected DataTypeDefinition getInDataType() - { - return getServiceRegistry().getDictionaryService().getDataType(DataTypeDefinition.LONG); - } } diff --git a/source/java/org/alfresco/opencmis/mapping/ContentStreamMimetypeProperty.java b/source/java/org/alfresco/opencmis/mapping/ContentStreamMimetypeProperty.java index d7106c7e42..6af16d7d64 100644 --- a/source/java/org/alfresco/opencmis/mapping/ContentStreamMimetypeProperty.java +++ b/source/java/org/alfresco/opencmis/mapping/ContentStreamMimetypeProperty.java @@ -34,7 +34,7 @@ import org.apache.chemistry.opencmis.commons.PropertyIds; * * @author andyh */ -public class ContentStreamMimetypeProperty extends AbstractSimpleProperty +public class ContentStreamMimetypeProperty extends AbstractProperty { /** * Construct diff --git a/source/java/org/alfresco/opencmis/mapping/CurrentVersionEvaluator.java b/source/java/org/alfresco/opencmis/mapping/CurrentVersionEvaluator.java index 7c4770e38b..ccb5f35e68 100644 --- a/source/java/org/alfresco/opencmis/mapping/CurrentVersionEvaluator.java +++ b/source/java/org/alfresco/opencmis/mapping/CurrentVersionEvaluator.java @@ -21,7 +21,7 @@ package org.alfresco.opencmis.mapping; import java.io.Serializable; import org.alfresco.model.ContentModel; -import org.alfresco.opencmis.CMISActionEvaluator; +import org.alfresco.opencmis.dictionary.CMISActionEvaluator; import org.alfresco.repo.version.VersionBaseModel; import org.alfresco.service.ServiceRegistry; import org.alfresco.service.cmr.repository.NodeRef; diff --git a/source/java/org/alfresco/opencmis/mapping/DirectProperty.java b/source/java/org/alfresco/opencmis/mapping/DirectProperty.java index ddac3b618f..062e13706e 100644 --- a/source/java/org/alfresco/opencmis/mapping/DirectProperty.java +++ b/source/java/org/alfresco/opencmis/mapping/DirectProperty.java @@ -19,122 +19,19 @@ package org.alfresco.opencmis.mapping; import java.io.Serializable; -import java.util.Collections; -import java.util.HashSet; -import java.util.List; -import java.util.Locale; -import org.alfresco.repo.search.MLAnalysisMode; -import org.alfresco.repo.search.SearcherException; -import org.alfresco.repo.search.impl.lucene.LuceneQueryParser; -import org.alfresco.repo.search.impl.lucene.analysis.DateTimeAnalyser; import org.alfresco.service.ServiceRegistry; -import org.alfresco.service.cmr.dictionary.DataTypeDefinition; -import org.alfresco.service.cmr.dictionary.PropertyDefinition; import org.alfresco.service.cmr.repository.AssociationRef; import org.alfresco.service.cmr.repository.NodeRef; -import org.alfresco.service.cmr.repository.datatype.DefaultTypeConverter; import org.alfresco.service.namespace.QName; -import org.apache.lucene.index.IndexReader.FieldOption; -import org.springframework.extensions.surf.util.I18NUtil; /** * A simple 1-1 property mapping from a CMIS property name to an alfresco property * * @author andyh */ -public class DirectProperty extends AbstractSimpleProperty +public class DirectProperty extends AbstractProperty { - /* - * (non-Javadoc) - * @see org.alfresco.cmis.mapping.AbstractSimpleProperty#getLuceneSortField() - */ - @Override - public String getLuceneSortField(LuceneQueryParser lqp) - { - - String field = getLuceneFieldName(); - // need to find the real field to use - Locale sortLocale = null; - - PropertyDefinition propertyDef = getServiceRegistry().getDictionaryService().getProperty(QName.createQName(field.substring(1))); - - if (propertyDef.getDataType().getName().equals(DataTypeDefinition.CONTENT)) - { - throw new SearcherException("Order on content properties is not curently supported"); - } - else if ((propertyDef.getDataType().getName().equals(DataTypeDefinition.MLTEXT)) || (propertyDef.getDataType().getName().equals(DataTypeDefinition.TEXT))) - { - List locales = lqp.getSearchParameters().getLocales(); - if (((locales == null) || (locales.size() == 0))) - { - locales = Collections.singletonList(I18NUtil.getLocale()); - } - - if (locales.size() > 1) - { - throw new SearcherException("Order on text/mltext properties with more than one locale is not curently supported"); - } - - sortLocale = locales.get(0); - // find best field match - - HashSet allowableLocales = new HashSet(); - MLAnalysisMode analysisMode = lqp.getDefaultSearchMLAnalysisMode(); - for (Locale l : MLAnalysisMode.getLocales(analysisMode, sortLocale, false)) - { - allowableLocales.add(l.toString()); - } - - String sortField = field; - - for (Object current : lqp.getIndexReader().getFieldNames(FieldOption.INDEXED)) - { - String currentString = (String) current; - if (currentString.startsWith(field) && currentString.endsWith(".sort")) - { - String fieldLocale = currentString.substring(field.length() + 1, currentString.length() - 5); - if (allowableLocales.contains(fieldLocale)) - { - if (fieldLocale.equals(sortLocale.toString())) - { - sortField = currentString; - break; - } - else if (sortLocale.toString().startsWith(fieldLocale)) - { - if (sortField.equals(field) || (currentString.length() < sortField.length())) - { - sortField = currentString; - } - } - else if (fieldLocale.startsWith(sortLocale.toString())) - { - if (sortField.equals(field) || (currentString.length() < sortField.length())) - { - sortField = currentString; - } - } - } - } - } - - field = sortField; - - } - else if (propertyDef.getDataType().getName().equals(DataTypeDefinition.DATETIME)) - { - DataTypeDefinition dataType = propertyDef.getDataType(); - String analyserClassName = dataType.getAnalyserClassName(); - if (analyserClassName.equals(DateTimeAnalyser.class.getCanonicalName())) - { - field = field + ".sort"; - } - } - - return field; - } - private QName alfrescoName; /** @@ -176,32 +73,5 @@ public class DirectProperty extends AbstractSimpleProperty { return null; } - - public String getLuceneFieldName() - { - StringBuilder field = new StringBuilder(64); - field.append("@"); - field.append(alfrescoName); - return field.toString(); - } - - protected String getValueAsString(Serializable value) - { - PropertyDefinition pd = getServiceRegistry().getDictionaryService().getProperty(alfrescoName); - Object converted = DefaultTypeConverter.INSTANCE.convert(pd.getDataType(), value); - String asString = DefaultTypeConverter.INSTANCE.convert(String.class, converted); - return asString; - } - - protected QName getQNameForExists() - { - return alfrescoName; - } - - protected DataTypeDefinition getInDataType() - { - PropertyDefinition pd = getServiceRegistry().getDictionaryService().getProperty(alfrescoName); - return pd.getDataType(); - } - + } diff --git a/source/java/org/alfresco/opencmis/mapping/FixedValueProperty.java b/source/java/org/alfresco/opencmis/mapping/FixedValueProperty.java index b6fa336fb4..4e78fe081f 100644 --- a/source/java/org/alfresco/opencmis/mapping/FixedValueProperty.java +++ b/source/java/org/alfresco/opencmis/mapping/FixedValueProperty.java @@ -19,24 +19,10 @@ package org.alfresco.opencmis.mapping; import java.io.Serializable; -import java.util.Collection; -import java.util.regex.Matcher; -import java.util.regex.Pattern; -import org.alfresco.repo.search.impl.lucene.LuceneFunction; -import org.alfresco.repo.search.impl.lucene.LuceneQueryParser; -import org.alfresco.repo.search.impl.querymodel.PredicateMode; import org.alfresco.service.ServiceRegistry; import org.alfresco.service.cmr.repository.AssociationRef; import org.alfresco.service.cmr.repository.NodeRef; -import org.alfresco.service.cmr.repository.datatype.DefaultTypeConverter; -import org.alfresco.util.EqualsHelper; -import org.alfresco.util.SearchLanguageConversion; -import org.apache.lucene.index.Term; -import org.apache.lucene.queryParser.ParseException; -import org.apache.lucene.search.MatchAllDocsQuery; -import org.apache.lucene.search.Query; -import org.apache.lucene.search.TermQuery; /** * Property accessor for fixed value mapping (eg to null, true, etc) @@ -77,244 +63,4 @@ public class FixedValueProperty extends AbstractProperty { return value; } - - /* - * (non-Javadoc) - * @see org.alfresco.cmis.property.PropertyLuceneBuilder#buildLuceneEquality(org.alfresco.repo.search.impl.lucene.LuceneQueryParser, java.io.Serializable, org.alfresco.repo.search.impl.querymodel.PredicateMode) - */ - public Query buildLuceneEquality(LuceneQueryParser lqp, Serializable value, PredicateMode mode, LuceneFunction luceneFunction) throws ParseException - { - if (EqualsHelper.nullSafeEquals(value, value)) - { - return new MatchAllDocsQuery(); - } - else - { - return new TermQuery(new Term("NO_TOKENS", "__")); - } - } - - /* - * (non-Javadoc) - * @see org.alfresco.cmis.property.PropertyLuceneBuilder#buildLuceneExists(org.alfresco.repo.search.impl.lucene.LuceneQueryParser, java.lang.Boolean) - */ - public Query buildLuceneExists(LuceneQueryParser lqp, Boolean not) throws ParseException - { - if (not) - { - if (value == null) - { - return new MatchAllDocsQuery(); - } - else - { - return new TermQuery(new Term("NO_TOKENS", "__")); - } - } - else - { - if (value == null) - { - return new TermQuery(new Term("NO_TOKENS", "__")); - } - else - { - return new MatchAllDocsQuery(); - } - } - - } - - /* - * (non-Javadoc) - * @see org.alfresco.cmis.property.PropertyLuceneBuilder#buildLuceneGreaterThan(org.alfresco.repo.search.impl.lucene.LuceneQueryParser, java.io.Serializable, org.alfresco.repo.search.impl.querymodel.PredicateMode) - */ - @SuppressWarnings("unchecked") - public Query buildLuceneGreaterThan(LuceneQueryParser lqp, Serializable value, PredicateMode mode, LuceneFunction luceneFunction) throws ParseException - { - if (value instanceof Comparable) - { - Comparable comparable = (Comparable) value; - if (comparable.compareTo(value) > 0) - { - return new MatchAllDocsQuery(); - } - else - { - return new TermQuery(new Term("NO_TOKENS", "__")); - } - } - else - { - return new TermQuery(new Term("NO_TOKENS", "__")); - } - } - - /* - * (non-Javadoc) - * @see org.alfresco.cmis.property.PropertyLuceneBuilder#buildLuceneGreaterThanOrEquals(org.alfresco.repo.search.impl.lucene.LuceneQueryParser, java.io.Serializable, org.alfresco.repo.search.impl.querymodel.PredicateMode) - */ - @SuppressWarnings("unchecked") - public Query buildLuceneGreaterThanOrEquals(LuceneQueryParser lqp, Serializable value, PredicateMode mode, LuceneFunction luceneFunction) throws ParseException - { - if (value instanceof Comparable) - { - Comparable comparable = (Comparable) value; - if (comparable.compareTo(value) >= 0) - { - return new MatchAllDocsQuery(); - } - else - { - return new TermQuery(new Term("NO_TOKENS", "__")); - } - } - else - { - return new TermQuery(new Term("NO_TOKENS", "__")); - } - } - - /* - * (non-Javadoc) - * @see org.alfresco.cmis.property.PropertyLuceneBuilder#buildLuceneIn(org.alfresco.repo.search.impl.lucene.LuceneQueryParser, java.util.Collection, java.lang.Boolean, org.alfresco.repo.search.impl.querymodel.PredicateMode) - */ - public Query buildLuceneIn(LuceneQueryParser lqp, Collection values, Boolean not, PredicateMode mode) throws ParseException - { - boolean in = false; - for (Serializable value : values) - { - if (EqualsHelper.nullSafeEquals(value, value)) - { - in = true; - break; - } - } - - if (in == !not) - { - return new MatchAllDocsQuery(); - } - else - { - return new TermQuery(new Term("NO_TOKENS", "__")); - } - } - - /* - * (non-Javadoc) - * @see org.alfresco.cmis.property.PropertyLuceneBuilder#buildLuceneInequality(org.alfresco.repo.search.impl.lucene.LuceneQueryParser, java.io.Serializable, org.alfresco.repo.search.impl.querymodel.PredicateMode) - */ - public Query buildLuceneInequality(LuceneQueryParser lqp, Serializable value, PredicateMode mode, LuceneFunction luceneFunction) throws ParseException - { - if (!EqualsHelper.nullSafeEquals(value, value)) - { - return new MatchAllDocsQuery(); - } - else - { - return new TermQuery(new Term("NO_TOKENS", "__")); - } - } - - /* - * (non-Javadoc) - * @see org.alfresco.cmis.property.PropertyLuceneBuilder#buildLuceneLessThan(org.alfresco.repo.search.impl.lucene.LuceneQueryParser, java.io.Serializable, org.alfresco.repo.search.impl.querymodel.PredicateMode) - */ - @SuppressWarnings("unchecked") - public Query buildLuceneLessThan(LuceneQueryParser lqp, Serializable value, PredicateMode mode, LuceneFunction luceneFunction) throws ParseException - { - if (value instanceof Comparable) - { - Comparable comparable = (Comparable) value; - if (comparable.compareTo(value) < 0) - { - return new MatchAllDocsQuery(); - } - else - { - return new TermQuery(new Term("NO_TOKENS", "__")); - } - } - else - { - return new TermQuery(new Term("NO_TOKENS", "__")); - } - } - - /* - * (non-Javadoc) - * @see org.alfresco.cmis.property.PropertyLuceneBuilder#buildLuceneLessThanOrEquals(org.alfresco.repo.search.impl.lucene.LuceneQueryParser, java.io.Serializable, org.alfresco.repo.search.impl.querymodel.PredicateMode) - */ - @SuppressWarnings("unchecked") - public Query buildLuceneLessThanOrEquals(LuceneQueryParser lqp, Serializable value, PredicateMode mode, LuceneFunction luceneFunction) throws ParseException - { - if (value instanceof Comparable) - { - Comparable comparable = (Comparable) value; - if (comparable.compareTo(value) <= 0) - { - return new MatchAllDocsQuery(); - } - else - { - return new TermQuery(new Term("NO_TOKENS", "__")); - } - } - else - { - return new TermQuery(new Term("NO_TOKENS", "__")); - } - } - - /* - * (non-Javadoc) - * @see org.alfresco.cmis.property.PropertyLuceneBuilder#buildLuceneLike(org.alfresco.repo.search.impl.lucene.LuceneQueryParser, java.io.Serializable, java.lang.Boolean) - */ - public Query buildLuceneLike(LuceneQueryParser lqp, Serializable value, Boolean not) throws ParseException - { - if (value != null) - { - boolean matches = false; - - Object converted = DefaultTypeConverter.INSTANCE.convert(value.getClass(), value); - String asString = DefaultTypeConverter.INSTANCE.convert(String.class, converted); - String regExpression = SearchLanguageConversion.convertSQLLikeToRegex(asString); - Pattern pattern = Pattern.compile(regExpression); - String target = DefaultTypeConverter.INSTANCE.convert(String.class, value); - Matcher matcher = pattern.matcher(target); - if (matcher.matches()) - { - matches = true; - } - - if (matches == !not) - { - return new MatchAllDocsQuery(); - } - else - { - return new TermQuery(new Term("NO_TOKENS", "__")); - } - } - else - { - return new TermQuery(new Term("NO_TOKENS", "__")); - } - } - - /* - * (non-Javadoc) - * @see org.alfresco.cmis.property.PropertyLuceneBuilder#getLuceneSortField() - */ - public String getLuceneSortField(LuceneQueryParser lqp) - { - throw new UnsupportedOperationException(); - } - - public String getLuceneFieldName() - { - throw new UnsupportedOperationException(); - } - } diff --git a/source/java/org/alfresco/opencmis/mapping/NodeRefProperty.java b/source/java/org/alfresco/opencmis/mapping/NodeRefProperty.java index 9dd8fd6452..ee456cb6f7 100644 --- a/source/java/org/alfresco/opencmis/mapping/NodeRefProperty.java +++ b/source/java/org/alfresco/opencmis/mapping/NodeRefProperty.java @@ -29,7 +29,7 @@ import org.alfresco.service.cmr.repository.NodeRef; */ public class NodeRefProperty extends AbstractVersioningProperty { - public static final String NodeRefPropertyId = "alf:nodeRef"; + public static final String NodeRefPropertyId = "alfcmis:nodeRef"; /** * Construct diff --git a/source/java/org/alfresco/opencmis/mapping/ObjectIdProperty.java b/source/java/org/alfresco/opencmis/mapping/ObjectIdProperty.java index 892b9041f9..4b876dd138 100644 --- a/source/java/org/alfresco/opencmis/mapping/ObjectIdProperty.java +++ b/source/java/org/alfresco/opencmis/mapping/ObjectIdProperty.java @@ -19,29 +19,14 @@ package org.alfresco.opencmis.mapping; import java.io.Serializable; -import java.util.Collection; -import org.alfresco.cmis.CMISQueryException; import org.alfresco.model.ContentModel; import org.alfresco.opencmis.CMISConnector; -import org.alfresco.repo.search.impl.lucene.AnalysisMode; -import org.alfresco.repo.search.impl.lucene.LuceneFunction; -import org.alfresco.repo.search.impl.lucene.LuceneQueryParser; -import org.alfresco.repo.search.impl.querymodel.PredicateMode; import org.alfresco.service.ServiceRegistry; -import org.alfresco.service.cmr.dictionary.DataTypeDefinition; import org.alfresco.service.cmr.repository.AssociationRef; import org.alfresco.service.cmr.repository.NodeRef; -import org.alfresco.service.cmr.repository.datatype.DefaultTypeConverter; import org.alfresco.service.namespace.QName; import org.apache.chemistry.opencmis.commons.PropertyIds; -import org.apache.lucene.index.Term; -import org.apache.lucene.queryParser.ParseException; -import org.apache.lucene.search.BooleanClause.Occur; -import org.apache.lucene.search.BooleanQuery; -import org.apache.lucene.search.MatchAllDocsQuery; -import org.apache.lucene.search.Query; -import org.apache.lucene.search.TermQuery; /** * Get the CMIS object id property. @@ -106,229 +91,4 @@ public class ObjectIdProperty extends AbstractVersioningProperty return CMISConnector.ASSOC_ID_PREFIX + assocRef.getId(); } - public String getLuceneFieldName() - { - return "ID"; - } - - private String getValueAsString(Serializable value) - { - Object converted = DefaultTypeConverter.INSTANCE.convert(getServiceRegistry().getDictionaryService() - .getDataType(DataTypeDefinition.NODE_REF), value); - String asString = DefaultTypeConverter.INSTANCE.convert(String.class, converted); - return asString; - } - - /* - * (non-Javadoc) - * - * @see - * org.alfresco.cmis.property.PropertyLuceneBuilder#buildLuceneEquality( - * org.alfresco.repo.search.impl.lucene.LuceneQueryParser, - * java.io.Serializable, - * org.alfresco.repo.search.impl.querymodel.PredicateMode) - */ - public Query buildLuceneEquality(LuceneQueryParser lqp, Serializable value, PredicateMode mode, - LuceneFunction luceneFunction) throws ParseException - { - String field = getLuceneFieldName(); - String stringValue = getValueAsString(value); - return lqp.getFieldQuery(field, stringValue, AnalysisMode.IDENTIFIER, luceneFunction); - } - - /* - * (non-Javadoc) - * - * @see - * org.alfresco.cmis.property.PropertyLuceneBuilder#buildLuceneExists(org - * .alfresco.repo.search.impl.lucene.LuceneQueryParser, java.lang.Boolean) - */ - public Query buildLuceneExists(LuceneQueryParser lqp, Boolean not) throws ParseException - { - if (not) - { - return new TermQuery(new Term("NO_TOKENS", "__")); - } else - { - return new MatchAllDocsQuery(); - } - } - - /* - * (non-Javadoc) - * - * @see - * org.alfresco.cmis.property.PropertyLuceneBuilder#buildLuceneGreaterThan - * (org.alfresco.repo.search.impl.lucene.LuceneQueryParser, - * java.io.Serializable, - * org.alfresco.repo.search.impl.querymodel.PredicateMode) - */ - public Query buildLuceneGreaterThan(LuceneQueryParser lqp, Serializable value, PredicateMode mode, - LuceneFunction luceneFunction) throws ParseException - { - throw new CMISQueryException("Property " + getName() + " can not be used in a 'greater than' comparison"); - } - - /* - * (non-Javadoc) - * - * @see org.alfresco.cmis.property.PropertyLuceneBuilder# - * buildLuceneGreaterThanOrEquals - * (org.alfresco.repo.search.impl.lucene.LuceneQueryParser, - * java.io.Serializable, - * org.alfresco.repo.search.impl.querymodel.PredicateMode) - */ - public Query buildLuceneGreaterThanOrEquals(LuceneQueryParser lqp, Serializable value, PredicateMode mode, - LuceneFunction luceneFunction) throws ParseException - { - throw new CMISQueryException("Property " + getName() - + " can not be used in a 'greater than or equals' comparison"); - } - - /* - * (non-Javadoc) - * - * @see - * org.alfresco.cmis.property.PropertyLuceneBuilder#buildLuceneIn(org.alfresco - * .repo.search.impl.lucene.LuceneQueryParser, java.util.Collection, - * java.lang.Boolean, - * org.alfresco.repo.search.impl.querymodel.PredicateMode) - */ - public Query buildLuceneIn(LuceneQueryParser lqp, Collection values, Boolean not, PredicateMode mode) - throws ParseException - { - String field = getLuceneFieldName(); - - // Check type conversion - - @SuppressWarnings("unused") - Object converted = DefaultTypeConverter.INSTANCE.convert(getServiceRegistry().getDictionaryService() - .getDataType(DataTypeDefinition.NODE_REF), values); - Collection asStrings = DefaultTypeConverter.INSTANCE.convert(String.class, values); - - if (asStrings.size() == 0) - { - if (not) - { - return new MatchAllDocsQuery(); - } else - { - return new TermQuery(new Term("NO_TOKENS", "__")); - } - } else if (asStrings.size() == 1) - { - String value = asStrings.iterator().next(); - if (not) - { - return lqp.getDoesNotMatchFieldQuery(field, value, AnalysisMode.IDENTIFIER, LuceneFunction.FIELD); - } else - { - return lqp.getFieldQuery(field, value, AnalysisMode.IDENTIFIER, LuceneFunction.FIELD); - } - } else - { - BooleanQuery booleanQuery = new BooleanQuery(); - if (not) - { - booleanQuery.add(new MatchAllDocsQuery(), Occur.MUST); - } - for (String value : asStrings) - { - Query any = lqp.getFieldQuery(field, value, AnalysisMode.IDENTIFIER, LuceneFunction.FIELD); - if (not) - { - booleanQuery.add(any, Occur.MUST_NOT); - } else - { - booleanQuery.add(any, Occur.SHOULD); - } - } - return booleanQuery; - } - } - - /* - * (non-Javadoc) - * - * @see - * org.alfresco.cmis.property.PropertyLuceneBuilder#buildLuceneInequality - * (org.alfresco.repo.search.impl.lucene.LuceneQueryParser, - * java.io.Serializable, - * org.alfresco.repo.search.impl.querymodel.PredicateMode) - */ - public Query buildLuceneInequality(LuceneQueryParser lqp, Serializable value, PredicateMode mode, - LuceneFunction luceneFunction) throws ParseException - { - String field = getLuceneFieldName(); - String stringValue = getValueAsString(value); - return lqp.getDoesNotMatchFieldQuery(field, stringValue, AnalysisMode.IDENTIFIER, luceneFunction); - } - - /* - * (non-Javadoc) - * - * @see - * org.alfresco.cmis.property.PropertyLuceneBuilder#buildLuceneLessThan( - * org.alfresco.repo.search.impl.lucene.LuceneQueryParser, - * java.io.Serializable, - * org.alfresco.repo.search.impl.querymodel.PredicateMode) - */ - public Query buildLuceneLessThan(LuceneQueryParser lqp, Serializable value, PredicateMode mode, - LuceneFunction luceneFunction) throws ParseException - { - throw new CMISQueryException("Property " + getName() + " can not be used in a 'less than' comparison"); - } - - /* - * (non-Javadoc) - * - * @see - * org.alfresco.cmis.property.PropertyLuceneBuilder#buildLuceneLessThanOrEquals - * (org.alfresco.repo.search.impl.lucene.LuceneQueryParser, - * java.io.Serializable, - * org.alfresco.repo.search.impl.querymodel.PredicateMode) - */ - public Query buildLuceneLessThanOrEquals(LuceneQueryParser lqp, Serializable value, PredicateMode mode, - LuceneFunction luceneFunction) throws ParseException - { - throw new CMISQueryException("Property " + getName() + " can not be used in a 'less than or equals' comparison"); - } - - /* - * (non-Javadoc) - * - * @see - * org.alfresco.cmis.property.NamedPropertyAccessor#buildLuceneLike(org. - * alfresco.repo.search.impl.lucene.LuceneQueryParser, java.lang.String, - * java.io.Serializable, java.lang.Boolean) - */ - public Query buildLuceneLike(LuceneQueryParser lqp, Serializable value, Boolean not) throws ParseException - { - String field = getLuceneFieldName(); - String stringValue = getValueAsString(value); - - if (not) - { - BooleanQuery booleanQuery = new BooleanQuery(); - booleanQuery.add(new MatchAllDocsQuery(), Occur.MUST); - booleanQuery.add(lqp.getLikeQuery(field, stringValue, AnalysisMode.IDENTIFIER), Occur.MUST_NOT); - return booleanQuery; - } else - { - return lqp.getLikeQuery(field, stringValue, AnalysisMode.IDENTIFIER); - } - } - - /* - * (non-Javadoc) - * - * @see - * org.alfresco.cmis.property.NamedPropertyAccessor#getLuceneSortField(java - * .lang.String) - */ - public String getLuceneSortField(LuceneQueryParser lqp) - { - return getLuceneFieldName(); - } - } diff --git a/source/java/org/alfresco/opencmis/mapping/ObjectTypeIdProperty.java b/source/java/org/alfresco/opencmis/mapping/ObjectTypeIdProperty.java index d8704f9e5e..bc5fcea0a1 100644 --- a/source/java/org/alfresco/opencmis/mapping/ObjectTypeIdProperty.java +++ b/source/java/org/alfresco/opencmis/mapping/ObjectTypeIdProperty.java @@ -19,29 +19,14 @@ package org.alfresco.opencmis.mapping; import java.io.Serializable; -import java.util.ArrayList; -import java.util.Collection; -import org.alfresco.cmis.CMISQueryException; -import org.alfresco.cmis.CMISScope; -import org.alfresco.cmis.CMISTypeDefinition; -import org.alfresco.repo.search.impl.lucene.AnalysisMode; -import org.alfresco.repo.search.impl.lucene.LuceneFunction; -import org.alfresco.repo.search.impl.lucene.LuceneQueryParser; -import org.alfresco.repo.search.impl.querymodel.PredicateMode; +import org.alfresco.opencmis.dictionary.CMISDictionaryService; import org.alfresco.service.ServiceRegistry; import org.alfresco.service.cmr.repository.AssociationRef; import org.alfresco.service.cmr.repository.NodeRef; -import org.alfresco.service.cmr.repository.datatype.DefaultTypeConverter; import org.alfresco.service.namespace.QName; import org.apache.chemistry.opencmis.commons.PropertyIds; -import org.apache.lucene.index.Term; -import org.apache.lucene.queryParser.ParseException; -import org.apache.lucene.search.BooleanClause.Occur; -import org.apache.lucene.search.BooleanQuery; -import org.apache.lucene.search.MatchAllDocsQuery; -import org.apache.lucene.search.Query; -import org.apache.lucene.search.TermQuery; +import org.apache.chemistry.opencmis.commons.enums.BaseTypeId; /** * Get the CMIS object type id property @@ -50,14 +35,17 @@ import org.apache.lucene.search.TermQuery; */ public class ObjectTypeIdProperty extends AbstractProperty { + private CMISDictionaryService dictionaryService; + /** * Construct * * @param serviceRegistry */ - public ObjectTypeIdProperty(ServiceRegistry serviceRegistry) + public ObjectTypeIdProperty(ServiceRegistry serviceRegistry, CMISDictionaryService dictionaryService) { super(serviceRegistry, PropertyIds.OBJECT_TYPE_ID); + this.dictionaryService = dictionaryService; } /* @@ -70,7 +58,7 @@ public class ObjectTypeIdProperty extends AbstractProperty public Serializable getValue(NodeRef nodeRef) { QName type = getServiceRegistry().getNodeService().getType(nodeRef); - return getServiceRegistry().getCMISDictionaryService().findTypeForClass(type).getTypeId().getId(); + return dictionaryService.findTypeForClass(type).getTypeId(); } /* @@ -83,239 +71,6 @@ public class ObjectTypeIdProperty extends AbstractProperty public Serializable getValue(AssociationRef assocRef) { QName type = assocRef.getTypeQName(); - return getServiceRegistry().getCMISDictionaryService().findTypeForClass(type, CMISScope.RELATIONSHIP) - .getTypeId().getId(); - } - - public String getLuceneFieldName() - { - return "TYPE"; - } - - private String getValueAsString(Serializable value) - { - // Object converted = - // DefaultTypeConverter.INSTANCE.convert(getServiceRegistry().getDictionaryService().getDataType(DataTypeDefinition.QNAME), - // value); - String asString = DefaultTypeConverter.INSTANCE.convert(String.class, value); - return asString; - } - - /* - * (non-Javadoc) - * - * @see - * org.alfresco.cmis.property.PropertyLuceneBuilder#buildLuceneEquality( - * org.alfresco.repo.search.impl.lucene.LuceneQueryParser, - * java.io.Serializable, - * org.alfresco.repo.search.impl.querymodel.PredicateMode) - */ - public Query buildLuceneEquality(LuceneQueryParser lqp, Serializable value, PredicateMode mode, - LuceneFunction luceneFunction) throws ParseException - { - String field = getLuceneFieldName(); - String stringValue = getValueAsString(value); - CMISTypeDefinition type = getServiceRegistry().getCMISDictionaryService().findType(stringValue); - return lqp - .getFieldQuery(field, type.getTypeId().getQName().toString(), AnalysisMode.IDENTIFIER, luceneFunction); - } - - /* - * (non-Javadoc) - * - * @see - * org.alfresco.cmis.property.PropertyLuceneBuilder#buildLuceneExists(org - * .alfresco.repo.search.impl.lucene.LuceneQueryParser, java.lang.Boolean) - */ - public Query buildLuceneExists(LuceneQueryParser lqp, Boolean not) throws ParseException - { - if (not) - { - return new TermQuery(new Term("NO_TOKENS", "__")); - } else - { - return new MatchAllDocsQuery(); - } - } - - /* - * (non-Javadoc) - * - * @see - * org.alfresco.cmis.property.PropertyLuceneBuilder#buildLuceneGreaterThan - * (org.alfresco.repo.search.impl.lucene.LuceneQueryParser, - * java.io.Serializable, - * org.alfresco.repo.search.impl.querymodel.PredicateMode) - */ - public Query buildLuceneGreaterThan(LuceneQueryParser lqp, Serializable value, PredicateMode mode, - LuceneFunction luceneFunction) throws ParseException - { - throw new CMISQueryException("Property " + getName() + " can not be used in a 'greater than' comparison"); - } - - /* - * (non-Javadoc) - * - * @see org.alfresco.cmis.property.PropertyLuceneBuilder# - * buildLuceneGreaterThanOrEquals - * (org.alfresco.repo.search.impl.lucene.LuceneQueryParser, - * java.io.Serializable, - * org.alfresco.repo.search.impl.querymodel.PredicateMode) - */ - public Query buildLuceneGreaterThanOrEquals(LuceneQueryParser lqp, Serializable value, PredicateMode mode, - LuceneFunction luceneFunction) throws ParseException - { - throw new CMISQueryException("Property " + getName() - + " can not be used in a 'greater than or equals' comparison"); - } - - /* - * (non-Javadoc) - * - * @see - * org.alfresco.cmis.property.PropertyLuceneBuilder#buildLuceneIn(org.alfresco - * .repo.search.impl.lucene.LuceneQueryParser, java.util.Collection, - * java.lang.Boolean, - * org.alfresco.repo.search.impl.querymodel.PredicateMode) - */ - public Query buildLuceneIn(LuceneQueryParser lqp, Collection values, Boolean not, PredicateMode mode) - throws ParseException - { - String field = getLuceneFieldName(); - - Collection asStrings = new ArrayList(values.size()); - for (Serializable value : values) - { - String stringValue = getValueAsString(value); - CMISTypeDefinition type = getServiceRegistry().getCMISDictionaryService().findType(stringValue); - asStrings.add(type.getTypeId().getQName().toString()); - } - - if (asStrings.size() == 0) - { - if (not) - { - return new MatchAllDocsQuery(); - } else - { - return new TermQuery(new Term("NO_TOKENS", "__")); - } - } else if (asStrings.size() == 1) - { - String value = asStrings.iterator().next(); - if (not) - { - return lqp.getDoesNotMatchFieldQuery(field, value, AnalysisMode.IDENTIFIER, LuceneFunction.FIELD); - } else - { - return lqp.getFieldQuery(field, value, AnalysisMode.IDENTIFIER, LuceneFunction.FIELD); - } - } else - { - BooleanQuery booleanQuery = new BooleanQuery(); - if (not) - { - booleanQuery.add(new MatchAllDocsQuery(), Occur.MUST); - } - for (String value : asStrings) - { - Query any = lqp.getFieldQuery(field, value, AnalysisMode.IDENTIFIER, LuceneFunction.FIELD); - if (not) - { - booleanQuery.add(any, Occur.MUST_NOT); - } else - { - booleanQuery.add(any, Occur.SHOULD); - } - } - return booleanQuery; - } - } - - /* - * (non-Javadoc) - * - * @see - * org.alfresco.cmis.property.PropertyLuceneBuilder#buildLuceneInequality - * (org.alfresco.repo.search.impl.lucene.LuceneQueryParser, - * java.io.Serializable, - * org.alfresco.repo.search.impl.querymodel.PredicateMode) - */ - public Query buildLuceneInequality(LuceneQueryParser lqp, Serializable value, PredicateMode mode, - LuceneFunction luceneFunction) throws ParseException - { - String field = getLuceneFieldName(); - String stringValue = getValueAsString(value); - CMISTypeDefinition type = getServiceRegistry().getCMISDictionaryService().findType(stringValue); - return lqp.getDoesNotMatchFieldQuery(field, type.getTypeId().getQName().toString(), AnalysisMode.IDENTIFIER, - luceneFunction); - } - - /* - * (non-Javadoc) - * - * @see - * org.alfresco.cmis.property.PropertyLuceneBuilder#buildLuceneLessThan( - * org.alfresco.repo.search.impl.lucene.LuceneQueryParser, - * java.io.Serializable, - * org.alfresco.repo.search.impl.querymodel.PredicateMode) - */ - public Query buildLuceneLessThan(LuceneQueryParser lqp, Serializable value, PredicateMode mode, - LuceneFunction luceneFunction) throws ParseException - { - throw new CMISQueryException("Property " + getName() + " can not be used in a 'less than' comparison"); - } - - /* - * (non-Javadoc) - * - * @see - * org.alfresco.cmis.property.PropertyLuceneBuilder#buildLuceneLessThanOrEquals - * (org.alfresco.repo.search.impl.lucene.LuceneQueryParser, - * java.io.Serializable, - * org.alfresco.repo.search.impl.querymodel.PredicateMode) - */ - public Query buildLuceneLessThanOrEquals(LuceneQueryParser lqp, Serializable value, PredicateMode mode, - LuceneFunction luceneFunction) throws ParseException - { - throw new CMISQueryException("Property " + getName() + " can not be used in a 'less than or equals' comparison"); - } - - /* - * (non-Javadoc) - * - * @see - * org.alfresco.cmis.property.PropertyLuceneBuilder#buildLuceneLike(org. - * alfresco.repo.search.impl.lucene.LuceneQueryParser, java.io.Serializable, - * java.lang.Boolean) - */ - public Query buildLuceneLike(LuceneQueryParser lqp, Serializable value, Boolean not) throws ParseException - { - String field = getLuceneFieldName(); - String stringValue = getValueAsString(value); - CMISTypeDefinition type = getServiceRegistry().getCMISDictionaryService().findType(stringValue); - String typeQName = type.getTypeId().getQName().toString(); - - if (not) - { - BooleanQuery booleanQuery = new BooleanQuery(); - booleanQuery.add(new MatchAllDocsQuery(), Occur.MUST); - booleanQuery.add(lqp.getLikeQuery(field, typeQName, AnalysisMode.IDENTIFIER), Occur.MUST_NOT); - return booleanQuery; - } else - { - return lqp.getLikeQuery(field, typeQName, AnalysisMode.IDENTIFIER); - } - } - - /* - * (non-Javadoc) - * - * @see - * org.alfresco.cmis.property.PropertyLuceneBuilder#getLuceneSortField() - */ - public String getLuceneSortField(LuceneQueryParser lqp) - { - return getLuceneFieldName(); + return dictionaryService.findTypeForClass(type, BaseTypeId.CMIS_RELATIONSHIP).getTypeId(); } } diff --git a/source/java/org/alfresco/opencmis/mapping/ParentProperty.java b/source/java/org/alfresco/opencmis/mapping/ParentProperty.java index 1d30a748cc..c257ed275f 100644 --- a/source/java/org/alfresco/opencmis/mapping/ParentProperty.java +++ b/source/java/org/alfresco/opencmis/mapping/ParentProperty.java @@ -19,25 +19,11 @@ package org.alfresco.opencmis.mapping; import java.io.Serializable; -import java.util.Collection; -import org.alfresco.repo.search.impl.lucene.AnalysisMode; -import org.alfresco.repo.search.impl.lucene.LuceneFunction; -import org.alfresco.repo.search.impl.lucene.LuceneQueryParser; -import org.alfresco.repo.search.impl.querymodel.PredicateMode; import org.alfresco.service.ServiceRegistry; -import org.alfresco.service.cmr.dictionary.DataTypeDefinition; import org.alfresco.service.cmr.repository.ChildAssociationRef; import org.alfresco.service.cmr.repository.NodeRef; -import org.alfresco.service.cmr.repository.datatype.DefaultTypeConverter; import org.apache.chemistry.opencmis.commons.PropertyIds; -import org.apache.lucene.index.Term; -import org.apache.lucene.queryParser.ParseException; -import org.apache.lucene.search.BooleanClause.Occur; -import org.apache.lucene.search.BooleanQuery; -import org.apache.lucene.search.MatchAllDocsQuery; -import org.apache.lucene.search.Query; -import org.apache.lucene.search.TermQuery; /** * Get the CMIS parent property @@ -80,167 +66,4 @@ public class ParentProperty extends AbstractProperty return null; } } - - public String getLuceneFieldName() - { - return "PARENT"; - } - - private String getValueAsString(Serializable value) - { - Object converted = DefaultTypeConverter.INSTANCE.convert(getServiceRegistry().getDictionaryService() - .getDataType(DataTypeDefinition.NODE_REF), value); - String asString = DefaultTypeConverter.INSTANCE.convert(String.class, converted); - return asString; - } - - /* - * (non-Javadoc) - * - * @see - * org.alfresco.cmis.property.PropertyLuceneBuilder#buildLuceneEquality( - * org.alfresco.repo.search.impl.lucene.LuceneQueryParser, - * java.io.Serializable, - * org.alfresco.repo.search.impl.querymodel.PredicateMode) - */ - public Query buildLuceneEquality(LuceneQueryParser lqp, Serializable value, PredicateMode mode, - LuceneFunction luceneFunction) throws ParseException - { - String field = getLuceneFieldName(); - String stringValue = getValueAsString(value); - return lqp.getFieldQuery(field, stringValue, AnalysisMode.IDENTIFIER, luceneFunction); - } - - /* - * (non-Javadoc) - * - * @see - * org.alfresco.cmis.property.PropertyLuceneBuilder#buildLuceneExists(org - * .alfresco.repo.search.impl.lucene.LuceneQueryParser, java.lang.Boolean) - */ - public Query buildLuceneExists(LuceneQueryParser lqp, Boolean not) throws ParseException - { - if (not) - { - return new TermQuery(new Term("ISROOT", "T")); - } else - { - return new MatchAllDocsQuery(); - } - } - - /* - * (non-Javadoc) - * - * @see - * org.alfresco.cmis.property.PropertyLuceneBuilder#buildLuceneIn(org.alfresco - * .repo.search.impl.lucene.LuceneQueryParser, java.util.Collection, - * java.lang.Boolean, - * org.alfresco.repo.search.impl.querymodel.PredicateMode) - */ - public Query buildLuceneIn(LuceneQueryParser lqp, Collection values, Boolean not, PredicateMode mode) - throws ParseException - { - String field = getLuceneFieldName(); - - // Check type conversion - - @SuppressWarnings("unused") - Object converted = DefaultTypeConverter.INSTANCE.convert(getServiceRegistry().getDictionaryService() - .getDataType(DataTypeDefinition.NODE_REF), values); - Collection asStrings = DefaultTypeConverter.INSTANCE.convert(String.class, values); - - if (asStrings.size() == 0) - { - if (not) - { - return new MatchAllDocsQuery(); - } else - { - return new TermQuery(new Term("NO_TOKENS", "__")); - } - } else if (asStrings.size() == 1) - { - String value = asStrings.iterator().next(); - if (not) - { - return lqp.getDoesNotMatchFieldQuery(field, value, AnalysisMode.IDENTIFIER, LuceneFunction.FIELD); - } else - { - return lqp.getFieldQuery(field, value, AnalysisMode.IDENTIFIER, LuceneFunction.FIELD); - } - } else - { - BooleanQuery booleanQuery = new BooleanQuery(); - if (not) - { - booleanQuery.add(new MatchAllDocsQuery(), Occur.MUST); - } - for (String value : asStrings) - { - Query any = lqp.getFieldQuery(field, value, AnalysisMode.IDENTIFIER, LuceneFunction.FIELD); - if (not) - { - booleanQuery.add(any, Occur.MUST_NOT); - } else - { - booleanQuery.add(any, Occur.SHOULD); - } - } - return booleanQuery; - } - } - - /* - * (non-Javadoc) - * - * @see - * org.alfresco.cmis.property.PropertyLuceneBuilder#buildLuceneInequality - * (org.alfresco.repo.search.impl.lucene.LuceneQueryParser, - * java.io.Serializable, - * org.alfresco.repo.search.impl.querymodel.PredicateMode) - */ - public Query buildLuceneInequality(LuceneQueryParser lqp, Serializable value, PredicateMode mode, - LuceneFunction luceneFunction) throws ParseException - { - String field = getLuceneFieldName(); - String stringValue = getValueAsString(value); - return lqp.getDoesNotMatchFieldQuery(field, stringValue, AnalysisMode.IDENTIFIER, luceneFunction); - } - - /* - * (non-Javadoc) - * - * @see - * org.alfresco.cmis.property.PropertyLuceneBuilder#buildLuceneLike(org. - * alfresco.repo.search.impl.lucene.LuceneQueryParser, java.io.Serializable, - * java.lang.Boolean) - */ - public Query buildLuceneLike(LuceneQueryParser lqp, Serializable value, Boolean not) throws ParseException - { - String field = getLuceneFieldName(); - String stringValue = getValueAsString(value); - - if (not) - { - BooleanQuery booleanQuery = new BooleanQuery(); - booleanQuery.add(new MatchAllDocsQuery(), Occur.MUST); - booleanQuery.add(lqp.getLikeQuery(field, stringValue, AnalysisMode.IDENTIFIER), Occur.MUST_NOT); - return booleanQuery; - } else - { - return lqp.getLikeQuery(field, stringValue, AnalysisMode.IDENTIFIER); - } - } - - /* - * (non-Javadoc) - * - * @see - * org.alfresco.cmis.property.PropertyLuceneBuilder#getLuceneSortField() - */ - public String getLuceneSortField(LuceneQueryParser lqp) - { - return getLuceneFieldName(); - } } diff --git a/source/java/org/alfresco/opencmis/mapping/RootFolderEvaluator.java b/source/java/org/alfresco/opencmis/mapping/RootFolderEvaluator.java index de53660748..dde89126b4 100644 --- a/source/java/org/alfresco/opencmis/mapping/RootFolderEvaluator.java +++ b/source/java/org/alfresco/opencmis/mapping/RootFolderEvaluator.java @@ -18,8 +18,8 @@ */ package org.alfresco.opencmis.mapping; -import org.alfresco.opencmis.CMISActionEvaluator; import org.alfresco.opencmis.CMISConnector; +import org.alfresco.opencmis.dictionary.CMISActionEvaluator; import org.alfresco.service.ServiceRegistry; import org.alfresco.service.cmr.repository.NodeRef; diff --git a/source/java/org/alfresco/opencmis/mapping/RuntimePropertyAccessorMapping.java b/source/java/org/alfresco/opencmis/mapping/RuntimePropertyAccessorMapping.java new file mode 100644 index 0000000000..ebf1021f10 --- /dev/null +++ b/source/java/org/alfresco/opencmis/mapping/RuntimePropertyAccessorMapping.java @@ -0,0 +1,363 @@ +/* + * 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 . + */ +package org.alfresco.opencmis.mapping; + +import java.io.Serializable; +import java.util.Collections; +import java.util.HashMap; +import java.util.LinkedHashMap; +import java.util.Map; + +import org.alfresco.error.AlfrescoRuntimeException; +import org.alfresco.model.ContentModel; +import org.alfresco.opencmis.CMISConnector; +import org.alfresco.opencmis.dictionary.CMISActionEvaluator; +import org.alfresco.opencmis.dictionary.CMISDictionaryService; +import org.alfresco.opencmis.dictionary.CMISPropertyAccessor; +import org.alfresco.opencmis.dictionary.PropertyAccessorMapping; +import org.alfresco.service.ServiceRegistry; +import org.alfresco.service.cmr.repository.AssociationRef; +import org.alfresco.service.cmr.repository.NodeRef; +import org.alfresco.service.cmr.security.PermissionService; +import org.alfresco.service.namespace.QName; +import org.apache.chemistry.opencmis.commons.PropertyIds; +import org.apache.chemistry.opencmis.commons.enums.Action; +import org.apache.chemistry.opencmis.commons.enums.BaseTypeId; +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. + * + * @author davidc + */ +public class RuntimePropertyAccessorMapping implements PropertyAccessorMapping, InitializingBean +{ + // Logger + protected static final Log logger = LogFactory.getLog(CMISMapping.class); + + // Service dependencies + private ServiceRegistry serviceRegistry; + private CMISConnector cmisConnector; + private CMISMapping cmisMapping; + private CMISDictionaryService cmisDictionaryService; + + private Map propertyAccessors = new HashMap(); + private Map>> actionEvaluators = new HashMap>>(); + + /** + * @param service registry + */ + public void setServiceRegistry(ServiceRegistry serviceRegistry) + { + this.serviceRegistry = serviceRegistry; + } + + /** + * @param cmis connector + */ + public void setCmisConnector(CMISConnector cmisConnector) + { + this.cmisConnector = cmisConnector; + } + + /** + * @param cmis mapping + */ + public void setCmisMapping(CMISMapping cmisMapping) + { + this.cmisMapping = cmisMapping; + } + + /** + * @param cmis mapping + */ + public void setCmisDictionaryService(CMISDictionaryService cmisDictionaryService) + { + this.cmisDictionaryService = cmisDictionaryService; + } + + /* + * (non-Javadoc) + * + * @see + * org.springframework.beans.factory.InitializingBean#afterPropertiesSet() + */ + public void afterPropertiesSet() throws Exception + { + // + // Property Mappings + // + + registerPropertyAccessor(new ObjectIdProperty(serviceRegistry)); + registerPropertyAccessor(new NodeRefProperty(serviceRegistry)); + 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 FixedValueProperty(serviceRegistry, PropertyIds.CHANGE_TOKEN, null)); + registerPropertyAccessor(new DirectProperty(serviceRegistry, PropertyIds.NAME, ContentModel.PROP_NAME) + { + @Override + public Serializable getValue(AssociationRef assocRef) + { + // Let's use the association ref as the name + return assocRef.toString(); + } + }); + registerPropertyAccessor(new IsImmutableProperty(serviceRegistry)); + registerPropertyAccessor(new IsLatestVersionProperty(serviceRegistry)); + registerPropertyAccessor(new IsMajorVersionProperty(serviceRegistry)); + registerPropertyAccessor(new IsLatestMajorVersionProperty(serviceRegistry)); + registerPropertyAccessor(new VersionLabelProperty(serviceRegistry)); + registerPropertyAccessor(new VersionSeriesIdProperty(serviceRegistry)); + registerPropertyAccessor(new IsVersionSeriesCheckedOutProperty(serviceRegistry)); + registerPropertyAccessor(new VersionSeriesCheckedOutByProperty(serviceRegistry)); + registerPropertyAccessor(new VersionSeriesCheckedOutIdProperty(serviceRegistry)); + registerPropertyAccessor(new CheckinCommentProperty(serviceRegistry)); + 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 ParentProperty(serviceRegistry)); + registerPropertyAccessor(new PathProperty(serviceRegistry, cmisConnector)); + registerPropertyAccessor(new AllowedChildObjectTypeIdsProperty(serviceRegistry, cmisMapping)); + registerPropertyAccessor(new SourceIdProperty(serviceRegistry)); + registerPropertyAccessor(new TargetIdProperty(serviceRegistry)); + + // + // Action Evaluator Mappings + // + + // NOTE: The order of evaluators is important - they must be in the + // order as specified in CMIS-Core.xsd + // so that schema validation passes + + registerEvaluator(BaseTypeId.CMIS_DOCUMENT, + new CurrentVersionEvaluator(serviceRegistry, new PermissionActionEvaluator(serviceRegistry, + Action.CAN_DELETE_OBJECT, PermissionService.DELETE_NODE), false)); + registerEvaluator(BaseTypeId.CMIS_DOCUMENT, new CurrentVersionEvaluator(serviceRegistry, + new PermissionActionEvaluator(serviceRegistry, Action.CAN_UPDATE_PROPERTIES, + PermissionService.WRITE_PROPERTIES), false)); + registerEvaluator(BaseTypeId.CMIS_DOCUMENT, new PermissionActionEvaluator(serviceRegistry, + Action.CAN_GET_PROPERTIES, PermissionService.READ_PROPERTIES)); + registerEvaluator(BaseTypeId.CMIS_DOCUMENT, new FixedValueActionEvaluator(serviceRegistry, + Action.CAN_GET_OBJECT_RELATIONSHIPS, true)); + registerEvaluator(BaseTypeId.CMIS_DOCUMENT, new ParentActionEvaluator(new PermissionActionEvaluator( + serviceRegistry, Action.CAN_GET_OBJECT_PARENTS, PermissionService.READ_PERMISSIONS))); + // Is CAN_MOVE correct mapping? + registerEvaluator(BaseTypeId.CMIS_DOCUMENT, new CurrentVersionEvaluator(serviceRegistry, + new PermissionActionEvaluator(serviceRegistry, Action.CAN_MOVE_OBJECT, PermissionService.DELETE_NODE), + false)); + registerEvaluator(BaseTypeId.CMIS_DOCUMENT, new CurrentVersionEvaluator(serviceRegistry, + new PermissionActionEvaluator(serviceRegistry, Action.CAN_DELETE_CONTENT_STREAM, + 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 CurrentVersionEvaluator(serviceRegistry, + new PermissionActionEvaluator(serviceRegistry, Action.CAN_SET_CONTENT_STREAM, + PermissionService.WRITE_CONTENT), false)); + registerEvaluator(BaseTypeId.CMIS_DOCUMENT, new FixedValueActionEvaluator(serviceRegistry, + Action.CAN_GET_ALL_VERSIONS, true)); + registerEvaluator(BaseTypeId.CMIS_DOCUMENT, new CurrentVersionEvaluator(serviceRegistry, + new ParentActionEvaluator(new PermissionActionEvaluator(serviceRegistry, + Action.CAN_ADD_OBJECT_TO_FOLDER, PermissionService.LINK_CHILDREN)), false)); + // Is CAN_REMOVE_FROM_FOLDER correct mapping? + registerEvaluator(BaseTypeId.CMIS_DOCUMENT, new CurrentVersionEvaluator(serviceRegistry, + new ParentActionEvaluator(new FixedValueActionEvaluator(serviceRegistry, + Action.CAN_REMOVE_OBJECT_FROM_FOLDER, true)), false)); + registerEvaluator(BaseTypeId.CMIS_DOCUMENT, new PermissionActionEvaluator(serviceRegistry, + Action.CAN_GET_CONTENT_STREAM, PermissionService.READ_CONTENT)); + registerEvaluator(BaseTypeId.CMIS_DOCUMENT, new FixedValueActionEvaluator(serviceRegistry, + Action.CAN_APPLY_POLICY, false)); + registerEvaluator(BaseTypeId.CMIS_DOCUMENT, new FixedValueActionEvaluator(serviceRegistry, + Action.CAN_GET_APPLIED_POLICIES, true)); + registerEvaluator(BaseTypeId.CMIS_DOCUMENT, new FixedValueActionEvaluator(serviceRegistry, + Action.CAN_REMOVE_POLICY, false)); + registerEvaluator(BaseTypeId.CMIS_DOCUMENT, new CurrentVersionEvaluator(serviceRegistry, + new FixedValueActionEvaluator(serviceRegistry, Action.CAN_CREATE_RELATIONSHIP, true), false)); + registerEvaluator(BaseTypeId.CMIS_DOCUMENT, new FixedValueActionEvaluator(serviceRegistry, + Action.CAN_GET_RENDITIONS, true)); + registerEvaluator(BaseTypeId.CMIS_DOCUMENT, new PermissionActionEvaluator(serviceRegistry, Action.CAN_GET_ACL, + PermissionService.READ_PERMISSIONS)); + registerEvaluator(BaseTypeId.CMIS_DOCUMENT, new CurrentVersionEvaluator(serviceRegistry, + new PermissionActionEvaluator(serviceRegistry, Action.CAN_APPLY_ACL, + PermissionService.CHANGE_PERMISSIONS), false)); + + registerEvaluator(BaseTypeId.CMIS_FOLDER, + new RootFolderEvaluator(serviceRegistry, cmisConnector, new PermissionActionEvaluator(serviceRegistry, + Action.CAN_DELETE_OBJECT, PermissionService.DELETE_NODE), false)); + registerEvaluator(BaseTypeId.CMIS_FOLDER, new PermissionActionEvaluator(serviceRegistry, + Action.CAN_UPDATE_PROPERTIES, PermissionService.WRITE_PROPERTIES)); + registerEvaluator(BaseTypeId.CMIS_FOLDER, new PermissionActionEvaluator(serviceRegistry, + Action.CAN_GET_FOLDER_TREE, PermissionService.READ_CHILDREN)); + registerEvaluator(BaseTypeId.CMIS_FOLDER, new PermissionActionEvaluator(serviceRegistry, + Action.CAN_GET_PROPERTIES, PermissionService.READ_PROPERTIES)); + registerEvaluator(BaseTypeId.CMIS_FOLDER, new FixedValueActionEvaluator(serviceRegistry, + Action.CAN_GET_OBJECT_RELATIONSHIPS, true)); + registerEvaluator(BaseTypeId.CMIS_FOLDER, new ParentActionEvaluator(new PermissionActionEvaluator( + serviceRegistry, Action.CAN_GET_OBJECT_PARENTS, PermissionService.READ_PERMISSIONS))); + registerEvaluator(BaseTypeId.CMIS_FOLDER, new RootFolderEvaluator(serviceRegistry, cmisConnector, + new ParentActionEvaluator(new PermissionActionEvaluator(serviceRegistry, Action.CAN_GET_FOLDER_PARENT, + PermissionService.READ_PERMISSIONS)), false)); + registerEvaluator(BaseTypeId.CMIS_FOLDER, new PermissionActionEvaluator(serviceRegistry, + Action.CAN_GET_DESCENDANTS, PermissionService.READ_CHILDREN)); + // Is CAN_MOVE_OBJECT correct mapping? + registerEvaluator(BaseTypeId.CMIS_FOLDER, new RootFolderEvaluator(serviceRegistry, cmisConnector, + new PermissionActionEvaluator(serviceRegistry, Action.CAN_MOVE_OBJECT, PermissionService.DELETE_NODE), + false)); + registerEvaluator(BaseTypeId.CMIS_FOLDER, new FixedValueActionEvaluator(serviceRegistry, + Action.CAN_APPLY_POLICY, false)); + registerEvaluator(BaseTypeId.CMIS_FOLDER, new FixedValueActionEvaluator(serviceRegistry, + Action.CAN_GET_APPLIED_POLICIES, true)); + registerEvaluator(BaseTypeId.CMIS_FOLDER, new FixedValueActionEvaluator(serviceRegistry, + Action.CAN_REMOVE_POLICY, false)); + registerEvaluator(BaseTypeId.CMIS_FOLDER, new PermissionActionEvaluator(serviceRegistry, + Action.CAN_GET_CHILDREN, PermissionService.READ_CHILDREN)); + registerEvaluator(BaseTypeId.CMIS_FOLDER, new PermissionActionEvaluator(serviceRegistry, + Action.CAN_CREATE_DOCUMENT, PermissionService.CREATE_CHILDREN)); + registerEvaluator(BaseTypeId.CMIS_FOLDER, new PermissionActionEvaluator(serviceRegistry, + Action.CAN_CREATE_FOLDER, PermissionService.CREATE_CHILDREN)); + registerEvaluator(BaseTypeId.CMIS_FOLDER, new PermissionActionEvaluator(serviceRegistry, + Action.CAN_CREATE_RELATIONSHIP, PermissionService.CREATE_ASSOCIATIONS)); + registerEvaluator(BaseTypeId.CMIS_FOLDER, new RootFolderEvaluator(serviceRegistry, cmisConnector, + new PermissionActionEvaluator(serviceRegistry, Action.CAN_DELETE_TREE, PermissionService.DELETE_NODE), + false)); + registerEvaluator(BaseTypeId.CMIS_FOLDER, new PermissionActionEvaluator(serviceRegistry, Action.CAN_GET_ACL, + PermissionService.READ_PERMISSIONS)); + registerEvaluator(BaseTypeId.CMIS_FOLDER, new PermissionActionEvaluator(serviceRegistry, Action.CAN_APPLY_ACL, + PermissionService.CHANGE_PERMISSIONS)); + + registerEvaluator(BaseTypeId.CMIS_RELATIONSHIP, new FixedValueActionEvaluator(serviceRegistry, + Action.CAN_DELETE_OBJECT, true)); + registerEvaluator(BaseTypeId.CMIS_RELATIONSHIP, new FixedValueActionEvaluator(serviceRegistry, + Action.CAN_UPDATE_PROPERTIES, false)); + registerEvaluator(BaseTypeId.CMIS_RELATIONSHIP, new FixedValueActionEvaluator(serviceRegistry, + Action.CAN_GET_PROPERTIES, true)); + registerEvaluator(BaseTypeId.CMIS_RELATIONSHIP, new FixedValueActionEvaluator(serviceRegistry, + Action.CAN_GET_ACL, false)); + registerEvaluator(BaseTypeId.CMIS_RELATIONSHIP, new FixedValueActionEvaluator(serviceRegistry, + Action.CAN_APPLY_ACL, false)); + + registerEvaluator(BaseTypeId.CMIS_POLICY, new FixedValueActionEvaluator(serviceRegistry, + Action.CAN_DELETE_OBJECT, false)); + registerEvaluator(BaseTypeId.CMIS_POLICY, new FixedValueActionEvaluator(serviceRegistry, + Action.CAN_UPDATE_PROPERTIES, false)); + registerEvaluator(BaseTypeId.CMIS_POLICY, new FixedValueActionEvaluator(serviceRegistry, + Action.CAN_GET_PROPERTIES, false)); + registerEvaluator(BaseTypeId.CMIS_POLICY, new FixedValueActionEvaluator(serviceRegistry, + Action.CAN_GET_OBJECT_PARENTS, false)); + registerEvaluator(BaseTypeId.CMIS_POLICY, new FixedValueActionEvaluator(serviceRegistry, + Action.CAN_MOVE_OBJECT, false)); + registerEvaluator(BaseTypeId.CMIS_POLICY, new FixedValueActionEvaluator(serviceRegistry, + Action.CAN_ADD_OBJECT_TO_FOLDER, false)); + registerEvaluator(BaseTypeId.CMIS_POLICY, new FixedValueActionEvaluator(serviceRegistry, + Action.CAN_REMOVE_OBJECT_FROM_FOLDER, false)); + registerEvaluator(BaseTypeId.CMIS_POLICY, new FixedValueActionEvaluator(serviceRegistry, + Action.CAN_GET_OBJECT_RELATIONSHIPS, false)); + registerEvaluator(BaseTypeId.CMIS_POLICY, new FixedValueActionEvaluator(serviceRegistry, + Action.CAN_GET_ACL, false)); + registerEvaluator(BaseTypeId.CMIS_POLICY, new FixedValueActionEvaluator(serviceRegistry, + Action.CAN_APPLY_ACL, false)); + } + + /** + * Gets a property accessor + * + * @param propertyId property id + * @return property accessor + */ + public CMISPropertyAccessor getPropertyAccessor(String propertyId) + { + return propertyAccessors.get(propertyId); + } + + /** + * Create a direct node 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 + * + * @param propertyAccessor + */ + private void registerPropertyAccessor(AbstractProperty propertyAccessor) + { + propertyAccessors.put(propertyAccessor.getName(), propertyAccessor); + } + + /** + * Gets the Action Evaluators applicable for the given CMIS Scope + * + * @param scope + */ + public Map> getActionEvaluators(BaseTypeId scope) + { + Map> evaluators = actionEvaluators.get(scope); + if (evaluators == null) + { + evaluators = Collections.emptyMap(); + } + return evaluators; + } + + /** + * Register an Action Evaluator + * + * @param scope + * @param evaluator + */ + private void registerEvaluator(BaseTypeId scope, CMISActionEvaluator evaluator) + { + Map> evaluators = actionEvaluators.get(scope); + if (evaluators == null) + { + evaluators = new LinkedHashMap>(); + actionEvaluators.put(scope, evaluators); + } + if (evaluators.get(evaluator.getAction()) != null) + { + throw new AlfrescoRuntimeException("Already registered Action Evaluator " + evaluator.getAction() + + " for scope " + scope); + } + evaluators.put(evaluator.getAction(), evaluator); + + if (logger.isDebugEnabled()) + logger.debug("Registered Action Evaluator: scope=" + scope + ", evaluator=" + evaluator); + } + +} diff --git a/source/java/org/alfresco/repo/audit/extractor/AbstractDataExtractor.java b/source/java/org/alfresco/repo/audit/extractor/AbstractDataExtractor.java index 374c2a75e2..ad9ad87b28 100644 --- a/source/java/org/alfresco/repo/audit/extractor/AbstractDataExtractor.java +++ b/source/java/org/alfresco/repo/audit/extractor/AbstractDataExtractor.java @@ -50,7 +50,6 @@ public abstract class AbstractDataExtractor implements DataExtractor, Initializi /** * Set the registry with which to register - * @param registry */ public void setRegistry(NamedObjectRegistry registry) { diff --git a/source/java/org/alfresco/repo/domain/permissions/AclDAOImpl.java b/source/java/org/alfresco/repo/domain/permissions/AclDAOImpl.java index 877f6da243..7bd8dd3412 100644 --- a/source/java/org/alfresco/repo/domain/permissions/AclDAOImpl.java +++ b/source/java/org/alfresco/repo/domain/permissions/AclDAOImpl.java @@ -44,7 +44,6 @@ import org.alfresco.repo.security.permissions.impl.SimplePermissionReference; import org.alfresco.repo.tenant.TenantService; import org.alfresco.repo.transaction.AlfrescoTransactionSupport; import org.alfresco.service.cmr.repository.NodeRef; -import org.alfresco.service.cmr.repository.StoreRef; import org.alfresco.service.cmr.security.AccessStatus; import org.alfresco.service.cmr.security.AuthorityType; import org.alfresco.service.namespace.QName; @@ -66,20 +65,11 @@ public class AclDAOImpl implements AclDAO { private static Log logger = LogFactory.getLog(AclDAOImpl.class); - /** Access to QName entities */ private QNameDAO qnameDAO; - - /** Access to ACL entities */ private AclCrudDAO aclCrudDAO; - - /** Access to Nodes entities */ private NodeDAO nodeDAO; - private TenantService tenantService; - - /** a transactionally-safe cache to be injected */ private SimpleCache aclCache; - private SimpleCache> readersCache; private enum WriteMode @@ -152,17 +142,19 @@ public class AclDAOImpl implements AclDAO this.readersCache = readersCache; } - /* (non-Javadoc) - * @see org.alfresco.repo.domain.permissions.AclDAO#createAccessControlList() + /** + * {@inheritDoc} */ + @Override public Long createAccessControlList() { return createAccessControlList(getDefaultProperties()).getId(); } - /* (non-Javadoc) - * @see org.alfresco.repo.domain.permissions.AclDAO#getDefaultProperties() + /** + * {@inheritDoc} */ + @Override public AccessControlListProperties getDefaultProperties() { SimpleAccessControlListProperties properties = new SimpleAccessControlListProperties(); @@ -172,9 +164,10 @@ public class AclDAOImpl implements AclDAO return properties; } - /* (non-Javadoc) - * @see org.alfresco.repo.domain.permissions.AclDAO#createAcl(org.alfresco.repo.security.permissions.AccessControlListProperties) + /** + * {@inheritDoc} */ + @Override public Acl createAccessControlList(AccessControlListProperties properties) { if (properties == null) @@ -215,9 +208,10 @@ public class AclDAOImpl implements AclDAO return createAccessControlList(properties, null, null); } - /* (non-Javadoc) - * @see org.alfresco.repo.domain.permissions.AclDAO#createAcl(org.alfresco.repo.security.permissions.AccessControlListProperties, java.util.List, java.lang.Long) + /** + * {@inheritDoc} */ + @Override public Acl createAccessControlList(AccessControlListProperties properties, List aces, Long inherited) { if (properties == null) @@ -347,7 +341,10 @@ public class AclDAOImpl implements AclDAO return createdAcl; } - private void getWritable(final Long id, final Long parent, List exclude, List toAdd, Long inheritsFrom, boolean cascade, + private void getWritable( + final Long id, final Long parent, + List exclude, List toAdd, + Long inheritsFrom, boolean cascade, List changes, WriteMode mode) { List inherited = null; @@ -392,18 +389,12 @@ public class AclDAOImpl implements AclDAO /** * Make a whole tree of ACLs copy on write if required Includes adding and removing ACEs which can be optimised * slightly for copy on write (no need to add and then remove) - * - * @param id - * @param parent - * @param exclude - * @param toAdd - * @param inheritsFrom - * @param cascade - * @param depth - * @param changes */ - private void getWritable(final Long id, final Long parent, List exclude, List toAdd, Long inheritsFrom, - List inherited, List positions, boolean cascade, int depth, List changes, WriteMode mode, boolean requiresVersion) + private void getWritable( + final Long id, final Long parent, + List exclude, List toAdd, Long inheritsFrom, + List inherited, List positions, + boolean cascade, int depth, List changes, WriteMode mode, boolean requiresVersion) { AclChange current = getWritable(id, parent, exclude, toAdd, inheritsFrom, inherited, positions, depth, mode, requiresVersion); changes.add(current); @@ -430,16 +421,11 @@ public class AclDAOImpl implements AclDAO /** * COW for an individual ACL - * - * @param id - * @param parent - * @param exclude - * @param toAdd - * @param inheritsFrom - * @param depth * @return - an AclChange */ - private AclChange getWritable(final Long id, final Long parent, List exclude, List acesToAdd, Long inheritsFrom, + private AclChange getWritable( + final Long id, final Long parent, + List exclude, List acesToAdd, Long inheritsFrom, List inherited, List positions, int depth, WriteMode mode, boolean requiresVersion) { AclUpdateEntity acl = aclCrudDAO.getAclForUpdate(id); @@ -630,10 +616,6 @@ public class AclDAOImpl implements AclDAO /** * Helper to remove ACEs from an ACL - * - * @param id - * @param exclude - * @param depth */ private void removeAcesFromAcl(final Long id, final List exclude, final int depth) { @@ -747,9 +729,10 @@ public class AclDAOImpl implements AclDAO addInherited(acl, inherited, positions, depth); } - /* (non-Javadoc) - * @see org.alfresco.repo.domain.permissions.AclDAO#deleteAccessControlEntries(java.lang.String) + /** + * {@inheritDoc} */ + @Override public List deleteAccessControlEntries(final String authority) { List acls = new ArrayList(); @@ -859,9 +842,10 @@ public class AclDAOImpl implements AclDAO return acls; } - /* (non-Javadoc) - * @see org.alfresco.repo.domain.permissions.AclDAO#deleteAclForNode(long, boolean) + /** + * {@inheritDoc} */ + @Override public void deleteAclForNode(long aclId, boolean isAVMNode) { Acl dbAcl = getAcl(aclId); @@ -901,9 +885,10 @@ public class AclDAOImpl implements AclDAO } } - /* (non-Javadoc) - * @see org.alfresco.repo.domain.permissions.AclDAO#deleteAccessControlList(java.lang.Long) + /** + * {@inheritDoc} */ + @Override public List deleteAccessControlList(final Long id) { if (logger.isDebugEnabled()) @@ -1010,6 +995,7 @@ public class AclDAOImpl implements AclDAO /** * {@inheritDoc} */ + @Override public List deleteLocalAccessControlEntries(Long id) { List changes = new ArrayList(); @@ -1023,6 +1009,7 @@ public class AclDAOImpl implements AclDAO /** * {@inheritDoc} */ + @Override public List deleteInheritedAccessControlEntries(Long id) { List changes = new ArrayList(); @@ -1036,6 +1023,7 @@ public class AclDAOImpl implements AclDAO /** * {@inheritDoc} */ + @Override public List deleteAccessControlEntries(Long id, AccessControlEntry pattern) { List changes = new ArrayList(); @@ -1047,6 +1035,7 @@ public class AclDAOImpl implements AclDAO /** * {@inheritDoc} */ + @Override public Acl getAcl(Long id) { return aclCrudDAO.getAcl(id); @@ -1055,6 +1044,7 @@ public class AclDAOImpl implements AclDAO /** * {@inheritDoc} */ + @Override public AccessControlListProperties getAccessControlListProperties(Long id) { ParameterCheck.mandatory("id", id); // Prevent unboxing failures @@ -1064,6 +1054,7 @@ public class AclDAOImpl implements AclDAO /** * {@inheritDoc} */ + @Override public AccessControlList getAccessControlList(Long id) { AccessControlList acl = aclCache.get(id); @@ -1132,9 +1123,10 @@ public class AclDAOImpl implements AclDAO return acl; } - /* (non-Javadoc) - * @see org.alfresco.repo.domain.permissions.AclDAO#getInheritedAccessControlList(java.lang.Long) + /** + * {@inheritDoc} */ + @Override public Long getInheritedAccessControlList(Long id) { aclCache.remove(id); @@ -1173,9 +1165,10 @@ public class AclDAOImpl implements AclDAO return inheritedAclId; } - /* (non-Javadoc) - * @see org.alfresco.repo.domain.permissions.AclDAO#mergeInheritedAccessControlList(java.lang.Long, java.lang.Long) + /** + * {@inheritDoc} */ + @Override public List mergeInheritedAccessControlList(Long inherited, Long target) { // TODO: For now we do a replace - we could do an insert if both inherit from the same acl @@ -1268,9 +1261,10 @@ public class AclDAOImpl implements AclDAO return changes; } - /* (non-Javadoc) - * @see org.alfresco.repo.domain.permissions.AclDAO#setAccessControlEntry(java.lang.Long, org.alfresco.repo.security.permissions.AccessControlEntry) + /** + * {@inheritDoc} */ + @Override public List setAccessControlEntry(final Long id, final AccessControlEntry ace) { Acl target = aclCrudDAO.getAcl(id); @@ -1316,9 +1310,10 @@ public class AclDAOImpl implements AclDAO return changes; } - /* (non-Javadoc) - * @see org.alfresco.repo.domain.permissions.AclDAO#enableInheritance(java.lang.Long, java.lang.Long) + /** + * {@inheritDoc} */ + @Override public List enableInheritance(Long id, Long parent) { List changes = new ArrayList(); @@ -1364,9 +1359,10 @@ public class AclDAOImpl implements AclDAO } } - /* (non-Javadoc) - * @see org.alfresco.repo.domain.permissions.AclDAO#disableInheritance(java.lang.Long, boolean) + /** + * {@inheritDoc} */ + @Override public List disableInheritance(Long id, boolean setInheritedOnAcl) { aclCache.remove(id); @@ -1527,9 +1523,10 @@ public class AclDAOImpl implements AclDAO } } - /* (non-Javadoc) - * @see org.alfresco.repo.domain.permissions.AclDAO#getDbAccessControlListCopy(java.lang.Long, java.lang.Long, org.alfresco.repo.security.permissions.ACLCopyMode) + /** + * {@inheritDoc} */ + @Override public Acl getAclCopy(Long toCopy, Long toInheritFrom, ACLCopyMode mode) { return getAclEntityCopy(toCopy, toInheritFrom, mode); @@ -1545,16 +1542,28 @@ public class AclDAOImpl implements AclDAO return aclCrudDAO.getAcl(id); } + /** + * {@inheritDoc} + */ + @Override public List getAVMNodesByAcl(long aclEntityId, int maxResults) { return aclCrudDAO.getAVMNodesByAcl(aclEntityId, maxResults); } + /** + * {@inheritDoc} + */ + @Override public List getADMNodesByAcl(long aclEntityId, int maxResults) { return aclCrudDAO.getADMNodesByAcl(aclEntityId, maxResults); } + /** + * {@inheritDoc} + */ + @Override public Acl createLayeredAcl(Long indirectedAcl) { SimpleAccessControlListProperties properties = new SimpleAccessControlListProperties(); @@ -1655,21 +1664,6 @@ public class AclDAOImpl implements AclDAO logger.debug("New change set = " + changeSetId); } } - else - { - /* - AclChangeSetEntity changeSet = aclCrudDAO.getAclChangeSet((Long)changeSetId); - if (changeSet == null) - { - throw new AlfrescoRuntimeException("Unexpected: missing change set "+changeSetId); - } - - if (logger.isDebugEnabled()) - { - logger.debug("Existing change set = " + changeSetId); - } - */ - } return changeSetId; } @@ -1846,39 +1840,30 @@ public class AclDAOImpl implements AclDAO } } - /* (non-Javadoc) - * @see org.alfresco.repo.domain.permissions.AclDAO#renameAuthority(java.lang.String, java.lang.String) + /** + * {@inheritDoc} */ + @Override public void renameAuthority(String before, String after) { aclCrudDAO.renameAuthority(before, after); aclCache.clear(); } - /* (non-Javadoc) - * @see org.alfresco.repo.domain.permissions.AclDAO#fixSharedAcl(java.lang.Long, java.lang.Long) + /** + * {@inheritDoc} */ @Override public void fixSharedAcl(Long shared, Long defining) { - Acl definingAcl = null; - if (defining != null) + if (defining == null) { - definingAcl = aclCrudDAO.getAcl(defining); - } - else - { - throw new IllegalStateException("Null defining acl"); + throw new IllegalArgumentException("Null defining acl"); } - Acl sharedAcl = null; - if (shared != null) + if (shared == null) { - sharedAcl = aclCrudDAO.getAcl(defining); - } - else - { - throw new IllegalStateException("Null shared acl"); + throw new IllegalArgumentException("Null shared acl"); } List changes = new ArrayList(); getWritable(shared, defining, null, null, defining, true, changes, WriteMode.CHANGE_INHERITED); diff --git a/source/java/org/alfresco/repo/jscript/ScriptNode.java b/source/java/org/alfresco/repo/jscript/ScriptNode.java index 7bc7f507a0..eaf4c09aa1 100644 --- a/source/java/org/alfresco/repo/jscript/ScriptNode.java +++ b/source/java/org/alfresco/repo/jscript/ScriptNode.java @@ -29,7 +29,6 @@ import java.text.MessageFormat; import java.util.ArrayList; import java.util.Arrays; import java.util.Collection; -import java.util.Collections; import java.util.HashMap; import java.util.HashSet; import java.util.LinkedHashMap; @@ -45,10 +44,11 @@ import org.alfresco.model.ContentModel; import org.alfresco.repo.action.executer.TransformActionExecuter; import org.alfresco.repo.content.transform.magick.ImageTransformationOptions; import org.alfresco.repo.search.QueryParameterDefImpl; +import org.alfresco.repo.security.permissions.AccessDeniedException; import org.alfresco.repo.tagging.script.TagScope; import org.alfresco.repo.thumbnail.ThumbnailDefinition; -import org.alfresco.repo.thumbnail.ThumbnailRegistry; import org.alfresco.repo.thumbnail.ThumbnailHelper; +import org.alfresco.repo.thumbnail.ThumbnailRegistry; import org.alfresco.repo.thumbnail.script.ScriptThumbnail; import org.alfresco.repo.transaction.AlfrescoTransactionSupport; import org.alfresco.repo.version.VersionModel; @@ -437,9 +437,14 @@ public class ScriptNode implements Serializable, Scopeable, NamespacePrefixResol while (t.hasMoreTokens() && result != null) { String name = t.nextToken(); - List results = this.nodeService.getChildrenByName( - result, ContentModel.ASSOC_CONTAINS, Collections.singletonList(name)); - result = (results.size() > 0 ? results.get(0).getChildRef() : null); + try + { + result = this.nodeService.getChildByName(result, ContentModel.ASSOC_CONTAINS, name); + } + catch (AccessDeniedException ade) + { + result = null; + } } } diff --git a/source/java/org/alfresco/repo/module/tool/ModuleManagementTool.java b/source/java/org/alfresco/repo/module/tool/ModuleManagementTool.java index 68159dfb9c..905a3f8130 100644 --- a/source/java/org/alfresco/repo/module/tool/ModuleManagementTool.java +++ b/source/java/org/alfresco/repo/module/tool/ModuleManagementTool.java @@ -669,7 +669,7 @@ public class ModuleManagementTool outputMessage(" Title: " + moduleDetails.getTitle(), true); outputMessage(" Version: " + moduleDetails.getVersion(), true); outputMessage(" Install Date: " + moduleDetails.getInstallDate(), true); - outputMessage(" Desription: " + moduleDetails.getDescription(), true); + outputMessage(" Description: " + moduleDetails.getDescription(), true); } } } diff --git a/source/java/org/alfresco/repo/search/impl/lucene/ADMLuceneSearcherImpl.java b/source/java/org/alfresco/repo/search/impl/lucene/ADMLuceneSearcherImpl.java index 682eb0279b..ee90276ce3 100644 --- a/source/java/org/alfresco/repo/search/impl/lucene/ADMLuceneSearcherImpl.java +++ b/source/java/org/alfresco/repo/search/impl/lucene/ADMLuceneSearcherImpl.java @@ -44,6 +44,7 @@ import org.alfresco.repo.search.MLAnalysisMode; import org.alfresco.repo.search.QueryRegisterComponent; import org.alfresco.repo.search.SearcherException; import org.alfresco.repo.search.impl.NodeSearcher; +import org.alfresco.repo.search.impl.lucene.analysis.AlfrescoStandardAnalyser; import org.alfresco.repo.search.impl.lucene.analysis.DateTimeAnalyser; import org.alfresco.repo.search.impl.parsers.AlfrescoFunctionEvaluationContext; import org.alfresco.repo.search.impl.parsers.FTSQueryParser; diff --git a/source/java/org/alfresco/repo/search/impl/lucene/AbstractLuceneBase.java b/source/java/org/alfresco/repo/search/impl/lucene/AbstractLuceneBase.java index f490ecdc62..8125c02add 100644 --- a/source/java/org/alfresco/repo/search/impl/lucene/AbstractLuceneBase.java +++ b/source/java/org/alfresco/repo/search/impl/lucene/AbstractLuceneBase.java @@ -23,6 +23,7 @@ import java.io.IOException; import java.util.Set; import org.alfresco.repo.search.IndexerException; +import org.alfresco.repo.search.impl.lucene.analysis.AlfrescoStandardAnalyser; import org.alfresco.repo.search.impl.lucene.index.IndexInfo; import org.alfresco.repo.search.impl.lucene.index.TransactionStatus; import org.alfresco.repo.search.impl.lucene.index.IndexInfo.LockWork; diff --git a/source/java/org/alfresco/repo/search/impl/lucene/MultiReader.java b/source/java/org/alfresco/repo/search/impl/lucene/MultiReader.java deleted file mode 100644 index a83f7ba111..0000000000 --- a/source/java/org/alfresco/repo/search/impl/lucene/MultiReader.java +++ /dev/null @@ -1,108 +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 . - */ -package org.alfresco.repo.search.impl.lucene; - -import java.io.IOException; -import java.io.Reader; - -class MultiReader extends Reader -{ - Reader first; - - Reader second; - - boolean firstActive = true; - - MultiReader(Reader first, Reader second) - { - this.first = first; - this.second = second; - } - - @Override - public void close() throws IOException - { - IOException ioe = null; - try - { - first.close(); - } - catch (IOException e) - { - ioe = e; - } - - second.close(); - if (ioe != null) - { - throw ioe; - } - - } - - @Override - public int read(char[] cbuf, int off, int len) throws IOException - { - synchronized (lock) - { - if ((off < 0) || (off > cbuf.length) || (len < 0) || ((off + len) > cbuf.length) || ((off + len) < 0)) - { - throw new IndexOutOfBoundsException(); - } - else if (len == 0) - { - return 0; - } - for(int i = 0; i < len; i++) - { - int c; - if(firstActive) - { - c = first.read(); - if(c == -1) - { - firstActive = false; - c = second.read(); - } - } - else - { - c = second.read(); - } - if(c == -1) - { - if(i == 0) - { - return -1; - } - else - { - return i; - } - } - else - { - cbuf[off+i] = (char)c; - } - } - return len; - } - } - -} \ No newline at end of file diff --git a/source/java/org/alfresco/repo/search/impl/lucene/SolrAlfrescoFTSQueryLanguage.java b/source/java/org/alfresco/repo/search/impl/lucene/SolrAlfrescoFTSQueryLanguage.java new file mode 100644 index 0000000000..e295f015fb --- /dev/null +++ b/source/java/org/alfresco/repo/search/impl/lucene/SolrAlfrescoFTSQueryLanguage.java @@ -0,0 +1,255 @@ +/* + * 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 . + */ +package org.alfresco.repo.search.impl.lucene; + +import java.io.BufferedReader; +import java.io.IOException; +import java.io.InputStreamReader; +import java.io.Reader; +import java.io.UnsupportedEncodingException; +import java.util.List; +import java.util.Locale; + +import javax.servlet.http.HttpServletResponse; + +import org.alfresco.repo.domain.node.NodeDAO; +import org.alfresco.repo.security.authentication.AuthenticationUtil; +import org.alfresco.service.cmr.repository.datatype.DefaultTypeConverter; +import org.alfresco.service.cmr.search.ResultSet; +import org.alfresco.service.cmr.search.ResultSetRow; +import org.alfresco.service.cmr.search.SearchParameters; +import org.alfresco.service.cmr.search.SearchService; +import org.alfresco.service.cmr.search.SearchParameters.SortDefinition; +import org.alfresco.service.cmr.security.PermissionService; +import org.apache.commons.codec.net.URLCodec; +import org.apache.commons.httpclient.HttpClient; +import org.apache.commons.httpclient.HttpException; +import org.apache.commons.httpclient.UsernamePasswordCredentials; +import org.apache.commons.httpclient.auth.AuthScope; +import org.apache.commons.httpclient.methods.ByteArrayRequestEntity; +import org.apache.commons.httpclient.methods.PostMethod; +import org.apache.commons.httpclient.methods.RequestEntity; +import org.apache.commons.httpclient.params.HttpClientParams; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.json.JSONArray; +import org.json.JSONException; +import org.json.JSONObject; +import org.json.JSONTokener; + +/** + * @author Andy + */ +public class SolrAlfrescoFTSQueryLanguage implements LuceneQueryLanguageSPI +{ + static Log s_logger = LogFactory.getLog(SolrAlfrescoFTSQueryLanguage.class); + + private NodeDAO nodeDAO; + + private PermissionService permissionService; + + /** + * @param nodeDAO the nodeDAO to set + */ + public void setNodeDAO(NodeDAO nodeDAO) + { + this.nodeDAO = nodeDAO; + } + + /** + * @param permissionService the permissionService to set + */ + public void setPermissionService(PermissionService permissionService) + { + this.permissionService = permissionService; + } + + /* + * (non-Javadoc) + * @seeorg.alfresco.repo.search.impl.lucene.LuceneQueryLanguageSPI#executeQuery(org.alfresco.service.cmr.search. + * SearchParameters, org.alfresco.repo.search.impl.lucene.ADMLuceneSearcherImpl) + */ + @Override + public ResultSet executeQuery(SearchParameters searchParameters, ADMLuceneSearcherImpl admLuceneSearcher) + { + try + { + HttpClient httpClient = new HttpClient(); + httpClient.getParams().setBooleanParameter(HttpClientParams.PREEMPTIVE_AUTHENTICATION, true); + 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")); + url.append("?wt=json"); + url.append("&fl=*,score"); + if(searchParameters.getMaxItems() > 0) + { + url.append("&rows=").append(searchParameters.getMaxItems()); + } + url.append("&df=").append(searchParameters.getDefaultFieldName()); + url.append("&start=").append(searchParameters.getSkipCount()); + + // Authorities go over as filter queries + + StringBuilder authQuery = new StringBuilder(); + for(String authority : permissionService.getAuthorisations()) + { + if(authQuery.length() > 0) + { + authQuery.append(" "); + } + authQuery.append("AUTHORITY:\"").append(authority).append("\""); + } + + url.append("&fq="); + URLCodec encoder = new URLCodec(); + url.append(encoder.encode(authQuery.toString(), "UTF-8")); + + // facets would go on url? + + JSONObject body = new JSONObject(); + body.put("query", searchParameters.getQuery()); + //body.put("defaultField", searchParameters.getDefaultFieldName()); + JSONArray locales = new JSONArray(); + for(Locale locale : searchParameters.getLocales()) + { + locales.put(DefaultTypeConverter.INSTANCE.convert(String.class, locale)); + } + body.put("locales", locales); + + JSONArray orderings = new JSONArray(); + for(SortDefinition sortDefinition : searchParameters.getSortDefinitions()) + { + JSONObject ordering = new JSONObject(); + ordering.put("field", sortDefinition.getField()); + ordering.put("isAscending", sortDefinition.isAscending()); + orderings.put(ordering); + } + body.put("sort", orderings); + + JSONArray templates = new JSONArray(); + for(String templateName : searchParameters.getQueryTemplates().keySet()) + { + JSONObject template = new JSONObject(); + template.put("name", templateName); + template.put("template", searchParameters.getQueryTemplates().get(templateName)); + templates.put(template); + } + body.put("templates", templates); + + JSONArray allAttributes = new JSONArray(); + for(String attribute : searchParameters.getAllAttributes()) + { + allAttributes.put(attribute); + } + body.put("allAttributes", allAttributes); + + body.put("defaultFTSOperator", searchParameters.getDefaultFTSOperator()); + body.put("defaultFTSFieldOperator", searchParameters.getDefaultFTSFieldOperator()); + if(searchParameters.getMlAnalaysisMode() != null) + { + body.put("mlAnalaysisMode", searchParameters.getMlAnalaysisMode().toString()); + } + body.put("defaultNamespace", searchParameters.getNamespace()); + + + JSONArray textAttributes = new JSONArray(); + for(String attribute : searchParameters.getTextAttributes()) + { + textAttributes.put(attribute); + } + body.put("textAttributes", textAttributes); + + PostMethod post = new PostMethod(url.toString()); + post.setRequestEntity(new ByteArrayRequestEntity(body.toString().getBytes("UTF-8"), "application/json")); + + httpClient.executeMethod(post); + + if (post.getStatusCode() != HttpServletResponse.SC_OK) + { + throw new LuceneQueryParserException("Request failed " + post.getStatusCode()+" "+url.toString()); + } + + + Reader reader = new BufferedReader(new InputStreamReader(post.getResponseBodyAsStream())); + // TODO - replace with streaming-based solution e.g. SimpleJSON ContentHandler + JSONObject json = new JSONObject(new JSONTokener(reader)); + SolrJSONResultSet results = new SolrJSONResultSet(json, nodeDAO, searchParameters); + if(s_logger.isDebugEnabled()) + { + s_logger.debug("Sent :"+url); + s_logger.debug(" with: "+body.toString()); + s_logger.debug("Got: "+results.getNumberFound()+ " in "+results.getQueryTime()+ " ms"); + } + + return results; + } + catch (UnsupportedEncodingException e) + { + throw new LuceneQueryParserException("", e); + } + catch (HttpException e) + { + throw new LuceneQueryParserException("", e); + } + catch (IOException e) + { + throw new LuceneQueryParserException("", e); + } + catch (JSONException e) + { + throw new LuceneQueryParserException("", e); + } + } + + public String getName() + { + return SearchService.LANGUAGE_SOLR_FTS_ALFRESCO; + } + + public void setFactories(List factories) + { + for (AbstractLuceneIndexerAndSearcherFactory factory : factories) + { + factory.registerQueryLanguage(this); + } + } + + public static void main(String[] args) + { + SolrAlfrescoFTSQueryLanguage solrAlfrescoFTSQueryLanguage = new SolrAlfrescoFTSQueryLanguage(); + SearchParameters sp = new SearchParameters(); + sp.setQuery("PATH:\"//.\""); + sp.setMaxItems(100); + sp.setSkipCount(12); + ResultSet rs = solrAlfrescoFTSQueryLanguage.executeQuery(sp, null); + System.out.println("Found "+rs.length()); + System.out.println("More "+rs.hasMore()); + System.out.println("Start "+rs.getStart()); + + for(ResultSetRow row : rs) + { + System.out.println("Score "+row.getScore()); + } + rs.close(); + } + +} diff --git a/source/java/org/alfresco/repo/search/impl/lucene/SolrJSONResultSet.java b/source/java/org/alfresco/repo/search/impl/lucene/SolrJSONResultSet.java new file mode 100644 index 0000000000..5f4f8563ef --- /dev/null +++ b/source/java/org/alfresco/repo/search/impl/lucene/SolrJSONResultSet.java @@ -0,0 +1,307 @@ +/* + * 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 . + */ +package org.alfresco.repo.search.impl.lucene; + +import java.util.ArrayList; +import java.util.Iterator; +import java.util.List; + +import org.alfresco.repo.domain.node.NodeDAO; +import org.alfresco.repo.search.SimpleResultSetMetaData; +import org.alfresco.service.cmr.repository.ChildAssociationRef; +import org.alfresco.service.cmr.repository.NodeRef; +import org.alfresco.service.cmr.search.LimitBy; +import org.alfresco.service.cmr.search.PermissionEvaluationMode; +import org.alfresco.service.cmr.search.ResultSet; +import org.alfresco.service.cmr.search.ResultSetMetaData; +import org.alfresco.service.cmr.search.ResultSetRow; +import org.alfresco.service.cmr.search.SearchParameters; +import org.alfresco.util.Pair; +import org.json.JSONArray; +import org.json.JSONException; +import org.json.JSONObject; + +/** + * @author Andy + */ +public class SolrJSONResultSet implements ResultSet +{ + private NodeDAO nodeDAO; + + private ArrayList> page; + + private ResultSetMetaData rsmd; + + private Long status; + + private Long queryTime; + + private Long numberFound; + + private Long start; + + private Float maxScore; + + private SimpleResultSetMetaData resultSetMetaData; + + /** + * Detached result set based on that provided + * @param resultSet + */ + public SolrJSONResultSet(JSONObject json, NodeDAO nodeDAO, SearchParameters searchParameters) + { + this.nodeDAO = nodeDAO; + this.resultSetMetaData = new SimpleResultSetMetaData(LimitBy.UNLIMITED, PermissionEvaluationMode.EAGER, searchParameters); + try + { + JSONObject responseHeader = json.getJSONObject("responseHeader"); + status = responseHeader.getLong("status"); + queryTime = responseHeader.getLong("QTime"); + + JSONObject response = json.getJSONObject("response"); + numberFound = response.getLong("numFound"); + start = response.getLong("start"); + maxScore = Float.valueOf(response.getString("maxScore")); + + JSONArray docs = response.getJSONArray("docs"); + + int numDocs = docs.length(); + page = new ArrayList>(numDocs); + for(int i = 0; i < numDocs; i++) + { + JSONObject doc = docs.getJSONObject(i); + Long dbid = doc.getLong("DBID"); + Float score = Float.valueOf(doc.getString("score")); + page.add(new Pair(dbid, score)); + + for(Iterator it = doc.keys(); it.hasNext(); /* */) + { + String key = (String)it.next(); + } + } + + } + catch (JSONException e) + { + + } + + } + + + /* + * (non-Javadoc) + * @see org.alfresco.service.cmr.search.ResultSetSPI#close() + */ + @Override + public void close() + { + // NO OP + } + + /* + * (non-Javadoc) + * @see org.alfresco.service.cmr.search.ResultSetSPI#getBulkFetch() + */ + @Override + public boolean getBulkFetch() + { + return true; + } + + /* + * (non-Javadoc) + * @see org.alfresco.service.cmr.search.ResultSetSPI#getBulkFetchSize() + */ + @Override + public int getBulkFetchSize() + { + return Integer.MAX_VALUE; + } + + /* + * (non-Javadoc) + * @see org.alfresco.service.cmr.search.ResultSetSPI#getChildAssocRef(int) + */ + @Override + public ChildAssociationRef getChildAssocRef(int n) + { + Pair primaryParentAssoc = nodeDAO.getPrimaryParentAssoc(page.get(n).getFirst()); + if(primaryParentAssoc != null) + { + return nodeDAO.getPrimaryParentAssoc(page.get(n).getFirst()).getSecond(); + } + else + { + return null; + } + + } + + /* + * (non-Javadoc) + * @see org.alfresco.service.cmr.search.ResultSetSPI#getChildAssocRefs() + */ + @Override + public List getChildAssocRefs() + { + ArrayList refs = new ArrayList(page.size()); + for(int i = 0; i < page.size(); i++ ) + { + refs.add( getChildAssocRef(i)); + } + return refs; + } + + /* + * (non-Javadoc) + * @see org.alfresco.service.cmr.search.ResultSetSPI#getNodeRef(int) + */ + @Override + public NodeRef getNodeRef(int n) + { + // TODO: lost nodes? + return nodeDAO.getNodePair(page.get(n).getFirst()).getSecond(); + } + + /* + * (non-Javadoc) + * @see org.alfresco.service.cmr.search.ResultSetSPI#getNodeRefs() + */ + @Override + public List getNodeRefs() + { + ArrayList refs = new ArrayList(page.size()); + for(int i = 0; i < page.size(); i++ ) + { + refs.add( getNodeRef(i)); + } + return refs; + } + + /* + * (non-Javadoc) + * @see org.alfresco.service.cmr.search.ResultSetSPI#getResultSetMetaData() + */ + @Override + public ResultSetMetaData getResultSetMetaData() + { + return resultSetMetaData; + } + + /* + * (non-Javadoc) + * @see org.alfresco.service.cmr.search.ResultSetSPI#getRow(int) + */ + @Override + public ResultSetRow getRow(int i) + { + return new SolrJSONResultSetRow(this, i); + } + + /* + * (non-Javadoc) + * @see org.alfresco.service.cmr.search.ResultSetSPI#getScore(int) + */ + @Override + public float getScore(int n) + { + return page.get(n).getSecond(); + } + + /* + * (non-Javadoc) + * @see org.alfresco.service.cmr.search.ResultSetSPI#getStart() + */ + @Override + public int getStart() + { + return start.intValue(); + } + + /* + * (non-Javadoc) + * @see org.alfresco.service.cmr.search.ResultSetSPI#hasMore() + */ + @Override + public boolean hasMore() + { + return numberFound.longValue() > (start.longValue() + page.size() + 1); + } + + /* + * (non-Javadoc) + * @see org.alfresco.service.cmr.search.ResultSetSPI#length() + */ + @Override + public int length() + { + return page.size(); + } + + /* + * (non-Javadoc) + * @see org.alfresco.service.cmr.search.ResultSetSPI#setBulkFetch(boolean) + */ + @Override + public boolean setBulkFetch(boolean bulkFetch) + { + return bulkFetch; + } + + /* + * (non-Javadoc) + * @see org.alfresco.service.cmr.search.ResultSetSPI#setBulkFetchSize(int) + */ + @Override + public int setBulkFetchSize(int bulkFetchSize) + { + return bulkFetchSize; + } + + /* + * (non-Javadoc) + * @see java.lang.Iterable#iterator() + */ + @Override + public Iterator iterator() + { + return new SolrJSONResultSetRowIterator(this); + } + + + /** + * @return the queryTime + */ + public Long getQueryTime() + { + return queryTime; + } + + + /** + * @return the numberFound + */ + public Long getNumberFound() + { + return numberFound; + } + + +} diff --git a/source/java/org/alfresco/repo/search/impl/lucene/SolrJSONResultSetRow.java b/source/java/org/alfresco/repo/search/impl/lucene/SolrJSONResultSetRow.java new file mode 100644 index 0000000000..d22de3f86e --- /dev/null +++ b/source/java/org/alfresco/repo/search/impl/lucene/SolrJSONResultSetRow.java @@ -0,0 +1,82 @@ +/* + * 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 . + */ +package org.alfresco.repo.search.impl.lucene; + +import java.util.Map; + +import org.alfresco.repo.search.AbstractResultSetRow; +import org.alfresco.service.cmr.repository.NodeRef; +import org.alfresco.service.cmr.search.ResultSet; + +/** + * @author Andy + */ +public class SolrJSONResultSetRow extends AbstractResultSetRow +{ + + /** + * @param resultSet + * @param index + */ + public SolrJSONResultSetRow(ResultSet resultSet, int index) + { + super(resultSet, index); + } + + /* + * (non-Javadoc) + * @see org.alfresco.service.cmr.search.ResultSetRow#getNodeRef(java.lang.String) + */ + @Override + public NodeRef getNodeRef(String selectorName) + { + throw new UnsupportedOperationException(); + } + + /* + * (non-Javadoc) + * @see org.alfresco.service.cmr.search.ResultSetRow#getNodeRefs() + */ + @Override + public Map getNodeRefs() + { + throw new UnsupportedOperationException(); + } + + /* + * (non-Javadoc) + * @see org.alfresco.service.cmr.search.ResultSetRow#getScore(java.lang.String) + */ + @Override + public float getScore(String selectorName) + { + throw new UnsupportedOperationException(); + } + + /* + * (non-Javadoc) + * @see org.alfresco.service.cmr.search.ResultSetRow#getScores() + */ + @Override + public Map getScores() + { + throw new UnsupportedOperationException(); + } + +} diff --git a/source/java/org/alfresco/cmis/EnumLabel.java b/source/java/org/alfresco/repo/search/impl/lucene/SolrJSONResultSetRowIterator.java similarity index 50% rename from source/java/org/alfresco/cmis/EnumLabel.java rename to source/java/org/alfresco/repo/search/impl/lucene/SolrJSONResultSetRowIterator.java index 1fe62a4d88..46d1871af2 100644 --- a/source/java/org/alfresco/cmis/EnumLabel.java +++ b/source/java/org/alfresco/repo/search/impl/lucene/SolrJSONResultSetRowIterator.java @@ -16,19 +16,35 @@ * You should have received a copy of the GNU Lesser General Public License * along with Alfresco. If not, see . */ -package org.alfresco.cmis; +package org.alfresco.repo.search.impl.lucene; + +import org.alfresco.repo.search.AbstractResultSetRowIterator; +import org.alfresco.service.cmr.search.ResultSet; +import org.alfresco.service.cmr.search.ResultSetRow; /** - * Enum label (mapping from Enum name to CMIS name) - * - * @author davidc + * @author Andy + * */ -public interface EnumLabel +public class SolrJSONResultSetRowIterator extends AbstractResultSetRowIterator { + /** - * Gets the enum label (as defined by CMIS) - * - * @return enum label + * @param resultSet */ - public String getLabel(); + public SolrJSONResultSetRowIterator(ResultSet resultSet) + { + super(resultSet); + // TODO Auto-generated constructor stub + } + + public ResultSetRow next() + { + return new SolrJSONResultSetRow((SolrJSONResultSet)getResultSet(), moveToNextPosition()); + } + + public ResultSetRow previous() + { + return new SolrJSONResultSetRow((SolrJSONResultSet)getResultSet(), moveToPreviousPosition()); + } } diff --git a/source/java/org/alfresco/repo/search/impl/parsers/CMIS.tokens b/source/java/org/alfresco/repo/search/impl/parsers/CMIS.tokens index 3be489efda..a7e83111a3 100644 --- a/source/java/org/alfresco/repo/search/impl/parsers/CMIS.tokens +++ b/source/java/org/alfresco/repo/search/impl/parsers/CMIS.tokens @@ -1,86 +1,86 @@ -FUNCTION=10 -WHERE=47 -EXPONENT=84 -PRED_FTS=22 -STAR=33 -INNER=42 -ORDER=64 -DOUBLE_QUOTE=71 -NUMERIC_LITERAL=27 -PRED_COMPARISON=18 -CONTAINS=61 -TABLE=12 -SOURCE=11 -DOTDOT=78 -EQUALS=46 -NOT=50 -ID=70 -AND=49 -LPAREN=38 -LESSTHANOREQUALS=54 -AS=35 -RPAREN=39 -TILDA=79 -PRED_LIKE=21 -STRING_LITERAL=28 -IN=56 -DECIMAL_NUMERAL=82 -FLOATING_POINT_LITERAL=72 -COMMA=34 -IS=58 -LEFT=43 -SIGNED_INTEGER=89 -PARAMETER=14 -COLUMN=6 -PLUS=80 -QUOTED_STRING=69 -SINGLE_VALUED_PROPERTY=31 -ZERO_DIGIT=86 -DIGIT=83 -DOT=37 -COLUMN_REF=8 -SELECT=32 -LIKE=57 -GREATERTHAN=53 -DOTSTAR=36 -E=88 -OUTER=44 -BY=65 -LESSTHAN=52 -NON_ZERO_DIGIT=87 -ASC=66 -QUALIFIER=9 -CONJUNCTION=15 -NULL=59 -ON=45 -NOTEQUALS=51 -DATETIME_LITERAL=29 -MINUS=81 -LIST=23 -TRUE=74 -PRED_DESCENDANT=25 -JOIN=41 -IN_FOLDER=62 -COLON=68 -GREATERTHANOREQUALS=55 -BOOLEAN_LITERAL=30 -DISJUNCTION=16 -COLUMNS=7 -WS=85 -ANY=60 -SCORE=77 -NEGATION=17 -TABLE_REF=13 -SORT_SPECIFICATION=26 -IN_TREE=63 -OR=48 -PRED_CHILD=24 -PRED_EXISTS=20 QUERY=4 -DECIMAL_INTEGER_LITERAL=73 -DESC=67 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 -PRED_IN=19 +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 index b412d25c43..5400272539 100644 --- a/source/java/org/alfresco/repo/search/impl/parsers/CMISLexer.java +++ b/source/java/org/alfresco/repo/search/impl/parsers/CMISLexer.java @@ -1,4 +1,4 @@ -// $ANTLR 3.2 Sep 23, 2009 12:02:23 W:\\alfresco\\BRANCHES\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g 2011-01-12 12:54:12 +// $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; @@ -10,93 +10,93 @@ import java.util.List; import java.util.ArrayList; public class CMISLexer extends Lexer { - public static final int FUNCTION=10; - public static final int WHERE=47; - public static final int EXPONENT=84; - public static final int PRED_FTS=22; - public static final int STAR=33; - public static final int INNER=42; - public static final int ORDER=64; - public static final int DOUBLE_QUOTE=71; - public static final int NUMERIC_LITERAL=27; - public static final int PRED_COMPARISON=18; - public static final int CONTAINS=61; - public static final int TABLE=12; - public static final int SOURCE=11; - public static final int EQUALS=46; - public static final int DOTDOT=78; - public static final int NOT=50; - public static final int ID=70; - public static final int AND=49; public static final int EOF=-1; - public static final int LPAREN=38; - public static final int LESSTHANOREQUALS=54; - public static final int AS=35; - public static final int RPAREN=39; - public static final int TILDA=79; - public static final int PRED_LIKE=21; - public static final int STRING_LITERAL=28; - public static final int IN=56; - public static final int DECIMAL_NUMERAL=82; - public static final int FLOATING_POINT_LITERAL=72; - public static final int COMMA=34; - public static final int IS=58; - public static final int LEFT=43; - public static final int SIGNED_INTEGER=89; - public static final int PARAMETER=14; - public static final int COLUMN=6; - public static final int PLUS=80; - public static final int QUOTED_STRING=69; - public static final int SINGLE_VALUED_PROPERTY=31; - public static final int ZERO_DIGIT=86; - public static final int DIGIT=83; - public static final int DOT=37; - public static final int COLUMN_REF=8; - public static final int SELECT=32; - public static final int LIKE=57; - public static final int DOTSTAR=36; - public static final int GREATERTHAN=53; - public static final int OUTER=44; - public static final int E=88; - public static final int LESSTHAN=52; - public static final int BY=65; - public static final int ASC=66; - public static final int NON_ZERO_DIGIT=87; - public static final int QUALIFIER=9; - public static final int CONJUNCTION=15; - public static final int NULL=59; - public static final int ON=45; - public static final int NOTEQUALS=51; - public static final int DATETIME_LITERAL=29; - public static final int MINUS=81; - public static final int LIST=23; - public static final int PRED_DESCENDANT=25; - public static final int TRUE=74; - public static final int JOIN=41; - public static final int IN_FOLDER=62; - public static final int BOOLEAN_LITERAL=30; - public static final int GREATERTHANOREQUALS=55; - public static final int COLON=68; - public static final int COLUMNS=7; - public static final int DISJUNCTION=16; - public static final int ANY=60; - public static final int WS=85; - public static final int SCORE=77; - public static final int NEGATION=17; - public static final int TABLE_REF=13; - public static final int SORT_SPECIFICATION=26; - public static final int IN_TREE=63; - public static final int OR=48; - public static final int PRED_CHILD=24; - public static final int PRED_EXISTS=20; public static final int QUERY=4; public static final int ALL_COLUMNS=5; - public static final int DESC=67; - public static final int DECIMAL_INTEGER_LITERAL=73; + 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 PRED_IN=19; + 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) @@ -150,18 +150,18 @@ public class CMISLexer extends Lexer { super(input,state); } - public String getGrammarFileName() { return "W:\\alfresco\\BRANCHES\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g"; } + 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\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:853:9: ( '\\'' (~ ( '\\'' | '\\\\' ) | '\\\\' . )* '\\'' ) - // W:\\alfresco\\BRANCHES\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:854:9: '\\'' (~ ( '\\'' | '\\\\' ) | '\\\\' . )* '\\'' + // 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\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:855:9: (~ ( '\\'' | '\\\\' ) | '\\\\' . )* + // 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; @@ -177,7 +177,7 @@ public class CMISLexer extends Lexer { switch (alt1) { case 1 : - // W:\\alfresco\\BRANCHES\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:856:17: ~ ( '\\'' | '\\\\' ) + // 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(); @@ -192,7 +192,7 @@ public class CMISLexer extends Lexer { } break; case 2 : - // W:\\alfresco\\BRANCHES\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:857:19: '\\\\' . + // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:857:19: '\\\\' . { match('\\'); matchAny(); @@ -222,8 +222,8 @@ public class CMISLexer extends Lexer { try { int _type = SELECT; int _channel = DEFAULT_TOKEN_CHANNEL; - // W:\\alfresco\\BRANCHES\\V3.3\\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\\V3.3\\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' ) + // 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(); @@ -295,8 +295,8 @@ public class CMISLexer extends Lexer { try { int _type = AS; int _channel = DEFAULT_TOKEN_CHANNEL; - // W:\\alfresco\\BRANCHES\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:891:9: ( ( 'A' | 'a' ) ( 'S' | 's' ) ) - // W:\\alfresco\\BRANCHES\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:892:9: ( 'A' | 'a' ) ( 'S' | 's' ) + // 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(); @@ -332,8 +332,8 @@ public class CMISLexer extends Lexer { try { int _type = FROM; int _channel = DEFAULT_TOKEN_CHANNEL; - // W:\\alfresco\\BRANCHES\\V3.3\\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\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:904: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: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(); @@ -387,8 +387,8 @@ public class CMISLexer extends Lexer { try { int _type = JOIN; int _channel = DEFAULT_TOKEN_CHANNEL; - // W:\\alfresco\\BRANCHES\\V3.3\\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\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:924: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: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(); @@ -442,8 +442,8 @@ public class CMISLexer extends Lexer { try { int _type = INNER; int _channel = DEFAULT_TOKEN_CHANNEL; - // W:\\alfresco\\BRANCHES\\V3.3\\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\\V3.3\\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' ) + // 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(); @@ -506,8 +506,8 @@ public class CMISLexer extends Lexer { try { int _type = LEFT; int _channel = DEFAULT_TOKEN_CHANNEL; - // W:\\alfresco\\BRANCHES\\V3.3\\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\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:968: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: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(); @@ -561,8 +561,8 @@ public class CMISLexer extends Lexer { try { int _type = OUTER; int _channel = DEFAULT_TOKEN_CHANNEL; - // W:\\alfresco\\BRANCHES\\V3.3\\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\\V3.3\\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' ) + // 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(); @@ -625,8 +625,8 @@ public class CMISLexer extends Lexer { try { int _type = ON; int _channel = DEFAULT_TOKEN_CHANNEL; - // W:\\alfresco\\BRANCHES\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:1011:9: ( ( 'O' | 'o' ) ( 'N' | 'n' ) ) - // W:\\alfresco\\BRANCHES\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:1012:9: ( 'O' | 'o' ) ( 'N' | 'n' ) + // 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(); @@ -662,8 +662,8 @@ public class CMISLexer extends Lexer { try { int _type = WHERE; int _channel = DEFAULT_TOKEN_CHANNEL; - // W:\\alfresco\\BRANCHES\\V3.3\\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\\V3.3\\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' ) + // 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(); @@ -726,8 +726,8 @@ public class CMISLexer extends Lexer { try { int _type = OR; int _channel = DEFAULT_TOKEN_CHANNEL; - // W:\\alfresco\\BRANCHES\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:1047:9: ( ( 'O' | 'o' ) ( 'R' | 'r' ) ) - // W:\\alfresco\\BRANCHES\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:1048:9: ( 'O' | 'o' ) ( 'R' | 'r' ) + // 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(); @@ -763,8 +763,8 @@ public class CMISLexer extends Lexer { try { int _type = AND; int _channel = DEFAULT_TOKEN_CHANNEL; - // W:\\alfresco\\BRANCHES\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:1059:9: ( ( 'A' | 'a' ) ( 'N' | 'n' ) ( 'D' | 'd' ) ) - // W:\\alfresco\\BRANCHES\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:1060: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: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(); @@ -809,8 +809,8 @@ public class CMISLexer extends Lexer { try { int _type = NOT; int _channel = DEFAULT_TOKEN_CHANNEL; - // W:\\alfresco\\BRANCHES\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:1075:9: ( ( 'N' | 'n' ) ( 'O' | 'o' ) ( 'T' | 't' ) ) - // W:\\alfresco\\BRANCHES\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:1076: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: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(); @@ -855,8 +855,8 @@ public class CMISLexer extends Lexer { try { int _type = IN; int _channel = DEFAULT_TOKEN_CHANNEL; - // W:\\alfresco\\BRANCHES\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:1091:9: ( ( 'I' | 'i' ) ( 'N' | 'n' ) ) - // W:\\alfresco\\BRANCHES\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:1092:9: ( 'I' | 'i' ) ( 'N' | 'n' ) + // 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(); @@ -892,8 +892,8 @@ public class CMISLexer extends Lexer { try { int _type = LIKE; int _channel = DEFAULT_TOKEN_CHANNEL; - // W:\\alfresco\\BRANCHES\\V3.3\\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\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:1104: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: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(); @@ -947,8 +947,8 @@ public class CMISLexer extends Lexer { try { int _type = IS; int _channel = DEFAULT_TOKEN_CHANNEL; - // W:\\alfresco\\BRANCHES\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:1123:9: ( ( 'I' | 'i' ) ( 'S' | 's' ) ) - // W:\\alfresco\\BRANCHES\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:1124:9: ( 'I' | 'i' ) ( 'S' | 's' ) + // 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(); @@ -984,8 +984,8 @@ public class CMISLexer extends Lexer { try { int _type = NULL; int _channel = DEFAULT_TOKEN_CHANNEL; - // W:\\alfresco\\BRANCHES\\V3.3\\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\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:1136: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: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(); @@ -1039,8 +1039,8 @@ public class CMISLexer extends Lexer { try { int _type = ANY; int _channel = DEFAULT_TOKEN_CHANNEL; - // W:\\alfresco\\BRANCHES\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:1155:9: ( ( 'A' | 'a' ) ( 'N' | 'n' ) ( 'Y' | 'y' ) ) - // W:\\alfresco\\BRANCHES\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:1156: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: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(); @@ -1085,8 +1085,8 @@ public class CMISLexer extends Lexer { try { int _type = CONTAINS; int _channel = DEFAULT_TOKEN_CHANNEL; - // W:\\alfresco\\BRANCHES\\V3.3\\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\\V3.3\\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' ) + // 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(); @@ -1176,8 +1176,8 @@ public class CMISLexer extends Lexer { try { int _type = IN_FOLDER; int _channel = DEFAULT_TOKEN_CHANNEL; - // W:\\alfresco\\BRANCHES\\V3.3\\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\\V3.3\\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' ) + // 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(); @@ -1268,8 +1268,8 @@ public class CMISLexer extends Lexer { try { int _type = IN_TREE; int _channel = DEFAULT_TOKEN_CHANNEL; - // W:\\alfresco\\BRANCHES\\V3.3\\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\\V3.3\\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' ) + // 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(); @@ -1342,8 +1342,8 @@ public class CMISLexer extends Lexer { try { int _type = ORDER; int _channel = DEFAULT_TOKEN_CHANNEL; - // W:\\alfresco\\BRANCHES\\V3.3\\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\\V3.3\\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' ) + // 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(); @@ -1406,8 +1406,8 @@ public class CMISLexer extends Lexer { try { int _type = BY; int _channel = DEFAULT_TOKEN_CHANNEL; - // W:\\alfresco\\BRANCHES\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:1297:9: ( ( 'B' | 'b' ) ( 'Y' | 'y' ) ) - // W:\\alfresco\\BRANCHES\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:1298:9: ( 'B' | 'b' ) ( 'Y' | 'y' ) + // 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(); @@ -1443,8 +1443,8 @@ public class CMISLexer extends Lexer { try { int _type = ASC; int _channel = DEFAULT_TOKEN_CHANNEL; - // W:\\alfresco\\BRANCHES\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:1309:9: ( ( 'A' | 'a' ) ( 'S' | 's' ) ( 'C' | 'c' ) ) - // W:\\alfresco\\BRANCHES\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:1310: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: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(); @@ -1489,8 +1489,8 @@ public class CMISLexer extends Lexer { try { int _type = DESC; int _channel = DEFAULT_TOKEN_CHANNEL; - // W:\\alfresco\\BRANCHES\\V3.3\\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\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:1326: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: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(); @@ -1544,8 +1544,8 @@ public class CMISLexer extends Lexer { try { int _type = TIMESTAMP; int _channel = DEFAULT_TOKEN_CHANNEL; - // W:\\alfresco\\BRANCHES\\V3.3\\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\\V3.3\\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' ) + // 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(); @@ -1644,8 +1644,8 @@ public class CMISLexer extends Lexer { try { int _type = TRUE; int _channel = DEFAULT_TOKEN_CHANNEL; - // W:\\alfresco\\BRANCHES\\V3.3\\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\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:1386: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: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(); @@ -1699,8 +1699,8 @@ public class CMISLexer extends Lexer { try { int _type = FALSE; int _channel = DEFAULT_TOKEN_CHANNEL; - // W:\\alfresco\\BRANCHES\\V3.3\\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\\V3.3\\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' ) + // 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(); @@ -1763,8 +1763,8 @@ public class CMISLexer extends Lexer { try { int _type = SCORE; int _channel = DEFAULT_TOKEN_CHANNEL; - // W:\\alfresco\\BRANCHES\\V3.3\\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\\V3.3\\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' ) + // 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(); @@ -1827,8 +1827,8 @@ public class CMISLexer extends Lexer { try { int _type = LPAREN; int _channel = DEFAULT_TOKEN_CHANNEL; - // W:\\alfresco\\BRANCHES\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:1453:9: ( '(' ) - // W:\\alfresco\\BRANCHES\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:1454:9: '(' + // 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('('); @@ -1847,8 +1847,8 @@ public class CMISLexer extends Lexer { try { int _type = RPAREN; int _channel = DEFAULT_TOKEN_CHANNEL; - // W:\\alfresco\\BRANCHES\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:1458:9: ( ')' ) - // W:\\alfresco\\BRANCHES\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:1459:9: ')' + // 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(')'); @@ -1867,8 +1867,8 @@ public class CMISLexer extends Lexer { try { int _type = STAR; int _channel = DEFAULT_TOKEN_CHANNEL; - // W:\\alfresco\\BRANCHES\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:1463:9: ( '*' ) - // W:\\alfresco\\BRANCHES\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:1464:9: '*' + // 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('*'); @@ -1887,8 +1887,8 @@ public class CMISLexer extends Lexer { try { int _type = COMMA; int _channel = DEFAULT_TOKEN_CHANNEL; - // W:\\alfresco\\BRANCHES\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:1468:9: ( ',' ) - // W:\\alfresco\\BRANCHES\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:1469:9: ',' + // 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(','); @@ -1907,8 +1907,8 @@ public class CMISLexer extends Lexer { try { int _type = DOTSTAR; int _channel = DEFAULT_TOKEN_CHANNEL; - // W:\\alfresco\\BRANCHES\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:1473:9: ( '.*' ) - // W:\\alfresco\\BRANCHES\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:1474:9: '.*' + // 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(".*"); @@ -1928,8 +1928,8 @@ public class CMISLexer extends Lexer { try { int _type = DOT; int _channel = DEFAULT_TOKEN_CHANNEL; - // W:\\alfresco\\BRANCHES\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:1478:9: ( '.' ) - // W:\\alfresco\\BRANCHES\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:1479:9: '.' + // 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('.'); @@ -1948,8 +1948,8 @@ public class CMISLexer extends Lexer { try { int _type = DOTDOT; int _channel = DEFAULT_TOKEN_CHANNEL; - // W:\\alfresco\\BRANCHES\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:1483:9: ( '..' ) - // W:\\alfresco\\BRANCHES\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:1484:9: '..' + // 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(".."); @@ -1969,8 +1969,8 @@ public class CMISLexer extends Lexer { try { int _type = EQUALS; int _channel = DEFAULT_TOKEN_CHANNEL; - // W:\\alfresco\\BRANCHES\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:1488:9: ( '=' ) - // W:\\alfresco\\BRANCHES\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:1489:9: '=' + // 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('='); @@ -1989,8 +1989,8 @@ public class CMISLexer extends Lexer { try { int _type = TILDA; int _channel = DEFAULT_TOKEN_CHANNEL; - // W:\\alfresco\\BRANCHES\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:1493:9: ( '~' ) - // W:\\alfresco\\BRANCHES\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:1494:9: '~' + // 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('~'); @@ -2009,8 +2009,8 @@ public class CMISLexer extends Lexer { try { int _type = NOTEQUALS; int _channel = DEFAULT_TOKEN_CHANNEL; - // W:\\alfresco\\BRANCHES\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:1498:9: ( '<>' ) - // W:\\alfresco\\BRANCHES\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:1499:9: '<>' + // 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("<>"); @@ -2030,8 +2030,8 @@ public class CMISLexer extends Lexer { try { int _type = GREATERTHAN; int _channel = DEFAULT_TOKEN_CHANNEL; - // W:\\alfresco\\BRANCHES\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:1503:9: ( '>' ) - // W:\\alfresco\\BRANCHES\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:1504:9: '>' + // 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('>'); @@ -2050,8 +2050,8 @@ public class CMISLexer extends Lexer { try { int _type = LESSTHAN; int _channel = DEFAULT_TOKEN_CHANNEL; - // W:\\alfresco\\BRANCHES\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:1508:9: ( '<' ) - // W:\\alfresco\\BRANCHES\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:1509:9: '<' + // 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('<'); @@ -2070,8 +2070,8 @@ public class CMISLexer extends Lexer { try { int _type = GREATERTHANOREQUALS; int _channel = DEFAULT_TOKEN_CHANNEL; - // W:\\alfresco\\BRANCHES\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:1513:9: ( '>=' ) - // W:\\alfresco\\BRANCHES\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:1514:9: '>=' + // 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(">="); @@ -2091,8 +2091,8 @@ public class CMISLexer extends Lexer { try { int _type = LESSTHANOREQUALS; int _channel = DEFAULT_TOKEN_CHANNEL; - // W:\\alfresco\\BRANCHES\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:1518:9: ( '<=' ) - // W:\\alfresco\\BRANCHES\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:1519:9: '<=' + // 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("<="); @@ -2112,8 +2112,8 @@ public class CMISLexer extends Lexer { try { int _type = COLON; int _channel = DEFAULT_TOKEN_CHANNEL; - // W:\\alfresco\\BRANCHES\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:1523:9: ( ':' ) - // W:\\alfresco\\BRANCHES\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:1524:9: ':' + // 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(':'); @@ -2132,8 +2132,8 @@ public class CMISLexer extends Lexer { try { int _type = DOUBLE_QUOTE; int _channel = DEFAULT_TOKEN_CHANNEL; - // W:\\alfresco\\BRANCHES\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:1528:9: ( '\"' ) - // W:\\alfresco\\BRANCHES\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:1529:9: '\"' + // 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('\"'); @@ -2152,10 +2152,10 @@ public class CMISLexer extends Lexer { try { int _type = DECIMAL_INTEGER_LITERAL; int _channel = DEFAULT_TOKEN_CHANNEL; - // W:\\alfresco\\BRANCHES\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:1537:9: ( ( PLUS | MINUS )? DECIMAL_NUMERAL ) - // W:\\alfresco\\BRANCHES\\V3.3\\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: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\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:1538:9: ( PLUS | MINUS )? + // 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); @@ -2164,7 +2164,7 @@ public class CMISLexer extends Lexer { } switch (alt2) { case 1 : - // W:\\alfresco\\BRANCHES\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g: + // 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(); @@ -2198,14 +2198,14 @@ public class CMISLexer extends Lexer { try { int _type = FLOATING_POINT_LITERAL; int _channel = DEFAULT_TOKEN_CHANNEL; - // W:\\alfresco\\BRANCHES\\V3.3\\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 ) + // 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\\V3.3\\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 )? ( DIGIT )+ DOT ( DIGIT )* ( EXPONENT )? { - // W:\\alfresco\\BRANCHES\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:1551:9: ( PLUS | MINUS )? + // 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); @@ -2214,7 +2214,7 @@ public class CMISLexer extends Lexer { } switch (alt3) { case 1 : - // W:\\alfresco\\BRANCHES\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g: + // 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(); @@ -2231,7 +2231,7 @@ public class CMISLexer extends Lexer { } - // W:\\alfresco\\BRANCHES\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:1555:9: ( DIGIT )+ + // 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 { @@ -2245,7 +2245,7 @@ public class CMISLexer extends Lexer { switch (alt4) { case 1 : - // W:\\alfresco\\BRANCHES\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:1555:9: DIGIT + // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:1555:9: DIGIT { mDIGIT(); @@ -2262,7 +2262,7 @@ public class CMISLexer extends Lexer { } while (true); mDOT(); - // W:\\alfresco\\BRANCHES\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:1555:20: ( DIGIT )* + // 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; @@ -2275,7 +2275,7 @@ public class CMISLexer extends Lexer { switch (alt5) { case 1 : - // W:\\alfresco\\BRANCHES\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:1555:20: DIGIT + // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:1555:20: DIGIT { mDIGIT(); @@ -2287,7 +2287,7 @@ public class CMISLexer extends Lexer { } } while (true); - // W:\\alfresco\\BRANCHES\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:1555:27: ( EXPONENT )? + // 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); @@ -2296,7 +2296,7 @@ public class CMISLexer extends Lexer { } switch (alt6) { case 1 : - // W:\\alfresco\\BRANCHES\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:1555:27: EXPONENT + // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:1555:27: EXPONENT { mEXPONENT(); @@ -2309,9 +2309,9 @@ public class CMISLexer extends Lexer { } break; case 2 : - // W:\\alfresco\\BRANCHES\\V3.3\\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 )? DOT ( DIGIT )+ ( EXPONENT )? { - // W:\\alfresco\\BRANCHES\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:1557:9: ( PLUS | MINUS )? + // 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); @@ -2320,7 +2320,7 @@ public class CMISLexer extends Lexer { } switch (alt7) { case 1 : - // W:\\alfresco\\BRANCHES\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g: + // 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(); @@ -2338,7 +2338,7 @@ public class CMISLexer extends Lexer { } mDOT(); - // W:\\alfresco\\BRANCHES\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:1561:13: ( DIGIT )+ + // 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 { @@ -2352,7 +2352,7 @@ public class CMISLexer extends Lexer { switch (alt8) { case 1 : - // W:\\alfresco\\BRANCHES\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:1561:13: DIGIT + // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:1561:13: DIGIT { mDIGIT(); @@ -2368,7 +2368,7 @@ public class CMISLexer extends Lexer { cnt8++; } while (true); - // W:\\alfresco\\BRANCHES\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:1561:20: ( EXPONENT )? + // 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); @@ -2377,7 +2377,7 @@ public class CMISLexer extends Lexer { } switch (alt9) { case 1 : - // W:\\alfresco\\BRANCHES\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:1561:20: EXPONENT + // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:1561:20: EXPONENT { mEXPONENT(); @@ -2390,9 +2390,9 @@ public class CMISLexer extends Lexer { } break; case 3 : - // W:\\alfresco\\BRANCHES\\V3.3\\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 )? ( DIGIT )+ EXPONENT { - // W:\\alfresco\\BRANCHES\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:1563:9: ( PLUS | MINUS )? + // 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); @@ -2401,7 +2401,7 @@ public class CMISLexer extends Lexer { } switch (alt10) { case 1 : - // W:\\alfresco\\BRANCHES\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g: + // 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(); @@ -2418,7 +2418,7 @@ public class CMISLexer extends Lexer { } - // W:\\alfresco\\BRANCHES\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:1567:9: ( DIGIT )+ + // 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 { @@ -2432,7 +2432,7 @@ public class CMISLexer extends Lexer { switch (alt11) { case 1 : - // W:\\alfresco\\BRANCHES\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:1567:9: DIGIT + // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:1567:9: DIGIT { mDIGIT(); @@ -2467,8 +2467,8 @@ public class CMISLexer extends Lexer { try { int _type = ID; int _channel = DEFAULT_TOKEN_CHANNEL; - // W:\\alfresco\\BRANCHES\\V3.3\\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\\V3.3\\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' | '_' | ':' | '$' | '#' )* + // 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(); @@ -2479,7 +2479,7 @@ public class CMISLexer extends Lexer { recover(mse); throw mse;} - // W:\\alfresco\\BRANCHES\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:1580:9: ( 'a' .. 'z' | 'A' .. 'Z' | '0' .. '9' | '_' | ':' | '$' | '#' )* + // 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; @@ -2492,7 +2492,7 @@ public class CMISLexer extends Lexer { switch (alt13) { case 1 : - // W:\\alfresco\\BRANCHES\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g: + // 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(); @@ -2528,10 +2528,10 @@ public class CMISLexer extends Lexer { try { int _type = WS; int _channel = DEFAULT_TOKEN_CHANNEL; - // W:\\alfresco\\BRANCHES\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:1592:9: ( ( ' ' | '\\t' | '\\r' | '\\n' )+ ) - // W:\\alfresco\\BRANCHES\\V3.3\\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: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\\V3.3\\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 { @@ -2545,7 +2545,7 @@ public class CMISLexer extends Lexer { switch (alt14) { case 1 : - // W:\\alfresco\\BRANCHES\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g: + // 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(); @@ -2584,7 +2584,7 @@ public class CMISLexer extends Lexer { // $ANTLR start "DECIMAL_NUMERAL" public final void mDECIMAL_NUMERAL() throws RecognitionException { try { - // W:\\alfresco\\BRANCHES\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:1607:9: ( ZERO_DIGIT | NON_ZERO_DIGIT ( DIGIT )* ) + // 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); @@ -2602,17 +2602,17 @@ public class CMISLexer extends Lexer { } switch (alt16) { case 1 : - // W:\\alfresco\\BRANCHES\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:1608:9: ZERO_DIGIT + // 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\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:1609:11: NON_ZERO_DIGIT ( DIGIT )* + // 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\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:1609:26: ( 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; @@ -2625,7 +2625,7 @@ public class CMISLexer extends Lexer { switch (alt15) { case 1 : - // W:\\alfresco\\BRANCHES\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:1609:26: DIGIT + // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:1609:26: DIGIT { mDIGIT(); @@ -2651,8 +2651,8 @@ public class CMISLexer extends Lexer { // $ANTLR start "DIGIT" public final void mDIGIT() throws RecognitionException { try { - // W:\\alfresco\\BRANCHES\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:1614:9: ( ZERO_DIGIT | NON_ZERO_DIGIT ) - // W:\\alfresco\\BRANCHES\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g: + // 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(); @@ -2675,8 +2675,8 @@ public class CMISLexer extends Lexer { // $ANTLR start "ZERO_DIGIT" public final void mZERO_DIGIT() throws RecognitionException { try { - // W:\\alfresco\\BRANCHES\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:1621:9: ( '0' ) - // W:\\alfresco\\BRANCHES\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:1622:9: '0' + // 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'); @@ -2691,8 +2691,8 @@ public class CMISLexer extends Lexer { // $ANTLR start "NON_ZERO_DIGIT" public final void mNON_ZERO_DIGIT() throws RecognitionException { try { - // W:\\alfresco\\BRANCHES\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:1627:9: ( '1' .. '9' ) - // W:\\alfresco\\BRANCHES\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:1628:9: '1' .. '9' + // 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'); @@ -2707,8 +2707,8 @@ public class CMISLexer extends Lexer { // $ANTLR start "PLUS" public final void mPLUS() throws RecognitionException { try { - // W:\\alfresco\\BRANCHES\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:1633:9: ( '+' ) - // W:\\alfresco\\BRANCHES\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:1634:9: '+' + // 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('+'); @@ -2723,8 +2723,8 @@ public class CMISLexer extends Lexer { // $ANTLR start "MINUS" public final void mMINUS() throws RecognitionException { try { - // W:\\alfresco\\BRANCHES\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:1639:9: ( '-' ) - // W:\\alfresco\\BRANCHES\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:1640:9: '-' + // 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('-'); @@ -2739,8 +2739,8 @@ public class CMISLexer extends Lexer { // $ANTLR start "E" public final void mE() throws RecognitionException { try { - // W:\\alfresco\\BRANCHES\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:1645:9: ( ( 'e' | 'E' ) ) - // W:\\alfresco\\BRANCHES\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:1646:9: ( 'e' | 'E' ) + // 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(); @@ -2763,8 +2763,8 @@ public class CMISLexer extends Lexer { // $ANTLR start "EXPONENT" public final void mEXPONENT() throws RecognitionException { try { - // W:\\alfresco\\BRANCHES\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:1658:9: ( E SIGNED_INTEGER ) - // W:\\alfresco\\BRANCHES\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:1659:9: E SIGNED_INTEGER + // 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(); @@ -2780,10 +2780,10 @@ public class CMISLexer extends Lexer { // $ANTLR start "SIGNED_INTEGER" public final void mSIGNED_INTEGER() throws RecognitionException { try { - // W:\\alfresco\\BRANCHES\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:1664:9: ( ( PLUS | MINUS )? ( DIGIT )+ ) - // W:\\alfresco\\BRANCHES\\V3.3\\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: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\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:1665:9: ( PLUS | MINUS )? + // 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); @@ -2792,7 +2792,7 @@ public class CMISLexer extends Lexer { } switch (alt17) { case 1 : - // W:\\alfresco\\BRANCHES\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g: + // 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(); @@ -2809,7 +2809,7 @@ public class CMISLexer extends Lexer { } - // W:\\alfresco\\BRANCHES\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:1669:9: ( DIGIT )+ + // 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 { @@ -2823,7 +2823,7 @@ public class CMISLexer extends Lexer { switch (alt18) { case 1 : - // W:\\alfresco\\BRANCHES\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:1669:9: DIGIT + // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:1669:9: DIGIT { mDIGIT(); @@ -2849,348 +2849,348 @@ public class CMISLexer extends Lexer { // $ANTLR end "SIGNED_INTEGER" public void mTokens() throws RecognitionException { - // W:\\alfresco\\BRANCHES\\V3.3\\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 ) + // 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\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:1:10: QUOTED_STRING + // 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\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:1:24: SELECT + // 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\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:1:31: AS + // 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\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:1:34: FROM + // 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\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:1:39: JOIN + // 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\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:1:44: INNER + // 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\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:1:50: LEFT + // 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\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:1:55: OUTER + // 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\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:1:61: ON + // 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\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:1:64: WHERE + // 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\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:1:70: OR + // 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\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:1:73: AND + // 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\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:1:77: NOT + // 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\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:1:81: IN + // 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\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:1:84: LIKE + // 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\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:1:89: IS + // 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\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:1:92: NULL + // 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\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:1:97: ANY + // 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\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:1:101: CONTAINS + // 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\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:1:110: IN_FOLDER + // 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\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:1:120: IN_TREE + // 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\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:1:128: ORDER + // 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\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:1:134: BY + // 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\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:1:137: ASC + // 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\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:1:141: DESC + // 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\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:1:146: TIMESTAMP + // 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\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:1:156: TRUE + // 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\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:1:161: FALSE + // 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\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:1:167: SCORE + // 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\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:1:173: LPAREN + // 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\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:1:180: RPAREN + // 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\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:1:187: STAR + // 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\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:1:192: COMMA + // 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\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:1:198: DOTSTAR + // 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\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:1:206: DOT + // 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\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:1:210: DOTDOT + // 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\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:1:217: EQUALS + // 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\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:1:224: TILDA + // 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\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:1:230: NOTEQUALS + // 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\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:1:240: GREATERTHAN + // 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\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:1:252: LESSTHAN + // 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\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:1:261: GREATERTHANOREQUALS + // 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\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:1:281: LESSTHANOREQUALS + // 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\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:1:298: COLON + // 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\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:1:304: DOUBLE_QUOTE + // 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\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:1:317: DECIMAL_INTEGER_LITERAL + // 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\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:1:341: FLOATING_POINT_LITERAL + // 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\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:1:364: ID + // 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\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:1:367: WS + // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:1:367: WS { mWS(); @@ -3213,13 +3213,13 @@ public class CMISLexer extends Lexer { static final String DFA12_maxS = "\2\71\1\145\3\uffff"; static final String DFA12_acceptS = - "\3\uffff\1\2\1\3\1\1"; + "\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\5\1\uffff\12\2\13\uffff\1\4\37\uffff\1\4", + "\1\4\1\uffff\12\2\13\uffff\1\5\37\uffff\1\5", "", "", "" diff --git a/source/java/org/alfresco/repo/search/impl/parsers/CMISParser.java b/source/java/org/alfresco/repo/search/impl/parsers/CMISParser.java index 1e211eb839..674e60ca02 100644 --- a/source/java/org/alfresco/repo/search/impl/parsers/CMISParser.java +++ b/source/java/org/alfresco/repo/search/impl/parsers/CMISParser.java @@ -1,4 +1,4 @@ -// $ANTLR 3.2 Sep 23, 2009 12:02:23 W:\\alfresco\\BRANCHES\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g 2011-01-12 12:54:11 +// $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; @@ -17,93 +17,93 @@ public class CMISParser extends Parser { public static final String[] tokenNames = new String[] { "", "", "", "", "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 FUNCTION=10; - public static final int WHERE=47; - public static final int EXPONENT=84; - public static final int PRED_FTS=22; - public static final int STAR=33; - public static final int INNER=42; - public static final int ORDER=64; - public static final int DOUBLE_QUOTE=71; - public static final int NUMERIC_LITERAL=27; - public static final int PRED_COMPARISON=18; - public static final int CONTAINS=61; - public static final int TABLE=12; - public static final int SOURCE=11; - public static final int DOTDOT=78; - public static final int EQUALS=46; - public static final int NOT=50; - public static final int ID=70; - public static final int AND=49; public static final int EOF=-1; - public static final int LPAREN=38; - public static final int LESSTHANOREQUALS=54; - public static final int AS=35; - public static final int RPAREN=39; - public static final int TILDA=79; - public static final int PRED_LIKE=21; - public static final int STRING_LITERAL=28; - public static final int IN=56; - public static final int DECIMAL_NUMERAL=82; - public static final int FLOATING_POINT_LITERAL=72; - public static final int COMMA=34; - public static final int IS=58; - public static final int LEFT=43; - public static final int SIGNED_INTEGER=89; - public static final int PARAMETER=14; - public static final int COLUMN=6; - public static final int PLUS=80; - public static final int QUOTED_STRING=69; - public static final int SINGLE_VALUED_PROPERTY=31; - public static final int ZERO_DIGIT=86; - public static final int DIGIT=83; - public static final int DOT=37; - public static final int COLUMN_REF=8; - public static final int SELECT=32; - public static final int LIKE=57; - public static final int GREATERTHAN=53; - public static final int DOTSTAR=36; - public static final int E=88; - public static final int OUTER=44; - public static final int BY=65; - public static final int LESSTHAN=52; - public static final int NON_ZERO_DIGIT=87; - public static final int ASC=66; - public static final int QUALIFIER=9; - public static final int CONJUNCTION=15; - public static final int NULL=59; - public static final int ON=45; - public static final int NOTEQUALS=51; - public static final int DATETIME_LITERAL=29; - public static final int MINUS=81; - public static final int LIST=23; - public static final int TRUE=74; - public static final int PRED_DESCENDANT=25; - public static final int JOIN=41; - public static final int IN_FOLDER=62; - public static final int COLON=68; - public static final int GREATERTHANOREQUALS=55; - public static final int BOOLEAN_LITERAL=30; - public static final int DISJUNCTION=16; - public static final int COLUMNS=7; - public static final int WS=85; - public static final int ANY=60; - public static final int SCORE=77; - public static final int NEGATION=17; - public static final int TABLE_REF=13; - public static final int SORT_SPECIFICATION=26; - public static final int IN_TREE=63; - public static final int OR=48; - public static final int PRED_CHILD=24; - public static final int PRED_EXISTS=20; public static final int QUERY=4; - public static final int DECIMAL_INTEGER_LITERAL=73; - public static final int DESC=67; 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 PRED_IN=19; + 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 @@ -127,7 +127,7 @@ public class CMISParser extends Parser { } public String[] getTokenNames() { return CMISParser.tokenNames; } - public String getGrammarFileName() { return "W:\\alfresco\\BRANCHES\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g"; } + public String getGrammarFileName() { return "W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g"; } private Stack paraphrases = new Stack(); @@ -280,7 +280,7 @@ public class CMISParser extends Parser { }; // $ANTLR start "query" - // W:\\alfresco\\BRANCHES\\V3.3\\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 )? ) ; + // 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); @@ -310,8 +310,8 @@ public class CMISParser extends Parser { paraphrases.push("in query"); try { - // W:\\alfresco\\BRANCHES\\V3.3\\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\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:295:9: SELECT selectList fromClause ( whereClause )? ( orderByClause )? EOF + // 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); @@ -328,7 +328,7 @@ public class CMISParser extends Parser { state._fsp--; if (state.failed) return retval; if ( state.backtracking==0 ) stream_fromClause.add(fromClause3.getTree()); - // W:\\alfresco\\BRANCHES\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:295:38: ( whereClause )? + // 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); @@ -337,7 +337,7 @@ public class CMISParser extends Parser { } switch (alt1) { case 1 : - // W:\\alfresco\\BRANCHES\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:295:38: whereClause + // 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(); @@ -351,7 +351,7 @@ public class CMISParser extends Parser { } - // W:\\alfresco\\BRANCHES\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:295:51: ( orderByClause )? + // 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); @@ -360,7 +360,7 @@ public class CMISParser extends Parser { } switch (alt2) { case 1 : - // W:\\alfresco\\BRANCHES\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:295:51: orderByClause + // 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(); @@ -380,7 +380,7 @@ public class CMISParser extends Parser { // AST REWRITE - // elements: orderByClause, whereClause, fromClause, selectList + // elements: selectList, orderByClause, fromClause, whereClause // token labels: // rule labels: retval // token list labels: @@ -393,20 +393,20 @@ public class CMISParser extends Parser { root_0 = (Object)adaptor.nil(); // 296:17: -> ^( QUERY selectList fromClause ( whereClause )? ( orderByClause )? ) { - // W:\\alfresco\\BRANCHES\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:297:25: ^( 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\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:297:55: ( whereClause )? + // 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\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:297:68: ( orderByClause )? + // 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()); @@ -451,7 +451,7 @@ public class CMISParser extends Parser { }; // $ANTLR start "selectList" - // W:\\alfresco\\BRANCHES\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:300:1: selectList : ( STAR -> ^( ALL_COLUMNS ) | selectSubList ( COMMA selectSubList )* -> ^( COLUMNS ( selectSubList )+ ) ); + // 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); @@ -474,12 +474,12 @@ public class CMISParser extends Parser { paraphrases.push("in select list"); try { - // W:\\alfresco\\BRANCHES\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:309:9: ( STAR -> ^( ALL_COLUMNS ) | selectSubList ( COMMA selectSubList )* -> ^( COLUMNS ( selectSubList )+ ) ) + // 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\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:310:9: STAR + // 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); @@ -500,7 +500,7 @@ public class CMISParser extends Parser { root_0 = (Object)adaptor.nil(); // 311:17: -> ^( ALL_COLUMNS ) { - // W:\\alfresco\\BRANCHES\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:312:25: ^( 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); @@ -514,7 +514,7 @@ public class CMISParser extends Parser { } break; case 2 : - // W:\\alfresco\\BRANCHES\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:313:11: selectSubList ( COMMA selectSubList )* + // 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(); @@ -522,7 +522,7 @@ public class CMISParser extends Parser { state._fsp--; if (state.failed) return retval; if ( state.backtracking==0 ) stream_selectSubList.add(selectSubList8.getTree()); - // W:\\alfresco\\BRANCHES\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:313:25: ( COMMA selectSubList )* + // 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; @@ -535,7 +535,7 @@ public class CMISParser extends Parser { switch (alt3) { case 1 : - // W:\\alfresco\\BRANCHES\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:313:26: COMMA selectSubList + // 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); @@ -571,7 +571,7 @@ public class CMISParser extends Parser { root_0 = (Object)adaptor.nil(); // 314:17: -> ^( COLUMNS ( selectSubList )+ ) { - // W:\\alfresco\\BRANCHES\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:315:25: ^( 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); @@ -625,7 +625,7 @@ public class CMISParser extends Parser { }; // $ANTLR start "selectSubList" - // W:\\alfresco\\BRANCHES\\V3.3\\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 ) ); + // 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); @@ -649,12 +649,12 @@ public class CMISParser extends Parser { RewriteRuleSubtreeStream stream_columnName=new RewriteRuleSubtreeStream(adaptor,"rule columnName"); RewriteRuleSubtreeStream stream_qualifier=new RewriteRuleSubtreeStream(adaptor,"rule qualifier"); try { - // W:\\alfresco\\BRANCHES\\V3.3\\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 ) ) + // 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\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:320:9: valueExpression ( ( AS )? columnName )? + // 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(); @@ -662,7 +662,7 @@ public class CMISParser extends Parser { state._fsp--; if (state.failed) return retval; if ( state.backtracking==0 ) stream_valueExpression.add(valueExpression11.getTree()); - // W:\\alfresco\\BRANCHES\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:320:25: ( ( AS )? columnName )? + // 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); @@ -677,9 +677,9 @@ public class CMISParser extends Parser { } switch (alt6) { case 1 : - // W:\\alfresco\\BRANCHES\\V3.3\\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 )? columnName { - // W:\\alfresco\\BRANCHES\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:320:26: ( AS )? + // 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); @@ -688,7 +688,7 @@ public class CMISParser extends Parser { } switch (alt5) { case 1 : - // W:\\alfresco\\BRANCHES\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:320:26: AS + // 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); @@ -727,13 +727,13 @@ public class CMISParser extends Parser { root_0 = (Object)adaptor.nil(); // 321:17: -> ^( COLUMN valueExpression ( columnName )? ) { - // W:\\alfresco\\BRANCHES\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:322:25: ^( 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\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:322:50: ( columnName )? + // 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()); @@ -749,7 +749,7 @@ public class CMISParser extends Parser { } break; case 2 : - // W:\\alfresco\\BRANCHES\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:323:11: qualifier DOTSTAR + // 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(); @@ -776,7 +776,7 @@ public class CMISParser extends Parser { root_0 = (Object)adaptor.nil(); // 324:17: -> ^( ALL_COLUMNS qualifier ) { - // W:\\alfresco\\BRANCHES\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:325:25: ^( 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); @@ -818,7 +818,7 @@ public class CMISParser extends Parser { }; // $ANTLR start "valueExpression" - // W:\\alfresco\\BRANCHES\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:328:1: valueExpression : ( columnReference -> columnReference | valueFunction -> valueFunction ); + // 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); @@ -836,12 +836,12 @@ public class CMISParser extends Parser { paraphrases.push("in value expression"); try { - // W:\\alfresco\\BRANCHES\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:337:9: ( columnReference -> columnReference | valueFunction -> valueFunction ) + // 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\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:338:9: columnReference + // 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(); @@ -873,7 +873,7 @@ public class CMISParser extends Parser { } break; case 2 : - // W:\\alfresco\\BRANCHES\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:340:11: valueFunction + // 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(); @@ -936,7 +936,7 @@ public class CMISParser extends Parser { }; // $ANTLR start "columnReference" - // W:\\alfresco\\BRANCHES\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:344:1: columnReference : ( 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: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); @@ -957,15 +957,15 @@ public class CMISParser extends Parser { paraphrases.push("in column reference"); try { - // W:\\alfresco\\BRANCHES\\V3.3\\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\\V3.3\\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: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\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:354:9: ( qualifier DOT )? + // 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\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:354:10: qualifier DOT + // 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(); @@ -991,7 +991,7 @@ public class CMISParser extends Parser { // AST REWRITE - // elements: columnName, qualifier + // elements: qualifier, columnName // token labels: // rule labels: retval // token list labels: @@ -1004,13 +1004,13 @@ public class CMISParser extends Parser { root_0 = (Object)adaptor.nil(); // 355:17: -> ^( COLUMN_REF columnName ( qualifier )? ) { - // W:\\alfresco\\BRANCHES\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:356:25: ^( 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\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:356:49: ( qualifier )? + // 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()); @@ -1055,7 +1055,7 @@ public class CMISParser extends Parser { }; // $ANTLR start "valueFunction" - // W:\\alfresco\\BRANCHES\\V3.3\\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 ) ); + // 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); @@ -1088,12 +1088,12 @@ public class CMISParser extends Parser { paraphrases.push("in function"); try { - // W:\\alfresco\\BRANCHES\\V3.3\\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 ) ) + // 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\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:369:9: cmisFunctionName= cmisFunction LPAREN ( functionArgument )* RPAREN + // 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(); @@ -1104,14 +1104,14 @@ public class CMISParser extends Parser { 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\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:369:46: ( functionArgument )* + // 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\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:369:46: functionArgument + // 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(); @@ -1134,7 +1134,7 @@ public class CMISParser extends Parser { // AST REWRITE - // elements: RPAREN, functionArgument, LPAREN, cmisFunctionName + // elements: cmisFunctionName, LPAREN, functionArgument, RPAREN // token labels: // rule labels: retval, cmisFunctionName // token list labels: @@ -1148,14 +1148,14 @@ public class CMISParser extends Parser { root_0 = (Object)adaptor.nil(); // 370:17: -> ^( FUNCTION $cmisFunctionName LPAREN ( functionArgument )* RPAREN ) { - // W:\\alfresco\\BRANCHES\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:371:25: ^( 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\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:371:61: ( functionArgument )* + // 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()); @@ -1172,7 +1172,7 @@ public class CMISParser extends Parser { } break; case 2 : - // W:\\alfresco\\BRANCHES\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:372:11: {...}? =>functionName= keyWordOrId LPAREN ( functionArgument )* RPAREN + // 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;} @@ -1187,14 +1187,14 @@ public class CMISParser extends Parser { 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\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:372:64: ( functionArgument )* + // 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\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:372:64: functionArgument + // 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(); @@ -1217,7 +1217,7 @@ public class CMISParser extends Parser { // AST REWRITE - // elements: functionName, LPAREN, RPAREN, functionArgument + // elements: LPAREN, functionName, RPAREN, functionArgument // token labels: // rule labels: retval, functionName // token list labels: @@ -1231,14 +1231,14 @@ public class CMISParser extends Parser { root_0 = (Object)adaptor.nil(); // 373:17: -> ^( FUNCTION $functionName LPAREN ( functionArgument )* RPAREN ) { - // W:\\alfresco\\BRANCHES\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:374:25: ^( 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\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:374:57: ( functionArgument )* + // 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()); @@ -1286,7 +1286,7 @@ public class CMISParser extends Parser { }; // $ANTLR start "functionArgument" - // W:\\alfresco\\BRANCHES\\V3.3\\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 ); + // 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); @@ -1308,12 +1308,12 @@ public class CMISParser extends Parser { RewriteRuleSubtreeStream stream_columnName=new RewriteRuleSubtreeStream(adaptor,"rule columnName"); RewriteRuleSubtreeStream stream_qualifier=new RewriteRuleSubtreeStream(adaptor,"rule qualifier"); try { - // W:\\alfresco\\BRANCHES\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:378:9: ( qualifier DOT columnName -> ^( COLUMN_REF columnName qualifier ) | identifier | literalOrParameterName ) + // 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\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:379:9: qualifier DOT columnName + // 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(); @@ -1346,7 +1346,7 @@ public class CMISParser extends Parser { root_0 = (Object)adaptor.nil(); // 380:17: -> ^( COLUMN_REF columnName qualifier ) { - // W:\\alfresco\\BRANCHES\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:381:25: ^( 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); @@ -1363,7 +1363,7 @@ public class CMISParser extends Parser { } break; case 2 : - // W:\\alfresco\\BRANCHES\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:382:11: identifier + // 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(); @@ -1377,7 +1377,7 @@ public class CMISParser extends Parser { } break; case 3 : - // W:\\alfresco\\BRANCHES\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:383:11: literalOrParameterName + // 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(); @@ -1417,7 +1417,7 @@ public class CMISParser extends Parser { }; // $ANTLR start "qualifier" - // W:\\alfresco\\BRANCHES\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:386:1: qualifier : ( ( tableName )=> tableName -> tableName | correlationName -> correlationName ); + // 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); @@ -1432,12 +1432,12 @@ public class CMISParser extends Parser { RewriteRuleSubtreeStream stream_correlationName=new RewriteRuleSubtreeStream(adaptor,"rule correlationName"); RewriteRuleSubtreeStream stream_tableName=new RewriteRuleSubtreeStream(adaptor,"rule tableName"); try { - // W:\\alfresco\\BRANCHES\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:387:9: ( ( tableName )=> tableName -> tableName | correlationName -> correlationName ) + // 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\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:388:9: ( tableName )=> tableName + // 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(); @@ -1469,7 +1469,7 @@ public class CMISParser extends Parser { } break; case 2 : - // W:\\alfresco\\BRANCHES\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:390:11: correlationName + // 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(); @@ -1527,7 +1527,7 @@ public class CMISParser extends Parser { }; // $ANTLR start "fromClause" - // W:\\alfresco\\BRANCHES\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:394:1: fromClause : FROM tableReference -> tableReference ; + // 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); @@ -1545,8 +1545,8 @@ public class CMISParser extends Parser { paraphrases.push("in fromClause"); try { - // W:\\alfresco\\BRANCHES\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:403:9: ( FROM tableReference -> tableReference ) - // W:\\alfresco\\BRANCHES\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:404:9: FROM tableReference + // 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); @@ -1610,7 +1610,7 @@ public class CMISParser extends Parser { }; // $ANTLR start "tableReference" - // W:\\alfresco\\BRANCHES\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:408:1: tableReference : singleTable ( joinedTable )* -> ^( SOURCE singleTable ( joinedTable )* ) ; + // 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); @@ -1628,8 +1628,8 @@ public class CMISParser extends Parser { paraphrases.push("in tableReference"); try { - // W:\\alfresco\\BRANCHES\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:417:9: ( singleTable ( joinedTable )* -> ^( SOURCE singleTable ( joinedTable )* ) ) - // W:\\alfresco\\BRANCHES\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:418:9: singleTable ( joinedTable )* + // 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(); @@ -1637,7 +1637,7 @@ public class CMISParser extends Parser { state._fsp--; if (state.failed) return retval; if ( state.backtracking==0 ) stream_singleTable.add(singleTable36.getTree()); - // W:\\alfresco\\BRANCHES\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:418:21: ( joinedTable )* + // 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; @@ -1650,7 +1650,7 @@ public class CMISParser extends Parser { switch (alt15) { case 1 : - // W:\\alfresco\\BRANCHES\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:418:21: joinedTable + // 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(); @@ -1670,7 +1670,7 @@ public class CMISParser extends Parser { // AST REWRITE - // elements: joinedTable, singleTable + // elements: singleTable, joinedTable // token labels: // rule labels: retval // token list labels: @@ -1683,13 +1683,13 @@ public class CMISParser extends Parser { root_0 = (Object)adaptor.nil(); // 419:17: -> ^( SOURCE singleTable ( joinedTable )* ) { - // W:\\alfresco\\BRANCHES\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:420:25: ^( 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\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:420:46: ( joinedTable )* + // 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()); @@ -1734,7 +1734,7 @@ public class CMISParser extends Parser { }; // $ANTLR start "singleTable" - // W:\\alfresco\\BRANCHES\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:427:1: singleTable : ( simpleTable -> simpleTable | complexTable -> ^( TABLE complexTable ) ); + // 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); @@ -1752,7 +1752,7 @@ public class CMISParser extends Parser { paraphrases.push("in singleTable"); try { - // W:\\alfresco\\BRANCHES\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:436:9: ( simpleTable -> simpleTable | complexTable -> ^( TABLE complexTable ) ) + // 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); @@ -1774,7 +1774,7 @@ public class CMISParser extends Parser { } switch (alt16) { case 1 : - // W:\\alfresco\\BRANCHES\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:437:9: simpleTable + // 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(); @@ -1806,7 +1806,7 @@ public class CMISParser extends Parser { } break; case 2 : - // W:\\alfresco\\BRANCHES\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:439:11: complexTable + // 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(); @@ -1830,7 +1830,7 @@ public class CMISParser extends Parser { root_0 = (Object)adaptor.nil(); // 440:17: -> ^( TABLE complexTable ) { - // W:\\alfresco\\BRANCHES\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:441:25: ^( 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); @@ -1877,7 +1877,7 @@ public class CMISParser extends Parser { }; // $ANTLR start "simpleTable" - // W:\\alfresco\\BRANCHES\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:444:1: simpleTable : 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: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); @@ -1898,8 +1898,8 @@ public class CMISParser extends Parser { paraphrases.push("in simpleTable"); try { - // W:\\alfresco\\BRANCHES\\V3.3\\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\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:454:9: tableName ( ( AS )? correlationName )? + // 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(); @@ -1907,14 +1907,14 @@ public class CMISParser extends Parser { state._fsp--; if (state.failed) return retval; if ( state.backtracking==0 ) stream_tableName.add(tableName40.getTree()); - // W:\\alfresco\\BRANCHES\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:454:19: ( ( AS )? correlationName )? + // 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\\V3.3\\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 )? correlationName { - // W:\\alfresco\\BRANCHES\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:454:20: ( AS )? + // 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); @@ -1923,7 +1923,7 @@ public class CMISParser extends Parser { } switch (alt17) { case 1 : - // W:\\alfresco\\BRANCHES\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:454:20: AS + // 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); @@ -1949,7 +1949,7 @@ public class CMISParser extends Parser { // AST REWRITE - // elements: correlationName, tableName + // elements: tableName, correlationName // token labels: // rule labels: retval // token list labels: @@ -1962,13 +1962,13 @@ public class CMISParser extends Parser { root_0 = (Object)adaptor.nil(); // 455:17: -> ^( TABLE_REF tableName ( correlationName )? ) { - // W:\\alfresco\\BRANCHES\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:456:25: ^( 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\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:456:47: ( correlationName )? + // 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()); @@ -2013,7 +2013,7 @@ public class CMISParser extends Parser { }; // $ANTLR start "joinedTable" - // W:\\alfresco\\BRANCHES\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:459:1: joinedTable : ( 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: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); @@ -2037,10 +2037,10 @@ public class CMISParser extends Parser { paraphrases.push("in joinedTable"); try { - // W:\\alfresco\\BRANCHES\\V3.3\\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\\V3.3\\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: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\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:469:9: ( joinType )? + // 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); @@ -2049,7 +2049,7 @@ public class CMISParser extends Parser { } switch (alt19) { case 1 : - // W:\\alfresco\\BRANCHES\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:469:9: joinType + // 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(); @@ -2081,7 +2081,7 @@ public class CMISParser extends Parser { // AST REWRITE - // elements: joinSpecification, tableReference, joinType, JOIN + // elements: JOIN, joinSpecification, tableReference, joinType // token labels: // rule labels: retval // token list labels: @@ -2094,13 +2094,13 @@ public class CMISParser extends Parser { root_0 = (Object)adaptor.nil(); // 470:17: -> ^( JOIN tableReference ( joinType )? joinSpecification ) { - // W:\\alfresco\\BRANCHES\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:471:25: ^( 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\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:471:47: ( joinType )? + // 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()); @@ -2146,7 +2146,7 @@ public class CMISParser extends Parser { }; // $ANTLR start "complexTable" - // W:\\alfresco\\BRANCHES\\V3.3\\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 ); + // 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); @@ -2177,7 +2177,7 @@ public class CMISParser extends Parser { paraphrases.push("in complexTable"); try { - // W:\\alfresco\\BRANCHES\\V3.3\\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 ) + // 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); @@ -2207,7 +2207,7 @@ public class CMISParser extends Parser { } switch (alt21) { case 1 : - // W:\\alfresco\\BRANCHES\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:484:9: ( LPAREN singleTable ( joinedTable )+ RPAREN )=> LPAREN singleTable ( joinedTable )+ RPAREN + // 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); @@ -2218,7 +2218,7 @@ public class CMISParser extends Parser { state._fsp--; if (state.failed) return retval; if ( state.backtracking==0 ) stream_singleTable.add(singleTable48.getTree()); - // W:\\alfresco\\BRANCHES\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:484:72: ( joinedTable )+ + // 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 { @@ -2232,7 +2232,7 @@ public class CMISParser extends Parser { switch (alt20) { case 1 : - // W:\\alfresco\\BRANCHES\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:484:72: joinedTable + // 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(); @@ -2260,7 +2260,7 @@ public class CMISParser extends Parser { // AST REWRITE - // elements: singleTable, joinedTable + // elements: joinedTable, singleTable // token labels: // rule labels: retval // token list labels: @@ -2273,7 +2273,7 @@ public class CMISParser extends Parser { root_0 = (Object)adaptor.nil(); // 485:17: -> ^( SOURCE singleTable ( joinedTable )+ ) { - // W:\\alfresco\\BRANCHES\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:486:25: ^( 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); @@ -2297,7 +2297,7 @@ public class CMISParser extends Parser { } break; case 2 : - // W:\\alfresco\\BRANCHES\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:487:11: LPAREN complexTable RPAREN + // 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); @@ -2366,7 +2366,7 @@ public class CMISParser extends Parser { }; // $ANTLR start "joinType" - // W:\\alfresco\\BRANCHES\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:491:1: joinType : ( INNER -> INNER | LEFT ( OUTER )? -> LEFT ); + // 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); @@ -2385,7 +2385,7 @@ public class CMISParser extends Parser { RewriteRuleTokenStream stream_LEFT=new RewriteRuleTokenStream(adaptor,"token LEFT"); try { - // W:\\alfresco\\BRANCHES\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:492:9: ( INNER -> INNER | LEFT ( OUTER )? -> LEFT ) + // 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); @@ -2404,7 +2404,7 @@ public class CMISParser extends Parser { } switch (alt23) { case 1 : - // W:\\alfresco\\BRANCHES\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:493:9: INNER + // 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); @@ -2433,12 +2433,12 @@ public class CMISParser extends Parser { } break; case 2 : - // W:\\alfresco\\BRANCHES\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:495:11: LEFT ( OUTER )? + // 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\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:495:16: ( OUTER )? + // 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); @@ -2447,7 +2447,7 @@ public class CMISParser extends Parser { } switch (alt22) { case 1 : - // W:\\alfresco\\BRANCHES\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:495:16: OUTER + // 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); @@ -2508,7 +2508,7 @@ public class CMISParser extends Parser { }; // $ANTLR start "joinSpecification" - // W:\\alfresco\\BRANCHES\\V3.3\\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) ; + // 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); @@ -2531,8 +2531,8 @@ public class CMISParser extends Parser { paraphrases.push("in join condition"); try { - // W:\\alfresco\\BRANCHES\\V3.3\\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\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:509:9: ON lhs= columnReference EQUALS rhs= columnReference + // 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); @@ -2555,7 +2555,7 @@ public class CMISParser extends Parser { // AST REWRITE - // elements: rhs, ON, EQUALS, lhs + // elements: lhs, ON, rhs, EQUALS // token labels: // rule labels: retval, rhs, lhs // token list labels: @@ -2570,7 +2570,7 @@ public class CMISParser extends Parser { root_0 = (Object)adaptor.nil(); // 510:17: -> ^( ON $lhs EQUALS $rhs) { - // W:\\alfresco\\BRANCHES\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:511:25: ^( 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); @@ -2617,7 +2617,7 @@ public class CMISParser extends Parser { }; // $ANTLR start "whereClause" - // W:\\alfresco\\BRANCHES\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:518:1: whereClause : WHERE searchOrCondition -> searchOrCondition ; + // 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); @@ -2635,8 +2635,8 @@ public class CMISParser extends Parser { paraphrases.push("in where"); try { - // W:\\alfresco\\BRANCHES\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:527:9: ( WHERE searchOrCondition -> searchOrCondition ) - // W:\\alfresco\\BRANCHES\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:528:9: WHERE searchOrCondition + // 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); @@ -2700,7 +2700,7 @@ public class CMISParser extends Parser { }; // $ANTLR start "searchOrCondition" - // W:\\alfresco\\BRANCHES\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:532:1: searchOrCondition : searchAndCondition ( OR searchAndCondition )* -> ^( DISJUNCTION ( searchAndCondition )+ ) ; + // 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); @@ -2717,8 +2717,8 @@ public class CMISParser extends Parser { RewriteRuleTokenStream stream_OR=new RewriteRuleTokenStream(adaptor,"token OR"); RewriteRuleSubtreeStream stream_searchAndCondition=new RewriteRuleSubtreeStream(adaptor,"rule searchAndCondition"); try { - // W:\\alfresco\\BRANCHES\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:536:9: ( searchAndCondition ( OR searchAndCondition )* -> ^( DISJUNCTION ( searchAndCondition )+ ) ) - // W:\\alfresco\\BRANCHES\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:537:9: searchAndCondition ( OR searchAndCondition )* + // 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(); @@ -2726,7 +2726,7 @@ public class CMISParser extends Parser { state._fsp--; if (state.failed) return retval; if ( state.backtracking==0 ) stream_searchAndCondition.add(searchAndCondition61.getTree()); - // W:\\alfresco\\BRANCHES\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:537:28: ( OR searchAndCondition )* + // 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; @@ -2739,7 +2739,7 @@ public class CMISParser extends Parser { switch (alt24) { case 1 : - // W:\\alfresco\\BRANCHES\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:537:29: OR searchAndCondition + // 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); @@ -2775,7 +2775,7 @@ public class CMISParser extends Parser { root_0 = (Object)adaptor.nil(); // 538:17: -> ^( DISJUNCTION ( searchAndCondition )+ ) { - // W:\\alfresco\\BRANCHES\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:539:25: ^( 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); @@ -2822,7 +2822,7 @@ public class CMISParser extends Parser { }; // $ANTLR start "searchAndCondition" - // W:\\alfresco\\BRANCHES\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:542:1: searchAndCondition : searchNotCondition ( AND searchNotCondition )* -> ^( CONJUNCTION ( searchNotCondition )+ ) ; + // 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); @@ -2839,8 +2839,8 @@ public class CMISParser extends Parser { RewriteRuleTokenStream stream_AND=new RewriteRuleTokenStream(adaptor,"token AND"); RewriteRuleSubtreeStream stream_searchNotCondition=new RewriteRuleSubtreeStream(adaptor,"rule searchNotCondition"); try { - // W:\\alfresco\\BRANCHES\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:546:9: ( searchNotCondition ( AND searchNotCondition )* -> ^( CONJUNCTION ( searchNotCondition )+ ) ) - // W:\\alfresco\\BRANCHES\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:547:9: searchNotCondition ( AND searchNotCondition )* + // 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(); @@ -2848,7 +2848,7 @@ public class CMISParser extends Parser { state._fsp--; if (state.failed) return retval; if ( state.backtracking==0 ) stream_searchNotCondition.add(searchNotCondition64.getTree()); - // W:\\alfresco\\BRANCHES\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:547:28: ( AND searchNotCondition )* + // 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; @@ -2861,7 +2861,7 @@ public class CMISParser extends Parser { switch (alt25) { case 1 : - // W:\\alfresco\\BRANCHES\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:547:29: AND searchNotCondition + // 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); @@ -2897,7 +2897,7 @@ public class CMISParser extends Parser { root_0 = (Object)adaptor.nil(); // 548:17: -> ^( CONJUNCTION ( searchNotCondition )+ ) { - // W:\\alfresco\\BRANCHES\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:549:25: ^( 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); @@ -2944,7 +2944,7 @@ public class CMISParser extends Parser { }; // $ANTLR start "searchNotCondition" - // W:\\alfresco\\BRANCHES\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:552:1: searchNotCondition : ( NOT searchTest -> ^( NEGATION searchTest ) | searchTest -> searchTest ); + // 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); @@ -2961,12 +2961,12 @@ public class CMISParser extends Parser { RewriteRuleTokenStream stream_NOT=new RewriteRuleTokenStream(adaptor,"token NOT"); RewriteRuleSubtreeStream stream_searchTest=new RewriteRuleSubtreeStream(adaptor,"rule searchTest"); try { - // W:\\alfresco\\BRANCHES\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:553:9: ( NOT searchTest -> ^( NEGATION searchTest ) | searchTest -> searchTest ) + // 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\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:554:9: NOT searchTest + // 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); @@ -2993,7 +2993,7 @@ public class CMISParser extends Parser { root_0 = (Object)adaptor.nil(); // 555:17: -> ^( NEGATION searchTest ) { - // W:\\alfresco\\BRANCHES\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:556:25: ^( 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); @@ -3009,7 +3009,7 @@ public class CMISParser extends Parser { } break; case 2 : - // W:\\alfresco\\BRANCHES\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:557:11: searchTest + // 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(); @@ -3067,7 +3067,7 @@ public class CMISParser extends Parser { }; // $ANTLR start "searchTest" - // W:\\alfresco\\BRANCHES\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:561:1: searchTest : ( predicate -> predicate | LPAREN searchOrCondition RPAREN -> searchOrCondition ); + // 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); @@ -3088,12 +3088,12 @@ public class CMISParser extends Parser { RewriteRuleSubtreeStream stream_predicate=new RewriteRuleSubtreeStream(adaptor,"rule predicate"); RewriteRuleSubtreeStream stream_searchOrCondition=new RewriteRuleSubtreeStream(adaptor,"rule searchOrCondition"); try { - // W:\\alfresco\\BRANCHES\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:562:9: ( predicate -> predicate | LPAREN searchOrCondition RPAREN -> searchOrCondition ) + // 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\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:563:9: predicate + // 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(); @@ -3125,7 +3125,7 @@ public class CMISParser extends Parser { } break; case 2 : - // W:\\alfresco\\BRANCHES\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:565:11: LPAREN searchOrCondition RPAREN + // 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); @@ -3189,7 +3189,7 @@ public class CMISParser extends Parser { }; // $ANTLR start "predicate" - // W:\\alfresco\\BRANCHES\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:569:1: predicate : ( comparisonPredicate | inPredicate | likePredicate | nullPredicate | quantifiedComparisonPredicate | quantifiedInPredicate | textSearchPredicate | folderPredicate ); + // 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); @@ -3215,12 +3215,12 @@ public class CMISParser extends Parser { try { - // W:\\alfresco\\BRANCHES\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:570:9: ( comparisonPredicate | inPredicate | likePredicate | nullPredicate | quantifiedComparisonPredicate | quantifiedInPredicate | textSearchPredicate | folderPredicate ) + // 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\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:571:9: comparisonPredicate + // 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(); @@ -3234,7 +3234,7 @@ public class CMISParser extends Parser { } break; case 2 : - // W:\\alfresco\\BRANCHES\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:572:11: inPredicate + // 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(); @@ -3248,7 +3248,7 @@ public class CMISParser extends Parser { } break; case 3 : - // W:\\alfresco\\BRANCHES\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:573:11: likePredicate + // 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(); @@ -3262,7 +3262,7 @@ public class CMISParser extends Parser { } break; case 4 : - // W:\\alfresco\\BRANCHES\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:574:11: nullPredicate + // 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(); @@ -3276,7 +3276,7 @@ public class CMISParser extends Parser { } break; case 5 : - // W:\\alfresco\\BRANCHES\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:575:11: quantifiedComparisonPredicate + // 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(); @@ -3290,7 +3290,7 @@ public class CMISParser extends Parser { } break; case 6 : - // W:\\alfresco\\BRANCHES\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:576:11: quantifiedInPredicate + // 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(); @@ -3304,7 +3304,7 @@ public class CMISParser extends Parser { } break; case 7 : - // W:\\alfresco\\BRANCHES\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:577:11: textSearchPredicate + // 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(); @@ -3318,7 +3318,7 @@ public class CMISParser extends Parser { } break; case 8 : - // W:\\alfresco\\BRANCHES\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:578:11: folderPredicate + // 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(); @@ -3358,7 +3358,7 @@ public class CMISParser extends Parser { }; // $ANTLR start "comparisonPredicate" - // W:\\alfresco\\BRANCHES\\V3.3\\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 ) ; + // 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); @@ -3376,8 +3376,8 @@ public class CMISParser extends Parser { RewriteRuleSubtreeStream stream_compOp=new RewriteRuleSubtreeStream(adaptor,"rule compOp"); RewriteRuleSubtreeStream stream_literalOrParameterName=new RewriteRuleSubtreeStream(adaptor,"rule literalOrParameterName"); try { - // W:\\alfresco\\BRANCHES\\V3.3\\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\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:583:9: valueExpression compOp literalOrParameterName + // 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(); @@ -3400,7 +3400,7 @@ public class CMISParser extends Parser { // AST REWRITE - // elements: compOp, literalOrParameterName, valueExpression + // elements: literalOrParameterName, valueExpression, compOp // token labels: // rule labels: retval // token list labels: @@ -3413,7 +3413,7 @@ public class CMISParser extends Parser { root_0 = (Object)adaptor.nil(); // 584:17: -> ^( PRED_COMPARISON SINGLE_VALUED_PROPERTY valueExpression compOp literalOrParameterName ) { - // W:\\alfresco\\BRANCHES\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:585:25: ^( 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); @@ -3456,7 +3456,7 @@ public class CMISParser extends Parser { }; // $ANTLR start "compOp" - // W:\\alfresco\\BRANCHES\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:588:1: compOp : ( EQUALS | NOTEQUALS | LESSTHAN | GREATERTHAN | LESSTHANOREQUALS | GREATERTHANOREQUALS ); + // 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); @@ -3468,8 +3468,8 @@ public class CMISParser extends Parser { Object set85_tree=null; try { - // W:\\alfresco\\BRANCHES\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:589:9: ( EQUALS | NOTEQUALS | LESSTHAN | GREATERTHAN | LESSTHANOREQUALS | GREATERTHANOREQUALS ) - // W:\\alfresco\\BRANCHES\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g: + // 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(); @@ -3513,7 +3513,7 @@ public class CMISParser extends Parser { }; // $ANTLR start "literalOrParameterName" - // W:\\alfresco\\BRANCHES\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:598:1: literalOrParameterName : ( literal | {...}? => parameterName ); + // 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); @@ -3527,7 +3527,7 @@ public class CMISParser extends Parser { try { - // W:\\alfresco\\BRANCHES\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:599:9: ( literal | {...}? => parameterName ) + // 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); @@ -3561,7 +3561,7 @@ public class CMISParser extends Parser { } switch (alt29) { case 1 : - // W:\\alfresco\\BRANCHES\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:600:9: literal + // 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(); @@ -3575,7 +3575,7 @@ public class CMISParser extends Parser { } break; case 2 : - // W:\\alfresco\\BRANCHES\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:601:11: {...}? => parameterName + // 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(); @@ -3619,7 +3619,7 @@ public class CMISParser extends Parser { }; // $ANTLR start "literal" - // W:\\alfresco\\BRANCHES\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:604:1: literal : ( signedNumericLiteral | characterStringLiteral | booleanLiteral | datetimeLiteral ); + // 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); @@ -3637,7 +3637,7 @@ public class CMISParser extends Parser { try { - // W:\\alfresco\\BRANCHES\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:605:9: ( signedNumericLiteral | characterStringLiteral | booleanLiteral | datetimeLiteral ) + // 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: @@ -3672,7 +3672,7 @@ public class CMISParser extends Parser { switch (alt30) { case 1 : - // W:\\alfresco\\BRANCHES\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:606:9: signedNumericLiteral + // 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(); @@ -3686,7 +3686,7 @@ public class CMISParser extends Parser { } break; case 2 : - // W:\\alfresco\\BRANCHES\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:607:11: characterStringLiteral + // 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(); @@ -3700,7 +3700,7 @@ public class CMISParser extends Parser { } break; case 3 : - // W:\\alfresco\\BRANCHES\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:608:11: booleanLiteral + // 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(); @@ -3714,7 +3714,7 @@ public class CMISParser extends Parser { } break; case 4 : - // W:\\alfresco\\BRANCHES\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:609:11: datetimeLiteral + // 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(); @@ -3754,7 +3754,7 @@ public class CMISParser extends Parser { }; // $ANTLR start "inPredicate" - // W:\\alfresco\\BRANCHES\\V3.3\\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 )? ) ; + // 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); @@ -3781,8 +3781,8 @@ public class CMISParser extends Parser { RewriteRuleSubtreeStream stream_columnReference=new RewriteRuleSubtreeStream(adaptor,"rule columnReference"); RewriteRuleSubtreeStream stream_inValueList=new RewriteRuleSubtreeStream(adaptor,"rule inValueList"); try { - // W:\\alfresco\\BRANCHES\\V3.3\\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\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:614:9: columnReference ( NOT )? IN LPAREN inValueList RPAREN + // 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(); @@ -3790,7 +3790,7 @@ public class CMISParser extends Parser { state._fsp--; if (state.failed) return retval; if ( state.backtracking==0 ) stream_columnReference.add(columnReference92.getTree()); - // W:\\alfresco\\BRANCHES\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:614:25: ( NOT )? + // 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); @@ -3799,7 +3799,7 @@ public class CMISParser extends Parser { } switch (alt31) { case 1 : - // W:\\alfresco\\BRANCHES\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:614:25: NOT + // 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); @@ -3828,7 +3828,7 @@ public class CMISParser extends Parser { // AST REWRITE - // elements: columnReference, inValueList, NOT + // elements: inValueList, columnReference, NOT // token labels: // rule labels: retval // token list labels: @@ -3841,7 +3841,7 @@ public class CMISParser extends Parser { root_0 = (Object)adaptor.nil(); // 615:17: -> ^( PRED_IN SINGLE_VALUED_PROPERTY columnReference inValueList ( NOT )? ) { - // W:\\alfresco\\BRANCHES\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:616:25: ^( 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); @@ -3849,7 +3849,7 @@ public class CMISParser extends Parser { 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\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:616:86: ( NOT )? + // 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()); @@ -3889,7 +3889,7 @@ public class CMISParser extends Parser { }; // $ANTLR start "inValueList" - // W:\\alfresco\\BRANCHES\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:619:1: inValueList : literalOrParameterName ( COMMA literalOrParameterName )* -> ^( LIST ( literalOrParameterName )+ ) ; + // 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); @@ -3906,8 +3906,8 @@ public class CMISParser extends Parser { RewriteRuleTokenStream stream_COMMA=new RewriteRuleTokenStream(adaptor,"token COMMA"); RewriteRuleSubtreeStream stream_literalOrParameterName=new RewriteRuleSubtreeStream(adaptor,"rule literalOrParameterName"); try { - // W:\\alfresco\\BRANCHES\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:620:9: ( literalOrParameterName ( COMMA literalOrParameterName )* -> ^( LIST ( literalOrParameterName )+ ) ) - // W:\\alfresco\\BRANCHES\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:621:9: literalOrParameterName ( COMMA literalOrParameterName )* + // 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(); @@ -3915,7 +3915,7 @@ public class CMISParser extends Parser { state._fsp--; if (state.failed) return retval; if ( state.backtracking==0 ) stream_literalOrParameterName.add(literalOrParameterName98.getTree()); - // W:\\alfresco\\BRANCHES\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:621:32: ( COMMA literalOrParameterName )* + // 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; @@ -3928,7 +3928,7 @@ public class CMISParser extends Parser { switch (alt32) { case 1 : - // W:\\alfresco\\BRANCHES\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:621:33: COMMA literalOrParameterName + // 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); @@ -3964,7 +3964,7 @@ public class CMISParser extends Parser { root_0 = (Object)adaptor.nil(); // 622:17: -> ^( LIST ( literalOrParameterName )+ ) { - // W:\\alfresco\\BRANCHES\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:623:25: ^( 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); @@ -4011,7 +4011,7 @@ public class CMISParser extends Parser { }; // $ANTLR start "likePredicate" - // W:\\alfresco\\BRANCHES\\V3.3\\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 )? ) ; + // 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); @@ -4032,8 +4032,8 @@ public class CMISParser extends Parser { RewriteRuleSubtreeStream stream_columnReference=new RewriteRuleSubtreeStream(adaptor,"rule columnReference"); RewriteRuleSubtreeStream stream_characterStringLiteral=new RewriteRuleSubtreeStream(adaptor,"rule characterStringLiteral"); try { - // W:\\alfresco\\BRANCHES\\V3.3\\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\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:628:9: columnReference ( NOT )? LIKE characterStringLiteral + // 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(); @@ -4041,7 +4041,7 @@ public class CMISParser extends Parser { state._fsp--; if (state.failed) return retval; if ( state.backtracking==0 ) stream_columnReference.add(columnReference101.getTree()); - // W:\\alfresco\\BRANCHES\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:628:25: ( NOT )? + // 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); @@ -4050,7 +4050,7 @@ public class CMISParser extends Parser { } switch (alt33) { case 1 : - // W:\\alfresco\\BRANCHES\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:628:25: NOT + // 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); @@ -4073,7 +4073,7 @@ public class CMISParser extends Parser { // AST REWRITE - // elements: NOT, columnReference, characterStringLiteral + // elements: characterStringLiteral, NOT, columnReference // token labels: // rule labels: retval // token list labels: @@ -4086,14 +4086,14 @@ public class CMISParser extends Parser { root_0 = (Object)adaptor.nil(); // 629:17: -> ^( PRED_LIKE columnReference characterStringLiteral ( NOT )? ) { - // W:\\alfresco\\BRANCHES\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:630:25: ^( 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\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:630:76: ( NOT )? + // 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()); @@ -4133,7 +4133,7 @@ public class CMISParser extends Parser { }; // $ANTLR start "nullPredicate" - // W:\\alfresco\\BRANCHES\\V3.3\\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 ) ); + // 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); @@ -4160,12 +4160,12 @@ public class CMISParser extends Parser { RewriteRuleTokenStream stream_NULL=new RewriteRuleTokenStream(adaptor,"token NULL"); RewriteRuleSubtreeStream stream_columnReference=new RewriteRuleSubtreeStream(adaptor,"rule columnReference"); try { - // W:\\alfresco\\BRANCHES\\V3.3\\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 ) ) + // 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\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:635:9: columnReference IS NULL + // 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(); @@ -4195,7 +4195,7 @@ public class CMISParser extends Parser { root_0 = (Object)adaptor.nil(); // 636:17: -> ^( PRED_EXISTS columnReference NOT ) { - // W:\\alfresco\\BRANCHES\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:637:25: ^( 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); @@ -4212,7 +4212,7 @@ public class CMISParser extends Parser { } break; case 2 : - // W:\\alfresco\\BRANCHES\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:638:11: columnReference IS NOT NULL + // 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(); @@ -4245,7 +4245,7 @@ public class CMISParser extends Parser { root_0 = (Object)adaptor.nil(); // 639:17: -> ^( PRED_EXISTS columnReference ) { - // W:\\alfresco\\BRANCHES\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:640:25: ^( 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); @@ -4287,7 +4287,7 @@ public class CMISParser extends Parser { }; // $ANTLR start "quantifiedComparisonPredicate" - // W:\\alfresco\\BRANCHES\\V3.3\\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 ) ; + // 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); @@ -4308,8 +4308,8 @@ public class CMISParser extends Parser { RewriteRuleSubtreeStream stream_compOp=new RewriteRuleSubtreeStream(adaptor,"rule compOp"); RewriteRuleSubtreeStream stream_literalOrParameterName=new RewriteRuleSubtreeStream(adaptor,"rule literalOrParameterName"); try { - // W:\\alfresco\\BRANCHES\\V3.3\\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\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:645:9: literalOrParameterName compOp ANY columnReference + // 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(); @@ -4335,7 +4335,7 @@ public class CMISParser extends Parser { // AST REWRITE - // elements: columnReference, compOp, ANY, literalOrParameterName + // elements: literalOrParameterName, columnReference, ANY, compOp // token labels: // rule labels: retval // token list labels: @@ -4348,7 +4348,7 @@ public class CMISParser extends Parser { root_0 = (Object)adaptor.nil(); // 646:17: -> ^( PRED_COMPARISON ANY literalOrParameterName compOp columnReference ) { - // W:\\alfresco\\BRANCHES\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:647:25: ^( 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); @@ -4391,7 +4391,7 @@ public class CMISParser extends Parser { }; // $ANTLR start "quantifiedInPredicate" - // W:\\alfresco\\BRANCHES\\V3.3\\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 )? ) ; + // 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); @@ -4421,8 +4421,8 @@ public class CMISParser extends Parser { RewriteRuleSubtreeStream stream_columnReference=new RewriteRuleSubtreeStream(adaptor,"rule columnReference"); RewriteRuleSubtreeStream stream_inValueList=new RewriteRuleSubtreeStream(adaptor,"rule inValueList"); try { - // W:\\alfresco\\BRANCHES\\V3.3\\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\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:652:9: ANY columnReference ( NOT )? IN LPAREN inValueList RPAREN + // 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); @@ -4433,7 +4433,7 @@ public class CMISParser extends Parser { state._fsp--; if (state.failed) return retval; if ( state.backtracking==0 ) stream_columnReference.add(columnReference117.getTree()); - // W:\\alfresco\\BRANCHES\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:652:29: ( NOT )? + // 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); @@ -4442,7 +4442,7 @@ public class CMISParser extends Parser { } switch (alt35) { case 1 : - // W:\\alfresco\\BRANCHES\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:652:29: NOT + // 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); @@ -4471,7 +4471,7 @@ public class CMISParser extends Parser { // AST REWRITE - // elements: NOT, inValueList, ANY, columnReference + // elements: NOT, inValueList, columnReference, ANY // token labels: // rule labels: retval // token list labels: @@ -4484,7 +4484,7 @@ public class CMISParser extends Parser { root_0 = (Object)adaptor.nil(); // 653:17: -> ^( PRED_IN ANY columnReference inValueList ( NOT )? ) { - // W:\\alfresco\\BRANCHES\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:654:25: ^( 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); @@ -4492,7 +4492,7 @@ public class CMISParser extends Parser { adaptor.addChild(root_1, stream_ANY.nextNode()); adaptor.addChild(root_1, stream_columnReference.nextTree()); adaptor.addChild(root_1, stream_inValueList.nextTree()); - // W:\\alfresco\\BRANCHES\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:654:67: ( NOT )? + // 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()); @@ -4532,7 +4532,7 @@ public class CMISParser extends Parser { }; // $ANTLR start "textSearchPredicate" - // W:\\alfresco\\BRANCHES\\V3.3\\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 )? ) ; + // 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); @@ -4559,8 +4559,8 @@ public class CMISParser extends Parser { RewriteRuleSubtreeStream stream_qualifier=new RewriteRuleSubtreeStream(adaptor,"rule qualifier"); RewriteRuleSubtreeStream stream_textSearchExpression=new RewriteRuleSubtreeStream(adaptor,"rule textSearchExpression"); try { - // W:\\alfresco\\BRANCHES\\V3.3\\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\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:659:9: CONTAINS LPAREN ( qualifier COMMA )? textSearchExpression RPAREN + // 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); @@ -4568,7 +4568,7 @@ public class CMISParser extends Parser { 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\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:659:25: ( qualifier COMMA )? + // 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); @@ -4580,7 +4580,7 @@ public class CMISParser extends Parser { } switch (alt36) { case 1 : - // W:\\alfresco\\BRANCHES\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:659:26: qualifier COMMA + // 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(); @@ -4622,13 +4622,13 @@ public class CMISParser extends Parser { root_0 = (Object)adaptor.nil(); // 660:17: -> ^( PRED_FTS textSearchExpression ( qualifier )? ) { - // W:\\alfresco\\BRANCHES\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:661:25: ^( 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\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:661:57: ( qualifier )? + // 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()); @@ -4668,7 +4668,7 @@ public class CMISParser extends Parser { }; // $ANTLR start "folderPredicate" - // W:\\alfresco\\BRANCHES\\V3.3\\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 ) ); + // 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); @@ -4688,7 +4688,7 @@ public class CMISParser extends Parser { RewriteRuleTokenStream stream_IN_FOLDER=new RewriteRuleTokenStream(adaptor,"token IN_FOLDER"); RewriteRuleSubtreeStream stream_folderPredicateArgs=new RewriteRuleSubtreeStream(adaptor,"rule folderPredicateArgs"); try { - // W:\\alfresco\\BRANCHES\\V3.3\\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 ) ) + // 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); @@ -4707,7 +4707,7 @@ public class CMISParser extends Parser { } switch (alt37) { case 1 : - // W:\\alfresco\\BRANCHES\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:666:9: IN_FOLDER folderPredicateArgs + // 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); @@ -4734,7 +4734,7 @@ public class CMISParser extends Parser { root_0 = (Object)adaptor.nil(); // 667:17: -> ^( PRED_CHILD folderPredicateArgs ) { - // W:\\alfresco\\BRANCHES\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:668:25: ^( 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); @@ -4750,7 +4750,7 @@ public class CMISParser extends Parser { } break; case 2 : - // W:\\alfresco\\BRANCHES\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:669:11: IN_TREE folderPredicateArgs + // 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); @@ -4777,7 +4777,7 @@ public class CMISParser extends Parser { root_0 = (Object)adaptor.nil(); // 670:17: -> ^( PRED_DESCENDANT folderPredicateArgs ) { - // W:\\alfresco\\BRANCHES\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:671:25: ^( 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); @@ -4819,7 +4819,7 @@ public class CMISParser extends Parser { }; // $ANTLR start "folderPredicateArgs" - // W:\\alfresco\\BRANCHES\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:674:1: folderPredicateArgs : 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: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); @@ -4843,13 +4843,13 @@ public class CMISParser extends Parser { RewriteRuleSubtreeStream stream_qualifier=new RewriteRuleSubtreeStream(adaptor,"rule qualifier"); RewriteRuleSubtreeStream stream_folderId=new RewriteRuleSubtreeStream(adaptor,"rule folderId"); try { - // W:\\alfresco\\BRANCHES\\V3.3\\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\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:676:9: LPAREN ( qualifier COMMA )? folderId RPAREN + // 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\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:676:16: ( qualifier COMMA )? + // 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); @@ -4861,7 +4861,7 @@ public class CMISParser extends Parser { } switch (alt38) { case 1 : - // W:\\alfresco\\BRANCHES\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:676:17: qualifier COMMA + // 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(); @@ -4890,7 +4890,7 @@ public class CMISParser extends Parser { // AST REWRITE - // elements: qualifier, folderId + // elements: folderId, qualifier // token labels: // rule labels: retval // token list labels: @@ -4904,7 +4904,7 @@ public class CMISParser extends Parser { // 677:17: -> folderId ( qualifier )? { adaptor.addChild(root_0, stream_folderId.nextTree()); - // W:\\alfresco\\BRANCHES\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:677:29: ( qualifier )? + // 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()); @@ -4941,7 +4941,7 @@ public class CMISParser extends Parser { }; // $ANTLR start "orderByClause" - // W:\\alfresco\\BRANCHES\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:680:1: orderByClause : 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: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); @@ -4967,8 +4967,8 @@ public class CMISParser extends Parser { paraphrases.push("in order by"); try { - // W:\\alfresco\\BRANCHES\\V3.3\\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\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:690:9: ORDER BY sortSpecification ( COMMA sortSpecification )* + // 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); @@ -4982,7 +4982,7 @@ public class CMISParser extends Parser { state._fsp--; if (state.failed) return retval; if ( state.backtracking==0 ) stream_sortSpecification.add(sortSpecification140.getTree()); - // W:\\alfresco\\BRANCHES\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:690:36: ( COMMA sortSpecification )* + // 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; @@ -4995,7 +4995,7 @@ public class CMISParser extends Parser { switch (alt39) { case 1 : - // W:\\alfresco\\BRANCHES\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:690:37: COMMA sortSpecification + // 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); @@ -5018,7 +5018,7 @@ public class CMISParser extends Parser { // AST REWRITE - // elements: ORDER, sortSpecification + // elements: sortSpecification, ORDER // token labels: // rule labels: retval // token list labels: @@ -5031,7 +5031,7 @@ public class CMISParser extends Parser { root_0 = (Object)adaptor.nil(); // 691:17: -> ^( ORDER ( sortSpecification )+ ) { - // W:\\alfresco\\BRANCHES\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:692:25: ^( 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); @@ -5083,7 +5083,7 @@ public class CMISParser extends Parser { }; // $ANTLR start "sortSpecification" - // W:\\alfresco\\BRANCHES\\V3.3\\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) ); + // 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); @@ -5101,12 +5101,12 @@ public class CMISParser extends Parser { RewriteRuleTokenStream stream_DESC=new RewriteRuleTokenStream(adaptor,"token DESC"); RewriteRuleSubtreeStream stream_columnReference=new RewriteRuleSubtreeStream(adaptor,"rule columnReference"); try { - // W:\\alfresco\\BRANCHES\\V3.3\\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) ) + // 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\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:697:9: columnReference + // 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(); @@ -5130,7 +5130,7 @@ public class CMISParser extends Parser { root_0 = (Object)adaptor.nil(); // 698:17: -> ^( SORT_SPECIFICATION columnReference ASC ) { - // W:\\alfresco\\BRANCHES\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:699:25: ^( 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); @@ -5147,7 +5147,7 @@ public class CMISParser extends Parser { } break; case 2 : - // W:\\alfresco\\BRANCHES\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:700:11: columnReference (by= ASC | by= DESC ) + // 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(); @@ -5155,7 +5155,7 @@ public class CMISParser extends Parser { state._fsp--; if (state.failed) return retval; if ( state.backtracking==0 ) stream_columnReference.add(columnReference144.getTree()); - // W:\\alfresco\\BRANCHES\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:701:9: (by= ASC | by= DESC ) + // 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); @@ -5174,7 +5174,7 @@ public class CMISParser extends Parser { } switch (alt40) { case 1 : - // W:\\alfresco\\BRANCHES\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:702:17: by= ASC + // 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); @@ -5183,7 +5183,7 @@ public class CMISParser extends Parser { } break; case 2 : - // W:\\alfresco\\BRANCHES\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:703:19: by= DESC + // 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); @@ -5211,7 +5211,7 @@ public class CMISParser extends Parser { root_0 = (Object)adaptor.nil(); // 705:17: -> ^( SORT_SPECIFICATION columnReference $by) { - // W:\\alfresco\\BRANCHES\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:706:25: ^( 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); @@ -5254,7 +5254,7 @@ public class CMISParser extends Parser { }; // $ANTLR start "correlationName" - // W:\\alfresco\\BRANCHES\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:709:1: correlationName : identifier ; + // 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); @@ -5266,8 +5266,8 @@ public class CMISParser extends Parser { try { - // W:\\alfresco\\BRANCHES\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:710:9: ( identifier ) - // W:\\alfresco\\BRANCHES\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:711:9: identifier + // 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(); @@ -5305,7 +5305,7 @@ public class CMISParser extends Parser { }; // $ANTLR start "tableName" - // W:\\alfresco\\BRANCHES\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:719:1: tableName : identifier -> identifier ; + // 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); @@ -5317,8 +5317,8 @@ public class CMISParser extends Parser { RewriteRuleSubtreeStream stream_identifier=new RewriteRuleSubtreeStream(adaptor,"rule identifier"); try { - // W:\\alfresco\\BRANCHES\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:720:9: ( identifier -> identifier ) - // W:\\alfresco\\BRANCHES\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:721:9: identifier + // 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(); @@ -5374,7 +5374,7 @@ public class CMISParser extends Parser { }; // $ANTLR start "columnName" - // W:\\alfresco\\BRANCHES\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:725:1: columnName : identifier -> identifier ; + // 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); @@ -5386,8 +5386,8 @@ public class CMISParser extends Parser { RewriteRuleSubtreeStream stream_identifier=new RewriteRuleSubtreeStream(adaptor,"rule identifier"); try { - // W:\\alfresco\\BRANCHES\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:726:9: ( identifier -> identifier ) - // W:\\alfresco\\BRANCHES\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:727:9: identifier + // 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(); @@ -5443,7 +5443,7 @@ public class CMISParser extends Parser { }; // $ANTLR start "parameterName" - // W:\\alfresco\\BRANCHES\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:731:1: parameterName : COLON identifier -> ^( PARAMETER identifier ) ; + // 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); @@ -5458,8 +5458,8 @@ public class CMISParser extends Parser { RewriteRuleTokenStream stream_COLON=new RewriteRuleTokenStream(adaptor,"token COLON"); RewriteRuleSubtreeStream stream_identifier=new RewriteRuleSubtreeStream(adaptor,"rule identifier"); try { - // W:\\alfresco\\BRANCHES\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:732:9: ( COLON identifier -> ^( PARAMETER identifier ) ) - // W:\\alfresco\\BRANCHES\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:733:9: COLON identifier + // 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); @@ -5486,7 +5486,7 @@ public class CMISParser extends Parser { root_0 = (Object)adaptor.nil(); // 734:17: -> ^( PARAMETER identifier ) { - // W:\\alfresco\\BRANCHES\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:735:25: ^( 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); @@ -5526,7 +5526,7 @@ public class CMISParser extends Parser { }; // $ANTLR start "folderId" - // W:\\alfresco\\BRANCHES\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:738:1: folderId : characterStringLiteral -> characterStringLiteral ; + // 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); @@ -5538,8 +5538,8 @@ public class CMISParser extends Parser { RewriteRuleSubtreeStream stream_characterStringLiteral=new RewriteRuleSubtreeStream(adaptor,"rule characterStringLiteral"); try { - // W:\\alfresco\\BRANCHES\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:739:9: ( characterStringLiteral -> characterStringLiteral ) - // W:\\alfresco\\BRANCHES\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:740:9: characterStringLiteral + // 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(); @@ -5595,7 +5595,7 @@ public class CMISParser extends Parser { }; // $ANTLR start "textSearchExpression" - // W:\\alfresco\\BRANCHES\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:744:1: textSearchExpression : QUOTED_STRING ; + // 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); @@ -5607,8 +5607,8 @@ public class CMISParser extends Parser { Object QUOTED_STRING151_tree=null; try { - // W:\\alfresco\\BRANCHES\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:745:9: ( QUOTED_STRING ) - // W:\\alfresco\\BRANCHES\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:746:9: QUOTED_STRING + // 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(); @@ -5645,7 +5645,7 @@ public class CMISParser extends Parser { }; // $ANTLR start "identifier" - // W:\\alfresco\\BRANCHES\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:749:1: identifier : ( ID -> ID | {...}? => DOUBLE_QUOTE keyWordOrId DOUBLE_QUOTE -> ^( keyWordOrId ) ); + // 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); @@ -5665,7 +5665,7 @@ public class CMISParser extends Parser { RewriteRuleTokenStream stream_DOUBLE_QUOTE=new RewriteRuleTokenStream(adaptor,"token DOUBLE_QUOTE"); RewriteRuleSubtreeStream stream_keyWordOrId=new RewriteRuleSubtreeStream(adaptor,"rule keyWordOrId"); try { - // W:\\alfresco\\BRANCHES\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:750:9: ( ID -> ID | {...}? => DOUBLE_QUOTE keyWordOrId DOUBLE_QUOTE -> ^( keyWordOrId ) ) + // 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); @@ -5684,7 +5684,7 @@ public class CMISParser extends Parser { } switch (alt42) { case 1 : - // W:\\alfresco\\BRANCHES\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:751:9: ID + // 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); @@ -5713,7 +5713,7 @@ public class CMISParser extends Parser { } break; case 2 : - // W:\\alfresco\\BRANCHES\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:753:11: {...}? => DOUBLE_QUOTE keyWordOrId DOUBLE_QUOTE + // 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;} @@ -5747,7 +5747,7 @@ public class CMISParser extends Parser { root_0 = (Object)adaptor.nil(); // 754:17: -> ^( keyWordOrId ) { - // W:\\alfresco\\BRANCHES\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:755:25: ^( 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); @@ -5787,7 +5787,7 @@ public class CMISParser extends Parser { }; // $ANTLR start "signedNumericLiteral" - // W:\\alfresco\\BRANCHES\\V3.3\\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 ); + // 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); @@ -5802,7 +5802,7 @@ public class CMISParser extends Parser { RewriteRuleTokenStream stream_FLOATING_POINT_LITERAL=new RewriteRuleTokenStream(adaptor,"token FLOATING_POINT_LITERAL"); RewriteRuleSubtreeStream stream_integerLiteral=new RewriteRuleSubtreeStream(adaptor,"rule integerLiteral"); try { - // W:\\alfresco\\BRANCHES\\V3.3\\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 ) + // 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); @@ -5821,7 +5821,7 @@ public class CMISParser extends Parser { } switch (alt43) { case 1 : - // W:\\alfresco\\BRANCHES\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:760:9: FLOATING_POINT_LITERAL + // 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); @@ -5842,7 +5842,7 @@ public class CMISParser extends Parser { root_0 = (Object)adaptor.nil(); // 761:17: -> ^( NUMERIC_LITERAL FLOATING_POINT_LITERAL ) { - // W:\\alfresco\\BRANCHES\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:762:25: ^( 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); @@ -5858,7 +5858,7 @@ public class CMISParser extends Parser { } break; case 2 : - // W:\\alfresco\\BRANCHES\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:763:11: integerLiteral + // 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(); @@ -5916,7 +5916,7 @@ public class CMISParser extends Parser { }; // $ANTLR start "integerLiteral" - // W:\\alfresco\\BRANCHES\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:767:1: integerLiteral : 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: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); @@ -5929,8 +5929,8 @@ public class CMISParser extends Parser { RewriteRuleTokenStream stream_DECIMAL_INTEGER_LITERAL=new RewriteRuleTokenStream(adaptor,"token DECIMAL_INTEGER_LITERAL"); try { - // W:\\alfresco\\BRANCHES\\V3.3\\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\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:769:9: DECIMAL_INTEGER_LITERAL + // 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); @@ -5951,7 +5951,7 @@ public class CMISParser extends Parser { root_0 = (Object)adaptor.nil(); // 770:17: -> ^( NUMERIC_LITERAL DECIMAL_INTEGER_LITERAL ) { - // W:\\alfresco\\BRANCHES\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:771:25: ^( 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); @@ -5991,7 +5991,7 @@ public class CMISParser extends Parser { }; // $ANTLR start "booleanLiteral" - // W:\\alfresco\\BRANCHES\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:774:1: booleanLiteral : ( TRUE -> ^( BOOLEAN_LITERAL TRUE ) | FALSE -> ^( BOOLEAN_LITERAL FALSE ) ); + // 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); @@ -6007,7 +6007,7 @@ public class CMISParser extends Parser { RewriteRuleTokenStream stream_TRUE=new RewriteRuleTokenStream(adaptor,"token TRUE"); try { - // W:\\alfresco\\BRANCHES\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:775:9: ( TRUE -> ^( BOOLEAN_LITERAL TRUE ) | FALSE -> ^( BOOLEAN_LITERAL FALSE ) ) + // 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); @@ -6026,7 +6026,7 @@ public class CMISParser extends Parser { } switch (alt44) { case 1 : - // W:\\alfresco\\BRANCHES\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:776:9: TRUE + // 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); @@ -6047,7 +6047,7 @@ public class CMISParser extends Parser { root_0 = (Object)adaptor.nil(); // 777:17: -> ^( BOOLEAN_LITERAL TRUE ) { - // W:\\alfresco\\BRANCHES\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:778:25: ^( 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); @@ -6063,7 +6063,7 @@ public class CMISParser extends Parser { } break; case 2 : - // W:\\alfresco\\BRANCHES\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:779:11: FALSE + // 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); @@ -6084,7 +6084,7 @@ public class CMISParser extends Parser { root_0 = (Object)adaptor.nil(); // 780:17: -> ^( BOOLEAN_LITERAL FALSE ) { - // W:\\alfresco\\BRANCHES\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:781:25: ^( 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); @@ -6126,7 +6126,7 @@ public class CMISParser extends Parser { }; // $ANTLR start "datetimeLiteral" - // W:\\alfresco\\BRANCHES\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:784:1: datetimeLiteral : 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: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); @@ -6142,8 +6142,8 @@ public class CMISParser extends Parser { RewriteRuleTokenStream stream_TIMESTAMP=new RewriteRuleTokenStream(adaptor,"token TIMESTAMP"); try { - // W:\\alfresco\\BRANCHES\\V3.3\\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\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:786:9: TIMESTAMP QUOTED_STRING + // 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); @@ -6167,7 +6167,7 @@ public class CMISParser extends Parser { root_0 = (Object)adaptor.nil(); // 787:17: -> ^( DATETIME_LITERAL QUOTED_STRING ) { - // W:\\alfresco\\BRANCHES\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:788:25: ^( 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); @@ -6207,7 +6207,7 @@ public class CMISParser extends Parser { }; // $ANTLR start "characterStringLiteral" - // W:\\alfresco\\BRANCHES\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:791:1: characterStringLiteral : QUOTED_STRING -> ^( STRING_LITERAL QUOTED_STRING ) ; + // 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); @@ -6220,8 +6220,8 @@ public class CMISParser extends Parser { RewriteRuleTokenStream stream_QUOTED_STRING=new RewriteRuleTokenStream(adaptor,"token QUOTED_STRING"); try { - // W:\\alfresco\\BRANCHES\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:792:9: ( QUOTED_STRING -> ^( STRING_LITERAL QUOTED_STRING ) ) - // W:\\alfresco\\BRANCHES\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:793:9: QUOTED_STRING + // 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); @@ -6242,7 +6242,7 @@ public class CMISParser extends Parser { root_0 = (Object)adaptor.nil(); // 794:17: -> ^( STRING_LITERAL QUOTED_STRING ) { - // W:\\alfresco\\BRANCHES\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:795:25: ^( 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); @@ -6282,7 +6282,7 @@ public class CMISParser extends Parser { }; // $ANTLR start "keyWord" - // W:\\alfresco\\BRANCHES\\V3.3\\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 ); + // 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); @@ -6348,7 +6348,7 @@ public class CMISParser extends Parser { Object FALSE190_tree=null; try { - // W:\\alfresco\\BRANCHES\\V3.3\\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 ) + // 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: @@ -6501,7 +6501,7 @@ public class CMISParser extends Parser { switch (alt45) { case 1 : - // W:\\alfresco\\BRANCHES\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:800:9: SELECT + // 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(); @@ -6514,7 +6514,7 @@ public class CMISParser extends Parser { } break; case 2 : - // W:\\alfresco\\BRANCHES\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:801:11: AS + // 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(); @@ -6527,7 +6527,7 @@ public class CMISParser extends Parser { } break; case 3 : - // W:\\alfresco\\BRANCHES\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:802:11: FROM + // 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(); @@ -6540,7 +6540,7 @@ public class CMISParser extends Parser { } break; case 4 : - // W:\\alfresco\\BRANCHES\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:803:11: JOIN + // 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(); @@ -6553,7 +6553,7 @@ public class CMISParser extends Parser { } break; case 5 : - // W:\\alfresco\\BRANCHES\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:804:11: INNER + // 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(); @@ -6566,7 +6566,7 @@ public class CMISParser extends Parser { } break; case 6 : - // W:\\alfresco\\BRANCHES\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:805:11: LEFT + // 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(); @@ -6579,7 +6579,7 @@ public class CMISParser extends Parser { } break; case 7 : - // W:\\alfresco\\BRANCHES\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:806:11: OUTER + // 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(); @@ -6592,7 +6592,7 @@ public class CMISParser extends Parser { } break; case 8 : - // W:\\alfresco\\BRANCHES\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:807:11: ON + // 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(); @@ -6605,7 +6605,7 @@ public class CMISParser extends Parser { } break; case 9 : - // W:\\alfresco\\BRANCHES\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:808:11: WHERE + // 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(); @@ -6618,7 +6618,7 @@ public class CMISParser extends Parser { } break; case 10 : - // W:\\alfresco\\BRANCHES\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:809:11: OR + // 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(); @@ -6631,7 +6631,7 @@ public class CMISParser extends Parser { } break; case 11 : - // W:\\alfresco\\BRANCHES\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:810:11: AND + // 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(); @@ -6644,7 +6644,7 @@ public class CMISParser extends Parser { } break; case 12 : - // W:\\alfresco\\BRANCHES\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:811:11: NOT + // 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(); @@ -6657,7 +6657,7 @@ public class CMISParser extends Parser { } break; case 13 : - // W:\\alfresco\\BRANCHES\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:812:11: IN + // 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(); @@ -6670,7 +6670,7 @@ public class CMISParser extends Parser { } break; case 14 : - // W:\\alfresco\\BRANCHES\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:813:11: LIKE + // 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(); @@ -6683,7 +6683,7 @@ public class CMISParser extends Parser { } break; case 15 : - // W:\\alfresco\\BRANCHES\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:814:11: IS + // 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(); @@ -6696,7 +6696,7 @@ public class CMISParser extends Parser { } break; case 16 : - // W:\\alfresco\\BRANCHES\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:815:11: NULL + // 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(); @@ -6709,7 +6709,7 @@ public class CMISParser extends Parser { } break; case 17 : - // W:\\alfresco\\BRANCHES\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:816:11: ANY + // 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(); @@ -6722,7 +6722,7 @@ public class CMISParser extends Parser { } break; case 18 : - // W:\\alfresco\\BRANCHES\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:817:11: CONTAINS + // 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(); @@ -6735,7 +6735,7 @@ public class CMISParser extends Parser { } break; case 19 : - // W:\\alfresco\\BRANCHES\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:818:11: IN_FOLDER + // 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(); @@ -6748,7 +6748,7 @@ public class CMISParser extends Parser { } break; case 20 : - // W:\\alfresco\\BRANCHES\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:819:11: IN_TREE + // 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(); @@ -6761,7 +6761,7 @@ public class CMISParser extends Parser { } break; case 21 : - // W:\\alfresco\\BRANCHES\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:820:11: ORDER + // 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(); @@ -6774,7 +6774,7 @@ public class CMISParser extends Parser { } break; case 22 : - // W:\\alfresco\\BRANCHES\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:821:11: BY + // 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(); @@ -6787,7 +6787,7 @@ public class CMISParser extends Parser { } break; case 23 : - // W:\\alfresco\\BRANCHES\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:822:11: ASC + // 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(); @@ -6800,7 +6800,7 @@ public class CMISParser extends Parser { } break; case 24 : - // W:\\alfresco\\BRANCHES\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:823:11: DESC + // 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(); @@ -6813,7 +6813,7 @@ public class CMISParser extends Parser { } break; case 25 : - // W:\\alfresco\\BRANCHES\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:824:11: TIMESTAMP + // 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(); @@ -6826,7 +6826,7 @@ public class CMISParser extends Parser { } break; case 26 : - // W:\\alfresco\\BRANCHES\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:825:11: TRUE + // 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(); @@ -6839,7 +6839,7 @@ public class CMISParser extends Parser { } break; case 27 : - // W:\\alfresco\\BRANCHES\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:826:11: FALSE + // 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(); @@ -6852,7 +6852,7 @@ public class CMISParser extends Parser { } break; case 28 : - // W:\\alfresco\\BRANCHES\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:827:11: cmisFunction + // 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(); @@ -6892,7 +6892,7 @@ public class CMISParser extends Parser { }; // $ANTLR start "cmisFunction" - // W:\\alfresco\\BRANCHES\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:830:1: cmisFunction : SCORE -> SCORE ; + // 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); @@ -6905,8 +6905,8 @@ public class CMISParser extends Parser { RewriteRuleTokenStream stream_SCORE=new RewriteRuleTokenStream(adaptor,"token SCORE"); try { - // W:\\alfresco\\BRANCHES\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:831:9: ( SCORE -> SCORE ) - // W:\\alfresco\\BRANCHES\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:832:9: SCORE + // 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); @@ -6959,7 +6959,7 @@ public class CMISParser extends Parser { }; // $ANTLR start "keyWordOrId" - // W:\\alfresco\\BRANCHES\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:836:1: keyWordOrId : ( keyWord -> keyWord | ID -> ID ); + // 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); @@ -6974,7 +6974,7 @@ public class CMISParser extends Parser { RewriteRuleTokenStream stream_ID=new RewriteRuleTokenStream(adaptor,"token ID"); RewriteRuleSubtreeStream stream_keyWord=new RewriteRuleSubtreeStream(adaptor,"rule keyWord"); try { - // W:\\alfresco\\BRANCHES\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:837:9: ( keyWord -> keyWord | ID -> ID ) + // 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); @@ -6993,7 +6993,7 @@ public class CMISParser extends Parser { } switch (alt46) { case 1 : - // W:\\alfresco\\BRANCHES\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:838:9: keyWord + // 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(); @@ -7025,7 +7025,7 @@ public class CMISParser extends Parser { } break; case 2 : - // W:\\alfresco\\BRANCHES\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:840:11: ID + // 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); @@ -7076,8 +7076,8 @@ public class CMISParser extends Parser { // $ANTLR start synpred1_CMIS public final void synpred1_CMIS_fragment() throws RecognitionException { - // W:\\alfresco\\BRANCHES\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:388:9: ( tableName ) - // W:\\alfresco\\BRANCHES\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:388:10: tableName + // 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(); @@ -7091,8 +7091,8 @@ public class CMISParser extends Parser { // $ANTLR start synpred2_CMIS public final void synpred2_CMIS_fragment() throws RecognitionException { - // W:\\alfresco\\BRANCHES\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:484:9: ( LPAREN singleTable ( joinedTable )+ RPAREN ) - // W:\\alfresco\\BRANCHES\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:484:10: LPAREN singleTable ( joinedTable )+ RPAREN + // 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); @@ -7100,7 +7100,7 @@ public class CMISParser extends Parser { state._fsp--; if (state.failed) return ; - // W:\\alfresco\\BRANCHES\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:484:29: ( joinedTable )+ + // 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 { @@ -7114,7 +7114,7 @@ public class CMISParser extends Parser { switch (alt47) { case 1 : - // W:\\alfresco\\BRANCHES\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g:484:29: joinedTable + // 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(); @@ -7364,7 +7364,7 @@ public class CMISParser extends Parser { static final String DFA7_maxS = "\1\115\1\107\1\115\44\uffff\36\107\7\uffff"; static final String DFA7_acceptS = - "\3\uffff\34\1\1\2\7\1\36\uffff\1\1\1\2\5\1"; + "\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"+ @@ -7374,7 +7374,7 @@ public class CMISParser extends Parser { "\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\37\1\45\1\46\1\uffff\1\44\35\uffff\1\41\1\42", + "\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"+ @@ -7444,7 +7444,7 @@ public class CMISParser extends Parser { "\1\104", "\1\104", "\1\104", - "\1\112\1\107\1\106\1\105\2\uffff\1\113\35\uffff\1\110\1\111", + "\1\111\1\106\1\113\1\105\2\uffff\1\112\35\uffff\1\107\1\110", "", "", "", @@ -7722,7 +7722,7 @@ public class CMISParser extends Parser { int index7_1 = input.index(); input.rewind(); s = -1; - if ( (LA7_1==DOTSTAR) ) {s = 31;} + if ( (LA7_1==DOT) ) {s = 31;} else if ( (LA7_1==AS) ) {s = 32;} @@ -7734,9 +7734,9 @@ public class CMISParser extends Parser { else if ( (LA7_1==FROM) ) {s = 36;} - else if ( (LA7_1==DOT) ) {s = 37;} + else if ( (LA7_1==LPAREN) && ((strict == false))) {s = 37;} - else if ( (LA7_1==LPAREN) && ((strict == false))) {s = 38;} + else if ( (LA7_1==DOTSTAR) ) {s = 38;} input.seek(index7_1); @@ -7777,17 +7777,17 @@ public class CMISParser extends Parser { s = -1; if ( (LA7_68==DOT) && ((strict == false))) {s = 69;} - else if ( (LA7_68==DOTSTAR) && ((strict == false))) {s = 70;} + else if ( (LA7_68==AS) && ((strict == false))) {s = 70;} - else if ( (LA7_68==AS) && ((strict == false))) {s = 71;} + else if ( (LA7_68==ID) && ((strict == false))) {s = 71;} - else if ( (LA7_68==ID) && ((strict == false))) {s = 72;} + else if ( (LA7_68==DOUBLE_QUOTE) && ((strict == false))) {s = 72;} - else if ( (LA7_68==DOUBLE_QUOTE) && ((strict == false))) {s = 73;} + else if ( (LA7_68==COMMA) && ((strict == false))) {s = 73;} - else if ( (LA7_68==COMMA) && ((strict == false))) {s = 74;} + else if ( (LA7_68==FROM) && ((strict == false))) {s = 74;} - else if ( (LA7_68==FROM) && ((strict == false))) {s = 75;} + else if ( (LA7_68==DOTSTAR) && ((strict == false))) {s = 75;} input.seek(index7_68); @@ -8076,7 +8076,7 @@ public class CMISParser extends Parser { static final String DFA8_maxS = "\1\115\1\107\45\uffff"; static final String DFA8_acceptS = - "\2\uffff\1\1\35\2\7\1"; + "\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 = { @@ -8084,8 +8084,8 @@ public class CMISParser extends Parser { "\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\44\1\41\1\uffff\1\40\1\37\1\uffff\1\45\5\uffff\1\46\4\uffff"+ - "\5\46\16\uffff\1\42\1\43", + "\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", "", "", "", @@ -8168,21 +8168,21 @@ public class CMISParser extends Parser { int index8_1 = input.index(); input.rewind(); s = -1; - if ( (LA8_1==LPAREN) && ((strict == false))) {s = 31;} + if ( (LA8_1==DOT) ) {s = 31;} - else if ( (LA8_1==DOT) ) {s = 32;} + else if ( (LA8_1==AS) ) {s = 32;} - else if ( (LA8_1==AS) ) {s = 33;} + else if ( (LA8_1==ID) ) {s = 33;} - else if ( (LA8_1==ID) ) {s = 34;} + else if ( (LA8_1==DOUBLE_QUOTE) ) {s = 34;} - else if ( (LA8_1==DOUBLE_QUOTE) ) {s = 35;} + else if ( (LA8_1==COMMA) ) {s = 35;} - else if ( (LA8_1==COMMA) ) {s = 36;} + else if ( (LA8_1==FROM) ) {s = 36;} - else if ( (LA8_1==FROM) ) {s = 37;} + else if ( (LA8_1==EQUALS||(LA8_1>=NOTEQUALS && LA8_1<=GREATERTHANOREQUALS)) ) {s = 37;} - else if ( (LA8_1==EQUALS||(LA8_1>=NOTEQUALS && LA8_1<=GREATERTHANOREQUALS)) ) {s = 38;} + else if ( (LA8_1==LPAREN) && ((strict == false))) {s = 38;} input.seek(index8_1); @@ -8270,22 +8270,22 @@ public class CMISParser extends Parser { static final String DFA9_eotS = "\121\uffff"; static final String DFA9_eofS = - "\1\uffff\1\14\66\uffff\1\103\30\uffff"; + "\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\27\2\1\1\36\uffff\1\1\27\2"; + "\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\6\1\3\1\uffff\1\32\1\uffff\1\21\1\7\1\20\1\16\1\17\1\uffff"+ - "\1\15\1\10\1\12\1\27\1\26\1\22\5\11\1\23\1\24\1\25\5\uffff\1"+ - "\13\1\uffff\1\30\1\31\2\uffff\1\4\1\5", + "\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"+ @@ -9650,7 +9650,7 @@ public class CMISParser extends Parser { 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\12\2\1\1"; + "\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"+ @@ -9710,8 +9710,8 @@ public class CMISParser extends Parser { "\1\62", "\1\62", "\1\62", - "\1\75\1\uffff\1\63\34\uffff\1\74\1\70\1\64\1\65\1\66\1\67"+ - "\1\71\1\72\1\73", + "\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", "", "", "", @@ -9957,27 +9957,27 @@ public class CMISParser extends Parser { int index13_50 = input.index(); input.rewind(); s = -1; - if ( (LA13_50==RPAREN) && ((strict == false))) {s = 51;} + if ( (LA13_50==DOT) && ((strict == false))) {s = 51;} - else if ( (LA13_50==ID) && ((strict == false))) {s = 52;} + else if ( (LA13_50==RPAREN) && ((strict == false))) {s = 52;} - else if ( (LA13_50==DOUBLE_QUOTE) && ((strict == false))) {s = 53;} + else if ( (LA13_50==ID) && ((strict == false))) {s = 53;} - else if ( (LA13_50==FLOATING_POINT_LITERAL) && ((strict == false))) {s = 54;} + else if ( (LA13_50==DOUBLE_QUOTE) && ((strict == false))) {s = 54;} - else if ( (LA13_50==DECIMAL_INTEGER_LITERAL) && ((strict == false))) {s = 55;} + else if ( (LA13_50==FLOATING_POINT_LITERAL) && ((strict == false))) {s = 55;} - else if ( (LA13_50==QUOTED_STRING) && ((strict == false))) {s = 56;} + else if ( (LA13_50==DECIMAL_INTEGER_LITERAL) && ((strict == false))) {s = 56;} - else if ( (LA13_50==TRUE) && ((strict == false))) {s = 57;} + else if ( (LA13_50==QUOTED_STRING) && ((strict == false))) {s = 57;} - else if ( (LA13_50==FALSE) && ((strict == false))) {s = 58;} + else if ( (LA13_50==TRUE) && ((strict == false))) {s = 58;} - else if ( (LA13_50==TIMESTAMP) && ((strict == false))) {s = 59;} + else if ( (LA13_50==FALSE) && ((strict == false))) {s = 59;} - else if ( (LA13_50==COLON) && ((strict == false))) {s = 60;} + else if ( (LA13_50==TIMESTAMP) && ((strict == false))) {s = 60;} - else if ( (LA13_50==DOT) && ((strict == false))) {s = 61;} + else if ( (LA13_50==COLON) && ((strict == false))) {s = 61;} input.seek(index13_50); @@ -10974,18 +10974,18 @@ public class CMISParser extends Parser { static final String DFA26_eofS = "\u00db\uffff"; static final String DFA26_minS = - "\2\40\42\uffff\1\40\43\uffff\1\45\1\40\30\uffff\3\46\3\47\1\106"+ + "\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\42\uffff\1\115\43\uffff\1\114\1\115\30\uffff\1\105\5\114"+ + "\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\1\uffff\43\1\2\uffff\30\1\7\uffff\1\1\1\2\1\uffff"+ - "\5\1\11\2\1\1\36\uffff\1\1\101\uffff"; + "\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\43\uffff\1\7\43\uffff\1\15\32\uffff\1\12\1\13\1\4\1\5\1\3"+ + "\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 = { @@ -10993,10 +10993,44 @@ public class CMISParser extends Parser { "\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\50\2\uffff\1\51\2\uffff\1\44\1\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\1\106\1\105\1"+ - "\45\1\46\1\103\1\104\1\101\1\102\1\100\1\47", + "\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", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", "", "", "", @@ -11037,43 +11071,9 @@ public class CMISParser extends Parser { "\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\160\1\152\6\uffff\1\157\3\uffff\1\154\5\157\1\156"+ - "\1\155\1\172\11\uffff\1\171\1\165\1\161\1\162\1\163\1\164\1"+ - "\166\1\167\1\170", + "\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"+ @@ -11103,17 +11103,17 @@ public class CMISParser extends Parser { "", "", "", - "\1\160\36\uffff\1\u0098", - "\1\160\1\152\6\uffff\1\u0099\4\uffff\5\u0099\14\uffff\1\171"+ - "\1\165\1\161\1\162\1\163\1\164\1\166\1\167\1\170", - "\1\160\1\152\6\uffff\1\u0099\4\uffff\5\u0099\14\uffff\1\171"+ - "\1\165\1\161\1\162\1\163\1\164\1\166\1\167\1\170", - "\1\152\6\uffff\1\u0099\4\uffff\5\u0099\14\uffff\1\171\1\165"+ - "\1\161\1\162\1\163\1\164\1\166\1\167\1\170", - "\1\152\6\uffff\1\u0099\4\uffff\5\u0099\14\uffff\1\171\1\165"+ - "\1\161\1\162\1\163\1\164\1\166\1\167\1\170", - "\1\152\6\uffff\1\u0099\4\uffff\5\u0099\14\uffff\1\171\1\165"+ - "\1\161\1\162\1\163\1\164\1\166\1\167\1\170", + "\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", "", "", @@ -11162,27 +11162,27 @@ public class CMISParser extends Parser { "\1\u009e", "\1\u009e", "\1\u009e", - "\1\152\6\uffff\1\u0099\4\uffff\5\u0099\14\uffff\1\171\1\165"+ - "\1\161\1\162\1\163\1\164\1\166\1\167\1\170", + "\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\171\1\165"+ - "\1\161\1\162\1\163\1\164\1\166\1\167\1\170", + "\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\157\3\uffff\1\154\5\157\1\156\1\155\1\172"+ - "\11\uffff\1\171\1\165\1\161\1\162\1\163\1\164\1\166\1\167\1"+ - "\170", + "\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\157\3\uffff\1\154\5\157\1\156"+ - "\1\155\1\172\11\uffff\1\171\1\165\1\161\1\162\1\163\1\164\1"+ - "\166\1\167\1\170", + "\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", @@ -11241,11 +11241,11 @@ public class CMISParser extends Parser { "\1\u00da", "\1\u00da", "\1\u00da", - "\1\152\6\uffff\1\u0099\4\uffff\5\u0099\14\uffff\1\171\1\165"+ - "\1\161\1\162\1\163\1\164\1\166\1\167\1\170", - "\1\152\6\uffff\1\157\3\uffff\1\154\5\157\1\156\1\155\1\172"+ - "\11\uffff\1\171\1\165\1\161\1\162\1\163\1\164\1\166\1\167\1"+ - "\170" + "\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); @@ -11291,35 +11291,35 @@ public class CMISParser extends Parser { int index26_156 = input.index(); input.rewind(); s = -1; - if ( (LA26_156==EQUALS||(LA26_156>=NOTEQUALS && LA26_156<=GREATERTHANOREQUALS)) ) {s = 111;} + if ( (LA26_156==EQUALS||(LA26_156>=NOTEQUALS && LA26_156<=GREATERTHANOREQUALS)) ) {s = 108;} - else if ( (LA26_156==NOT) ) {s = 108;} + else if ( (LA26_156==NOT) ) {s = 110;} - else if ( (LA26_156==LIKE) ) {s = 109;} + 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 = 113;} + else if ( (LA26_156==ID) && ((strict == false))) {s = 114;} - else if ( (LA26_156==DOUBLE_QUOTE) && ((strict == false))) {s = 114;} + else if ( (LA26_156==DOUBLE_QUOTE) && ((strict == false))) {s = 115;} - else if ( (LA26_156==FLOATING_POINT_LITERAL) && ((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 = 116;} + else if ( (LA26_156==DECIMAL_INTEGER_LITERAL) && ((strict == false))) {s = 117;} - else if ( (LA26_156==QUOTED_STRING) && ((strict == false))) {s = 117;} + else if ( (LA26_156==QUOTED_STRING) && ((strict == false))) {s = 118;} - else if ( (LA26_156==TRUE) && ((strict == false))) {s = 118;} + else if ( (LA26_156==TRUE) && ((strict == false))) {s = 119;} - else if ( (LA26_156==FALSE) && ((strict == false))) {s = 119;} + else if ( (LA26_156==FALSE) && ((strict == false))) {s = 120;} - else if ( (LA26_156==TIMESTAMP) && ((strict == false))) {s = 120;} + else if ( (LA26_156==TIMESTAMP) && ((strict == false))) {s = 121;} - else if ( (LA26_156==COLON) && ((strict == false))) {s = 121;} - - else if ( (LA26_156==IN) ) {s = 110;} - - else if ( (LA26_156==IS) ) {s = 122;} + else if ( (LA26_156==COLON) && ((strict == false))) {s = 122;} input.seek(index26_156); @@ -11413,27 +11413,27 @@ public class CMISParser extends Parser { int index26_152 = input.index(); input.rewind(); s = -1; - if ( (LA26_152==RPAREN) && ((strict == false))) {s = 106;} + if ( (LA26_152==EQUALS||(LA26_152>=NOTEQUALS && LA26_152<=GREATERTHANOREQUALS)) ) {s = 153;} - else if ( (LA26_152==ID) && ((strict == false))) {s = 113;} + else if ( (LA26_152==RPAREN) && ((strict == false))) {s = 106;} - else if ( (LA26_152==DOUBLE_QUOTE) && ((strict == false))) {s = 114;} + else if ( (LA26_152==ID) && ((strict == false))) {s = 114;} - else if ( (LA26_152==FLOATING_POINT_LITERAL) && ((strict == false))) {s = 115;} + else if ( (LA26_152==DOUBLE_QUOTE) && ((strict == false))) {s = 115;} - else if ( (LA26_152==DECIMAL_INTEGER_LITERAL) && ((strict == false))) {s = 116;} + else if ( (LA26_152==FLOATING_POINT_LITERAL) && ((strict == false))) {s = 116;} - else if ( (LA26_152==QUOTED_STRING) && ((strict == false))) {s = 117;} + else if ( (LA26_152==DECIMAL_INTEGER_LITERAL) && ((strict == false))) {s = 117;} - else if ( (LA26_152==TRUE) && ((strict == false))) {s = 118;} + else if ( (LA26_152==QUOTED_STRING) && ((strict == false))) {s = 118;} - else if ( (LA26_152==FALSE) && ((strict == false))) {s = 119;} + else if ( (LA26_152==TRUE) && ((strict == false))) {s = 119;} - else if ( (LA26_152==TIMESTAMP) && ((strict == false))) {s = 120;} + else if ( (LA26_152==FALSE) && ((strict == false))) {s = 120;} - else if ( (LA26_152==COLON) && ((strict == false))) {s = 121;} + else if ( (LA26_152==TIMESTAMP) && ((strict == false))) {s = 121;} - else if ( (LA26_152==EQUALS||(LA26_152>=NOTEQUALS && LA26_152<=GREATERTHANOREQUALS)) ) {s = 153;} + else if ( (LA26_152==COLON) && ((strict == false))) {s = 122;} input.seek(index26_152); @@ -11446,27 +11446,27 @@ public class CMISParser extends Parser { int index26_103 = input.index(); input.rewind(); s = -1; - if ( (LA26_103==RPAREN) && ((strict == false))) {s = 106;} + if ( (LA26_103==EQUALS||(LA26_103>=NOTEQUALS && LA26_103<=GREATERTHANOREQUALS)) ) {s = 153;} - else if ( (LA26_103==ID) && ((strict == false))) {s = 113;} + else if ( (LA26_103==RPAREN) && ((strict == false))) {s = 106;} - else if ( (LA26_103==DOUBLE_QUOTE) && ((strict == false))) {s = 114;} + else if ( (LA26_103==ID) && ((strict == false))) {s = 114;} - else if ( (LA26_103==FLOATING_POINT_LITERAL) && ((strict == false))) {s = 115;} + else if ( (LA26_103==DOUBLE_QUOTE) && ((strict == false))) {s = 115;} - else if ( (LA26_103==DECIMAL_INTEGER_LITERAL) && ((strict == false))) {s = 116;} + else if ( (LA26_103==FLOATING_POINT_LITERAL) && ((strict == false))) {s = 116;} - else if ( (LA26_103==QUOTED_STRING) && ((strict == false))) {s = 117;} + else if ( (LA26_103==DECIMAL_INTEGER_LITERAL) && ((strict == false))) {s = 117;} - else if ( (LA26_103==TRUE) && ((strict == false))) {s = 118;} + else if ( (LA26_103==QUOTED_STRING) && ((strict == false))) {s = 118;} - else if ( (LA26_103==FALSE) && ((strict == false))) {s = 119;} + else if ( (LA26_103==TRUE) && ((strict == false))) {s = 119;} - else if ( (LA26_103==TIMESTAMP) && ((strict == false))) {s = 120;} + else if ( (LA26_103==FALSE) && ((strict == false))) {s = 120;} - else if ( (LA26_103==COLON) && ((strict == false))) {s = 121;} + else if ( (LA26_103==TIMESTAMP) && ((strict == false))) {s = 121;} - else if ( (LA26_103==EQUALS||(LA26_103>=NOTEQUALS && LA26_103<=GREATERTHANOREQUALS)) ) {s = 153;} + else if ( (LA26_103==COLON) && ((strict == false))) {s = 122;} input.seek(index26_103); @@ -11483,23 +11483,23 @@ public class CMISParser extends Parser { else if ( (LA26_101==RPAREN) && ((strict == false))) {s = 106;} - else if ( (LA26_101==ID) && ((strict == false))) {s = 113;} + else if ( (LA26_101==ID) && ((strict == false))) {s = 114;} - else if ( (LA26_101==DOUBLE_QUOTE) && ((strict == false))) {s = 114;} + else if ( (LA26_101==DOUBLE_QUOTE) && ((strict == false))) {s = 115;} - else if ( (LA26_101==FLOATING_POINT_LITERAL) && ((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 = 116;} + else if ( (LA26_101==DECIMAL_INTEGER_LITERAL) && ((strict == false))) {s = 117;} - else if ( (LA26_101==QUOTED_STRING) && ((strict == false))) {s = 117;} + else if ( (LA26_101==QUOTED_STRING) && ((strict == false))) {s = 118;} - else if ( (LA26_101==TRUE) && ((strict == false))) {s = 118;} + else if ( (LA26_101==TRUE) && ((strict == false))) {s = 119;} - else if ( (LA26_101==FALSE) && ((strict == false))) {s = 119;} + else if ( (LA26_101==FALSE) && ((strict == false))) {s = 120;} - else if ( (LA26_101==TIMESTAMP) && ((strict == false))) {s = 120;} + else if ( (LA26_101==TIMESTAMP) && ((strict == false))) {s = 121;} - else if ( (LA26_101==COLON) && ((strict == false))) {s = 121;} + else if ( (LA26_101==COLON) && ((strict == false))) {s = 122;} input.seek(index26_101); @@ -11516,23 +11516,23 @@ public class CMISParser extends Parser { else if ( (LA26_102==RPAREN) && ((strict == false))) {s = 106;} - else if ( (LA26_102==ID) && ((strict == false))) {s = 113;} + else if ( (LA26_102==ID) && ((strict == false))) {s = 114;} - else if ( (LA26_102==DOUBLE_QUOTE) && ((strict == false))) {s = 114;} + else if ( (LA26_102==DOUBLE_QUOTE) && ((strict == false))) {s = 115;} - else if ( (LA26_102==FLOATING_POINT_LITERAL) && ((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 = 116;} + else if ( (LA26_102==DECIMAL_INTEGER_LITERAL) && ((strict == false))) {s = 117;} - else if ( (LA26_102==QUOTED_STRING) && ((strict == false))) {s = 117;} + else if ( (LA26_102==QUOTED_STRING) && ((strict == false))) {s = 118;} - else if ( (LA26_102==TRUE) && ((strict == false))) {s = 118;} + else if ( (LA26_102==TRUE) && ((strict == false))) {s = 119;} - else if ( (LA26_102==FALSE) && ((strict == false))) {s = 119;} + else if ( (LA26_102==FALSE) && ((strict == false))) {s = 120;} - else if ( (LA26_102==TIMESTAMP) && ((strict == false))) {s = 120;} + else if ( (LA26_102==TIMESTAMP) && ((strict == false))) {s = 121;} - else if ( (LA26_102==COLON) && ((strict == false))) {s = 121;} + else if ( (LA26_102==COLON) && ((strict == false))) {s = 122;} input.seek(index26_102); @@ -11545,121 +11545,121 @@ public class CMISParser extends Parser { int index26_218 = input.index(); input.rewind(); s = -1; - if ( (LA26_218==IS) ) {s = 122;} + if ( (LA26_218==EQUALS||(LA26_218>=NOTEQUALS && LA26_218<=GREATERTHANOREQUALS)) ) {s = 108;} - else if ( (LA26_218==EQUALS||(LA26_218>=NOTEQUALS && LA26_218<=GREATERTHANOREQUALS)) ) {s = 111;} + else if ( (LA26_218==NOT) ) {s = 110;} - else if ( (LA26_218==NOT) ) {s = 108;} + else if ( (LA26_218==IN) ) {s = 111;} - else if ( (LA26_218==LIKE) ) {s = 109;} + 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 = 113;} + else if ( (LA26_218==ID) && ((strict == false))) {s = 114;} - else if ( (LA26_218==DOUBLE_QUOTE) && ((strict == false))) {s = 114;} + else if ( (LA26_218==DOUBLE_QUOTE) && ((strict == false))) {s = 115;} - else if ( (LA26_218==FLOATING_POINT_LITERAL) && ((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 = 116;} + else if ( (LA26_218==DECIMAL_INTEGER_LITERAL) && ((strict == false))) {s = 117;} - else if ( (LA26_218==QUOTED_STRING) && ((strict == false))) {s = 117;} + else if ( (LA26_218==QUOTED_STRING) && ((strict == false))) {s = 118;} - else if ( (LA26_218==TRUE) && ((strict == false))) {s = 118;} + else if ( (LA26_218==TRUE) && ((strict == false))) {s = 119;} - else if ( (LA26_218==FALSE) && ((strict == false))) {s = 119;} + else if ( (LA26_218==FALSE) && ((strict == false))) {s = 120;} - else if ( (LA26_218==TIMESTAMP) && ((strict == false))) {s = 120;} + else if ( (LA26_218==TIMESTAMP) && ((strict == false))) {s = 121;} - else if ( (LA26_218==COLON) && ((strict == false))) {s = 121;} - - else if ( (LA26_218==IN) ) {s = 110;} + else if ( (LA26_218==COLON) && ((strict == false))) {s = 122;} input.seek(index26_218); if ( s>=0 ) return s; break; case 7 : - int LA26_36 = input.LA(1); + int LA26_70 = input.LA(1); - int index26_36 = input.index(); + int index26_70 = input.index(); input.rewind(); s = -1; - if ( (LA26_36==NOT) ) {s = 71;} + if ( (LA26_70==NOT) ) {s = 71;} - else if ( (LA26_36==ID) ) {s = 72;} + else if ( (LA26_70==ID) ) {s = 72;} - else if ( (LA26_36==DOUBLE_QUOTE) ) {s = 73;} + else if ( (LA26_70==DOUBLE_QUOTE) ) {s = 73;} - else if ( (LA26_36==SCORE) ) {s = 74;} + else if ( (LA26_70==SCORE) ) {s = 74;} - else if ( (LA26_36==SELECT) ) {s = 75;} + else if ( (LA26_70==SELECT) ) {s = 75;} - else if ( (LA26_36==AS) ) {s = 76;} + else if ( (LA26_70==AS) ) {s = 76;} - else if ( (LA26_36==FROM) ) {s = 77;} + else if ( (LA26_70==FROM) ) {s = 77;} - else if ( (LA26_36==JOIN) ) {s = 78;} + else if ( (LA26_70==JOIN) ) {s = 78;} - else if ( (LA26_36==INNER) ) {s = 79;} + else if ( (LA26_70==INNER) ) {s = 79;} - else if ( (LA26_36==LEFT) ) {s = 80;} + else if ( (LA26_70==LEFT) ) {s = 80;} - else if ( (LA26_36==OUTER) ) {s = 81;} + else if ( (LA26_70==OUTER) ) {s = 81;} - else if ( (LA26_36==ON) ) {s = 82;} + else if ( (LA26_70==ON) ) {s = 82;} - else if ( (LA26_36==WHERE) ) {s = 83;} + else if ( (LA26_70==WHERE) ) {s = 83;} - else if ( (LA26_36==OR) ) {s = 84;} + else if ( (LA26_70==OR) ) {s = 84;} - else if ( (LA26_36==AND) ) {s = 85;} + else if ( (LA26_70==AND) ) {s = 85;} - else if ( (LA26_36==IN) ) {s = 86;} + else if ( (LA26_70==IN) ) {s = 86;} - else if ( (LA26_36==LIKE) ) {s = 87;} + else if ( (LA26_70==LIKE) ) {s = 87;} - else if ( (LA26_36==IS) ) {s = 88;} + else if ( (LA26_70==IS) ) {s = 88;} - else if ( (LA26_36==NULL) ) {s = 89;} + else if ( (LA26_70==NULL) ) {s = 89;} - else if ( (LA26_36==ANY) ) {s = 90;} + else if ( (LA26_70==ANY) ) {s = 90;} - else if ( (LA26_36==CONTAINS) ) {s = 91;} + else if ( (LA26_70==CONTAINS) ) {s = 91;} - else if ( (LA26_36==IN_FOLDER) ) {s = 92;} + else if ( (LA26_70==IN_FOLDER) ) {s = 92;} - else if ( (LA26_36==IN_TREE) ) {s = 93;} + else if ( (LA26_70==IN_TREE) ) {s = 93;} - else if ( (LA26_36==ORDER) ) {s = 94;} + else if ( (LA26_70==ORDER) ) {s = 94;} - else if ( (LA26_36==BY) ) {s = 95;} + else if ( (LA26_70==BY) ) {s = 95;} - else if ( (LA26_36==ASC) ) {s = 96;} + else if ( (LA26_70==ASC) ) {s = 96;} - else if ( (LA26_36==DESC) ) {s = 97;} + else if ( (LA26_70==DESC) ) {s = 97;} - else if ( (LA26_36==TIMESTAMP) ) {s = 98;} + else if ( (LA26_70==TIMESTAMP) ) {s = 98;} - else if ( (LA26_36==TRUE) ) {s = 99;} + else if ( (LA26_70==TRUE) ) {s = 99;} - else if ( (LA26_36==FALSE) ) {s = 100;} + else if ( (LA26_70==FALSE) ) {s = 100;} - else if ( (LA26_36==FLOATING_POINT_LITERAL) ) {s = 101;} + else if ( (LA26_70==FLOATING_POINT_LITERAL) ) {s = 101;} - else if ( (LA26_36==DECIMAL_INTEGER_LITERAL) ) {s = 102;} + else if ( (LA26_70==DECIMAL_INTEGER_LITERAL) ) {s = 102;} - else if ( (LA26_36==QUOTED_STRING) ) {s = 103;} + else if ( (LA26_70==QUOTED_STRING) ) {s = 103;} - else if ( (LA26_36==COLON) ) {s = 104;} + else if ( (LA26_70==COLON) ) {s = 104;} - else if ( (LA26_36==LPAREN) ) {s = 105;} + else if ( (LA26_70==LPAREN) ) {s = 105;} - else if ( (LA26_36==RPAREN) && ((strict == false))) {s = 106;} + else if ( (LA26_70==RPAREN) && ((strict == false))) {s = 106;} - input.seek(index26_36); + input.seek(index26_70); if ( s>=0 ) return s; break; case 8 : @@ -11669,27 +11669,27 @@ public class CMISParser extends Parser { int index26_154 = input.index(); input.rewind(); s = -1; - if ( (LA26_154==RPAREN) && ((strict == false))) {s = 106;} + if ( (LA26_154==EQUALS||(LA26_154>=NOTEQUALS && LA26_154<=GREATERTHANOREQUALS)) ) {s = 153;} - else if ( (LA26_154==ID) && ((strict == false))) {s = 113;} + else if ( (LA26_154==RPAREN) && ((strict == false))) {s = 106;} - else if ( (LA26_154==DOUBLE_QUOTE) && ((strict == false))) {s = 114;} + else if ( (LA26_154==ID) && ((strict == false))) {s = 114;} - else if ( (LA26_154==FLOATING_POINT_LITERAL) && ((strict == false))) {s = 115;} + else if ( (LA26_154==DOUBLE_QUOTE) && ((strict == false))) {s = 115;} - else if ( (LA26_154==DECIMAL_INTEGER_LITERAL) && ((strict == false))) {s = 116;} + else if ( (LA26_154==FLOATING_POINT_LITERAL) && ((strict == false))) {s = 116;} - else if ( (LA26_154==QUOTED_STRING) && ((strict == false))) {s = 117;} + else if ( (LA26_154==DECIMAL_INTEGER_LITERAL) && ((strict == false))) {s = 117;} - else if ( (LA26_154==TRUE) && ((strict == false))) {s = 118;} + else if ( (LA26_154==QUOTED_STRING) && ((strict == false))) {s = 118;} - else if ( (LA26_154==FALSE) && ((strict == false))) {s = 119;} + else if ( (LA26_154==TRUE) && ((strict == false))) {s = 119;} - else if ( (LA26_154==TIMESTAMP) && ((strict == false))) {s = 120;} + else if ( (LA26_154==FALSE) && ((strict == false))) {s = 120;} - else if ( (LA26_154==COLON) && ((strict == false))) {s = 121;} + else if ( (LA26_154==TIMESTAMP) && ((strict == false))) {s = 121;} - else if ( (LA26_154==EQUALS||(LA26_154>=NOTEQUALS && LA26_154<=GREATERTHANOREQUALS)) ) {s = 153;} + else if ( (LA26_154==COLON) && ((strict == false))) {s = 122;} input.seek(index26_154); @@ -11706,23 +11706,23 @@ public class CMISParser extends Parser { else if ( (LA26_217==RPAREN) && ((strict == false))) {s = 106;} - else if ( (LA26_217==ID) && ((strict == false))) {s = 113;} + else if ( (LA26_217==ID) && ((strict == false))) {s = 114;} - else if ( (LA26_217==DOUBLE_QUOTE) && ((strict == false))) {s = 114;} + else if ( (LA26_217==DOUBLE_QUOTE) && ((strict == false))) {s = 115;} - else if ( (LA26_217==FLOATING_POINT_LITERAL) && ((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 = 116;} + else if ( (LA26_217==DECIMAL_INTEGER_LITERAL) && ((strict == false))) {s = 117;} - else if ( (LA26_217==QUOTED_STRING) && ((strict == false))) {s = 117;} + else if ( (LA26_217==QUOTED_STRING) && ((strict == false))) {s = 118;} - else if ( (LA26_217==TRUE) && ((strict == false))) {s = 118;} + else if ( (LA26_217==TRUE) && ((strict == false))) {s = 119;} - else if ( (LA26_217==FALSE) && ((strict == false))) {s = 119;} + else if ( (LA26_217==FALSE) && ((strict == false))) {s = 120;} - else if ( (LA26_217==TIMESTAMP) && ((strict == false))) {s = 120;} + else if ( (LA26_217==TIMESTAMP) && ((strict == false))) {s = 121;} - else if ( (LA26_217==COLON) && ((strict == false))) {s = 121;} + else if ( (LA26_217==COLON) && ((strict == false))) {s = 122;} input.seek(index26_217); @@ -11735,29 +11735,29 @@ public class CMISParser extends Parser { int index26_99 = input.index(); input.rewind(); s = -1; - if ( (LA26_99==LPAREN) ) {s = 112;} + 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 = 113;} + else if ( (LA26_99==ID) && ((strict == false))) {s = 114;} - else if ( (LA26_99==DOUBLE_QUOTE) && ((strict == false))) {s = 114;} + else if ( (LA26_99==DOUBLE_QUOTE) && ((strict == false))) {s = 115;} - else if ( (LA26_99==FLOATING_POINT_LITERAL) && ((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 = 116;} + else if ( (LA26_99==DECIMAL_INTEGER_LITERAL) && ((strict == false))) {s = 117;} - else if ( (LA26_99==QUOTED_STRING) && ((strict == false))) {s = 117;} + else if ( (LA26_99==QUOTED_STRING) && ((strict == false))) {s = 118;} - else if ( (LA26_99==TRUE) && ((strict == false))) {s = 118;} + else if ( (LA26_99==TRUE) && ((strict == false))) {s = 119;} - else if ( (LA26_99==FALSE) && ((strict == false))) {s = 119;} + else if ( (LA26_99==FALSE) && ((strict == false))) {s = 120;} - else if ( (LA26_99==TIMESTAMP) && ((strict == false))) {s = 120;} + else if ( (LA26_99==TIMESTAMP) && ((strict == false))) {s = 121;} - else if ( (LA26_99==COLON) && ((strict == false))) {s = 121;} + else if ( (LA26_99==COLON) && ((strict == false))) {s = 122;} input.seek(index26_99); @@ -11770,29 +11770,29 @@ public class CMISParser extends Parser { int index26_100 = input.index(); input.rewind(); s = -1; - if ( (LA26_100==EQUALS||(LA26_100>=NOTEQUALS && LA26_100<=GREATERTHANOREQUALS)) ) {s = 153;} + if ( (LA26_100==LPAREN) ) {s = 109;} - else if ( (LA26_100==LPAREN) ) {s = 112;} + 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 = 113;} + else if ( (LA26_100==ID) && ((strict == false))) {s = 114;} - else if ( (LA26_100==DOUBLE_QUOTE) && ((strict == false))) {s = 114;} + else if ( (LA26_100==DOUBLE_QUOTE) && ((strict == false))) {s = 115;} - else if ( (LA26_100==FLOATING_POINT_LITERAL) && ((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 = 116;} + else if ( (LA26_100==DECIMAL_INTEGER_LITERAL) && ((strict == false))) {s = 117;} - else if ( (LA26_100==QUOTED_STRING) && ((strict == false))) {s = 117;} + else if ( (LA26_100==QUOTED_STRING) && ((strict == false))) {s = 118;} - else if ( (LA26_100==TRUE) && ((strict == false))) {s = 118;} + else if ( (LA26_100==TRUE) && ((strict == false))) {s = 119;} - else if ( (LA26_100==FALSE) && ((strict == false))) {s = 119;} + else if ( (LA26_100==FALSE) && ((strict == false))) {s = 120;} - else if ( (LA26_100==TIMESTAMP) && ((strict == false))) {s = 120;} + else if ( (LA26_100==TIMESTAMP) && ((strict == false))) {s = 121;} - else if ( (LA26_100==COLON) && ((strict == false))) {s = 121;} + else if ( (LA26_100==COLON) && ((strict == false))) {s = 122;} input.seek(index26_100); @@ -11807,35 +11807,35 @@ public class CMISParser extends Parser { s = -1; if ( (LA26_158==DOT) ) {s = 107;} - else if ( (LA26_158==EQUALS||(LA26_158>=NOTEQUALS && LA26_158<=GREATERTHANOREQUALS)) ) {s = 111;} + else if ( (LA26_158==EQUALS||(LA26_158>=NOTEQUALS && LA26_158<=GREATERTHANOREQUALS)) ) {s = 108;} - else if ( (LA26_158==IS) ) {s = 122;} + else if ( (LA26_158==NOT) ) {s = 110;} - else if ( (LA26_158==NOT) ) {s = 108;} + else if ( (LA26_158==IN) ) {s = 111;} - else if ( (LA26_158==LIKE) ) {s = 109;} + else if ( (LA26_158==LIKE) ) {s = 112;} - else if ( (LA26_158==IN) ) {s = 110;} + else if ( (LA26_158==IS) ) {s = 113;} else if ( (LA26_158==RPAREN) && ((strict == false))) {s = 106;} - else if ( (LA26_158==ID) && ((strict == false))) {s = 113;} + else if ( (LA26_158==ID) && ((strict == false))) {s = 114;} - else if ( (LA26_158==DOUBLE_QUOTE) && ((strict == false))) {s = 114;} + else if ( (LA26_158==DOUBLE_QUOTE) && ((strict == false))) {s = 115;} - else if ( (LA26_158==FLOATING_POINT_LITERAL) && ((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 = 116;} + else if ( (LA26_158==DECIMAL_INTEGER_LITERAL) && ((strict == false))) {s = 117;} - else if ( (LA26_158==QUOTED_STRING) && ((strict == false))) {s = 117;} + else if ( (LA26_158==QUOTED_STRING) && ((strict == false))) {s = 118;} - else if ( (LA26_158==TRUE) && ((strict == false))) {s = 118;} + else if ( (LA26_158==TRUE) && ((strict == false))) {s = 119;} - else if ( (LA26_158==FALSE) && ((strict == false))) {s = 119;} + else if ( (LA26_158==FALSE) && ((strict == false))) {s = 120;} - else if ( (LA26_158==TIMESTAMP) && ((strict == false))) {s = 120;} + else if ( (LA26_158==TIMESTAMP) && ((strict == false))) {s = 121;} - else if ( (LA26_158==COLON) && ((strict == false))) {s = 121;} + else if ( (LA26_158==COLON) && ((strict == false))) {s = 122;} input.seek(index26_158); @@ -11850,37 +11850,37 @@ public class CMISParser extends Parser { s = -1; if ( (LA26_72==DOT) ) {s = 107;} - else if ( (LA26_72==NOT) ) {s = 108;} + else if ( (LA26_72==EQUALS||(LA26_72>=NOTEQUALS && LA26_72<=GREATERTHANOREQUALS)) ) {s = 108;} - else if ( (LA26_72==LIKE) ) {s = 109;} + else if ( (LA26_72==LPAREN) ) {s = 109;} - else if ( (LA26_72==IN) ) {s = 110;} + else if ( (LA26_72==NOT) ) {s = 110;} - else if ( (LA26_72==EQUALS||(LA26_72>=NOTEQUALS && LA26_72<=GREATERTHANOREQUALS)) ) {s = 111;} + else if ( (LA26_72==IN) ) {s = 111;} - else if ( (LA26_72==LPAREN) ) {s = 112;} + 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 = 113;} + else if ( (LA26_72==ID) && ((strict == false))) {s = 114;} - else if ( (LA26_72==DOUBLE_QUOTE) && ((strict == false))) {s = 114;} + else if ( (LA26_72==DOUBLE_QUOTE) && ((strict == false))) {s = 115;} - else if ( (LA26_72==FLOATING_POINT_LITERAL) && ((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 = 116;} + else if ( (LA26_72==DECIMAL_INTEGER_LITERAL) && ((strict == false))) {s = 117;} - else if ( (LA26_72==QUOTED_STRING) && ((strict == false))) {s = 117;} + else if ( (LA26_72==QUOTED_STRING) && ((strict == false))) {s = 118;} - else if ( (LA26_72==TRUE) && ((strict == false))) {s = 118;} + else if ( (LA26_72==TRUE) && ((strict == false))) {s = 119;} - else if ( (LA26_72==FALSE) && ((strict == false))) {s = 119;} + else if ( (LA26_72==FALSE) && ((strict == false))) {s = 120;} - else if ( (LA26_72==TIMESTAMP) && ((strict == false))) {s = 120;} + else if ( (LA26_72==TIMESTAMP) && ((strict == false))) {s = 121;} - else if ( (LA26_72==COLON) && ((strict == false))) {s = 121;} - - else if ( (LA26_72==IS) ) {s = 122;} + else if ( (LA26_72==COLON) && ((strict == false))) {s = 122;} input.seek(index26_72); @@ -12078,30 +12078,30 @@ public class CMISParser extends Parser { 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\70\2\uffff"+ - "\1\106\3\uffff\35\107\2\uffff\3\47\2\uffff\1\56\1\40\1\45\1\42\1"+ - "\40\2\uffff\1\47\5\uffff\1\42\1\40\1\47\1\42\1\40\1\47\35\107\1"+ - "\70\2\uffff\1\106\7\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"; + "\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\71\2\uffff\1\107\3\uffff\35\107\2\uffff\3\114\2\uffff\1\72\1"+ - "\115\1\72\1\114\1\115\2\uffff\1\114\5\uffff\1\114\1\115\2\114\1"+ - "\115\1\114\35\107\1\71\2\uffff\1\107\7\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"; + "\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\1\3\1\2\1\uffff\1"+ - "\4\2\1\35\uffff\2\6\3\uffff\2\5\5\uffff\2\1\1\uffff\5\1\44\uffff"+ - "\1\3\1\1\1\uffff\1\2\1\4\4\1\1\7\36\uffff\1\10\36\uffff\1\10\42"+ - "\uffff\5\7\1\uffff\5\10\37\uffff"; + "\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\3\uffff\1\64\5\uffff\1\27\1\uffff\1\7\1\26\1\uffff\1\6\35\uffff"+ - "\1\62\2\uffff\1\60\44\uffff\1\122\36\uffff\1\22\36\uffff\1\32\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"+ @@ -12111,7 +12111,7 @@ public class CMISParser extends Parser { "\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\46\1\50\7\uffff\1\51\3\uffff\1\43\5\51\1\45\1\44\1\47", + "\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"+ @@ -12133,7 +12133,7 @@ public class CMISParser extends Parser { "", "", "", - "\1\50\37\uffff\1\107\1\110", + "\1\45\37\uffff\1\107\1\110", "\1\111", "\1\112", "\1\113", @@ -12141,19 +12141,19 @@ public class CMISParser extends Parser { "", "", "", - "\1\50\36\uffff\1\114", - "\1\50\7\uffff\1\115\4\uffff\5\115", - "\1\50\7\uffff\1\115\4\uffff\5\115", + "\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\45\1\44", - "", - "", "\1\116\1\117", "", "", + "\1\47\1\50", + "", + "", "", "\1\120", "\1\120", @@ -12186,54 +12186,54 @@ public class CMISParser extends Parser { "\1\120", "", "", - "\1\132\34\uffff\1\131\1\125\1\121\1\122\1\123\1\124\1\126"+ + "\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\123\1\124\1\126"+ + "\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\123\1\124\1\126"+ + "\1\132\34\uffff\1\131\1\140\1\136\1\137\1\124\1\125\1\126"+ "\1\127\1\130", "", "", - "\1\51\3\uffff\1\43\5\51\1\45\1\44\1\47", + "\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\u0081\10\uffff\1\u0080\3\uffff\1\176\5\u0080\1\u0082\1"+ - "\177\1\u0083", - "\1\u0088\2\uffff\1\u0087\1\uffff\1\132\34\uffff\1\131\1\u0086"+ - "\1\u0084\1\u0085\1\123\1\124\1\126\1\127\1\130", + "\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\u0086\1\u0084\1\u0085\1\123\1\124"+ + "\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\u0087\1\uffff\1\132\34\uffff\1\131\1\u0086"+ - "\1\u0084\1\u0085\1\123\1\124\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\u0086\1\u0084\1\u0085\1\123\1\124"+ + "\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\u0087\1\uffff\1\132\34\uffff\1\131\1\u0086"+ - "\1\u0084\1\u0085\1\123\1\124\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\u0086\1\u0084\1\u0085\1\123\1\124"+ + "\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", @@ -12264,11 +12264,11 @@ public class CMISParser extends Parser { "\1\u00e5", "\1\u00e5", "\1\u00e5", - "\1\u0082\1\177", - "", - "", "\1\u00e6\1\u00e7", "", + "\1\u0081\1\u0082", + "", + "", "", "", "", @@ -12304,8 +12304,8 @@ public class CMISParser extends Parser { "\1\u00e8", "\1\u00e8", "\1\u00e8", - "\1\u00ed\6\uffff\1\u0080\1\uffff\1\u00ea\1\u00e9\1\uffff\5"+ - "\u0080\10\uffff\1\u00eb", + "\1\u00ed\6\uffff\1\177\1\uffff\1\u00ea\1\u00e9\1\uffff\5\177"+ + "\10\uffff\1\u00eb", "", "\1\u00ee", "\1\u00ee", @@ -12336,8 +12336,8 @@ public class CMISParser extends Parser { "\1\u00ee", "\1\u00ee", "\1\u00ee", - "\1\u00f3\6\uffff\1\u0080\1\uffff\1\u00f0\1\u00ef\1\uffff\5"+ - "\u0080\10\uffff\1\u00f1", + "\1\u00f3\6\uffff\1\177\1\uffff\1\u00f0\1\u00ef\1\uffff\5\177"+ + "\10\uffff\1\u00f1", "", "\1\u00f4", "\1\u00f4", @@ -12368,31 +12368,31 @@ public class CMISParser extends Parser { "\1\u00f4", "\1\u00f4", "\1\u00f4", - "\1\u00f3\6\uffff\1\u0080\1\uffff\1\u00f0\1\u00ef\1\uffff\5"+ - "\u0080\10\uffff\1\u00f1", - "\1\51\3\uffff\1\43\5\51\1\45\1\44\1\47", - "\1\u0080\3\uffff\1\176\5\u0080\1\u0082\1\177\1\u0083", + "\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\u0088\2\uffff\1\u0087\1\uffff\1\132\34\uffff\1\131\1\u0086"+ - "\1\u0084\1\u0085\1\123\1\124\1\126\1\127\1\130", + "\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\u0087\1\uffff\1\132\34\uffff\1\131\1\u0086"+ - "\1\u0084\1\u0085\1\123\1\124\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\u0087\1\uffff\1\132\34\uffff\1\131\1\u0086"+ - "\1\u0084\1\u0085\1\123\1\124\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", @@ -12422,7 +12422,7 @@ public class CMISParser extends Parser { "\1\u0112", "\1\u0112", "\1\u0112", - "\1\u0080\3\uffff\1\176\5\u0080\1\u0082\1\177\1\u0083" + "\1\177\3\uffff\1\u0080\5\177\1\u0081\1\u0082\1\u0083" }; static final short[] DFA28_eot = DFA.unpackEncodedString(DFA28_eotS); @@ -12481,17 +12481,21 @@ public class CMISParser extends Parser { int index28_81 = input.index(); input.rewind(); s = -1; - if ( (LA28_81==RPAREN) && ((strict == false))) {s = 90;} + if ( (LA28_81==COMMA) ) {s = 132;} - else if ( (LA28_81==ID) && ((strict == false))) {s = 132;} + else if ( (LA28_81==DOT) && ((strict == false))) {s = 133;} - else if ( (LA28_81==DOUBLE_QUOTE) && ((strict == false))) {s = 133;} + else if ( (LA28_81==RPAREN) && ((strict == false))) {s = 90;} - else if ( (LA28_81==FLOATING_POINT_LITERAL) && ((strict == false))) {s = 83;} + else if ( (LA28_81==ID) && ((strict == false))) {s = 134;} - else if ( (LA28_81==DECIMAL_INTEGER_LITERAL) && ((strict == false))) {s = 84;} + else if ( (LA28_81==DOUBLE_QUOTE) && ((strict == false))) {s = 135;} - else if ( (LA28_81==QUOTED_STRING) && ((strict == false))) {s = 134;} + 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;} @@ -12501,10 +12505,6 @@ public class CMISParser extends Parser { else if ( (LA28_81==COLON) && ((strict == false))) {s = 89;} - else if ( (LA28_81==DOT) && ((strict == false))) {s = 135;} - - else if ( (LA28_81==COMMA) ) {s = 136;} - input.seek(index28_81); if ( s>=0 ) return s; @@ -12516,7 +12516,7 @@ public class CMISParser extends Parser { int index28_20 = input.index(); input.rewind(); s = -1; - if ( (LA28_20==LPAREN) && ((strict == false))) {s = 40;} + if ( (LA28_20==LPAREN) && ((strict == false))) {s = 37;} else if ( (LA28_20==ID) ) {s = 71;} @@ -12630,15 +12630,15 @@ public class CMISParser extends Parser { s = -1; if ( (LA28_96==RPAREN) ) {s = 228;} - else if ( (LA28_96==ID) && ((strict == false))) {s = 132;} + else if ( (LA28_96==ID) && ((strict == false))) {s = 134;} - else if ( (LA28_96==DOUBLE_QUOTE) && ((strict == false))) {s = 133;} + else if ( (LA28_96==DOUBLE_QUOTE) && ((strict == false))) {s = 135;} - else if ( (LA28_96==FLOATING_POINT_LITERAL) && ((strict == false))) {s = 83;} + else if ( (LA28_96==FLOATING_POINT_LITERAL) && ((strict == false))) {s = 84;} - else if ( (LA28_96==DECIMAL_INTEGER_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 = 134;} + else if ( (LA28_96==QUOTED_STRING) && ((strict == false))) {s = 136;} else if ( (LA28_96==TRUE) && ((strict == false))) {s = 86;} @@ -12661,15 +12661,15 @@ public class CMISParser extends Parser { s = -1; if ( (LA28_93==RPAREN) ) {s = 197;} - else if ( (LA28_93==ID) && ((strict == false))) {s = 132;} + else if ( (LA28_93==ID) && ((strict == false))) {s = 134;} - else if ( (LA28_93==DOUBLE_QUOTE) && ((strict == false))) {s = 133;} + else if ( (LA28_93==DOUBLE_QUOTE) && ((strict == false))) {s = 135;} - else if ( (LA28_93==FLOATING_POINT_LITERAL) && ((strict == false))) {s = 83;} + else if ( (LA28_93==FLOATING_POINT_LITERAL) && ((strict == false))) {s = 84;} - else if ( (LA28_93==DECIMAL_INTEGER_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 = 134;} + else if ( (LA28_93==QUOTED_STRING) && ((strict == false))) {s = 136;} else if ( (LA28_93==TRUE) && ((strict == false))) {s = 86;} @@ -12716,9 +12716,9 @@ public class CMISParser extends Parser { int index28_29 = input.index(); input.rewind(); s = -1; - if ( (LA28_29==EQUALS||(LA28_29>=NOTEQUALS && LA28_29<=GREATERTHANOREQUALS)) ) {s = 77;} + if ( (LA28_29==LPAREN) && ((strict == false))) {s = 37;} - else if ( (LA28_29==LPAREN) && ((strict == false))) {s = 40;} + else if ( (LA28_29==EQUALS||(LA28_29>=NOTEQUALS && LA28_29<=GREATERTHANOREQUALS)) ) {s = 77;} input.seek(index28_29); @@ -12744,7 +12744,7 @@ public class CMISParser extends Parser { int index28_30 = input.index(); input.rewind(); s = -1; - if ( (LA28_30==LPAREN) && ((strict == false))) {s = 40;} + if ( (LA28_30==LPAREN) && ((strict == false))) {s = 37;} else if ( (LA28_30==EQUALS||(LA28_30>=NOTEQUALS && LA28_30<=GREATERTHANOREQUALS)) ) {s = 77;} @@ -12824,7 +12824,9 @@ public class CMISParser extends Parser { int index28_197 = input.index(); input.rewind(); s = -1; - if ( (LA28_197==AND) ) {s = 239;} + 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;} @@ -12834,8 +12836,6 @@ public class CMISParser extends Parser { else if ( (LA28_197==RPAREN) ) {s = 243;} - else if ( (LA28_197==EQUALS||(LA28_197>=NOTEQUALS && LA28_197<=GREATERTHANOREQUALS)) && ((strict == false))) {s = 128;} - input.seek(index28_197); if ( s>=0 ) return s; @@ -12847,17 +12847,19 @@ public class CMISParser extends Parser { int index28_244 = input.index(); input.rewind(); s = -1; - if ( (LA28_244==RPAREN) && ((strict == false))) {s = 90;} + if ( (LA28_244==DOT) && ((strict == false))) {s = 133;} - else if ( (LA28_244==ID) && ((strict == false))) {s = 132;} + else if ( (LA28_244==RPAREN) && ((strict == false))) {s = 90;} - else if ( (LA28_244==DOUBLE_QUOTE) && ((strict == false))) {s = 133;} + else if ( (LA28_244==ID) && ((strict == false))) {s = 134;} - else if ( (LA28_244==FLOATING_POINT_LITERAL) && ((strict == false))) {s = 83;} + else if ( (LA28_244==DOUBLE_QUOTE) && ((strict == false))) {s = 135;} - else if ( (LA28_244==DECIMAL_INTEGER_LITERAL) && ((strict == false))) {s = 84;} + else if ( (LA28_244==FLOATING_POINT_LITERAL) && ((strict == false))) {s = 84;} - else if ( (LA28_244==QUOTED_STRING) && ((strict == false))) {s = 134;} + 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;} @@ -12867,8 +12869,6 @@ public class CMISParser extends Parser { else if ( (LA28_244==COLON) && ((strict == false))) {s = 89;} - else if ( (LA28_244==DOT) && ((strict == false))) {s = 135;} - else if ( (LA28_244==COMMA) ) {s = 198;} @@ -12882,17 +12882,19 @@ public class CMISParser extends Parser { int index28_238 = input.index(); input.rewind(); s = -1; - if ( (LA28_238==RPAREN) && ((strict == false))) {s = 90;} + if ( (LA28_238==DOT) && ((strict == false))) {s = 133;} - else if ( (LA28_238==ID) && ((strict == false))) {s = 132;} + else if ( (LA28_238==RPAREN) && ((strict == false))) {s = 90;} - else if ( (LA28_238==DOUBLE_QUOTE) && ((strict == false))) {s = 133;} + else if ( (LA28_238==ID) && ((strict == false))) {s = 134;} - else if ( (LA28_238==FLOATING_POINT_LITERAL) && ((strict == false))) {s = 83;} + else if ( (LA28_238==DOUBLE_QUOTE) && ((strict == false))) {s = 135;} - else if ( (LA28_238==DECIMAL_INTEGER_LITERAL) && ((strict == false))) {s = 84;} + else if ( (LA28_238==FLOATING_POINT_LITERAL) && ((strict == false))) {s = 84;} - else if ( (LA28_238==QUOTED_STRING) && ((strict == false))) {s = 134;} + 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;} @@ -12904,8 +12906,6 @@ public class CMISParser extends Parser { else if ( (LA28_238==COMMA) ) {s = 167;} - else if ( (LA28_238==DOT) && ((strict == false))) {s = 135;} - input.seek(index28_238); if ( s>=0 ) return s; @@ -12930,17 +12930,19 @@ public class CMISParser extends Parser { int index28_94 = input.index(); input.rewind(); s = -1; - if ( (LA28_94==RPAREN) && ((strict == false))) {s = 90;} + if ( (LA28_94==DOT) && ((strict == false))) {s = 133;} - else if ( (LA28_94==ID) && ((strict == false))) {s = 132;} + else if ( (LA28_94==RPAREN) && ((strict == false))) {s = 90;} - else if ( (LA28_94==DOUBLE_QUOTE) && ((strict == false))) {s = 133;} + else if ( (LA28_94==ID) && ((strict == false))) {s = 134;} - else if ( (LA28_94==FLOATING_POINT_LITERAL) && ((strict == false))) {s = 83;} + else if ( (LA28_94==DOUBLE_QUOTE) && ((strict == false))) {s = 135;} - else if ( (LA28_94==DECIMAL_INTEGER_LITERAL) && ((strict == false))) {s = 84;} + else if ( (LA28_94==FLOATING_POINT_LITERAL) && ((strict == false))) {s = 84;} - else if ( (LA28_94==QUOTED_STRING) && ((strict == false))) {s = 134;} + 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;} @@ -12950,8 +12952,6 @@ public class CMISParser extends Parser { else if ( (LA28_94==COLON) && ((strict == false))) {s = 89;} - else if ( (LA28_94==DOT) && ((strict == false))) {s = 135;} - else if ( (LA28_94==COMMA) ) {s = 198;} @@ -12965,17 +12965,19 @@ public class CMISParser extends Parser { int index28_91 = input.index(); input.rewind(); s = -1; - if ( (LA28_91==RPAREN) && ((strict == false))) {s = 90;} + if ( (LA28_91==DOT) && ((strict == false))) {s = 133;} - else if ( (LA28_91==ID) && ((strict == false))) {s = 132;} + else if ( (LA28_91==RPAREN) && ((strict == false))) {s = 90;} - else if ( (LA28_91==DOUBLE_QUOTE) && ((strict == false))) {s = 133;} + else if ( (LA28_91==ID) && ((strict == false))) {s = 134;} - else if ( (LA28_91==FLOATING_POINT_LITERAL) && ((strict == false))) {s = 83;} + else if ( (LA28_91==DOUBLE_QUOTE) && ((strict == false))) {s = 135;} - else if ( (LA28_91==DECIMAL_INTEGER_LITERAL) && ((strict == false))) {s = 84;} + else if ( (LA28_91==FLOATING_POINT_LITERAL) && ((strict == false))) {s = 84;} - else if ( (LA28_91==QUOTED_STRING) && ((strict == false))) {s = 134;} + 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;} @@ -12985,8 +12987,6 @@ public class CMISParser extends Parser { else if ( (LA28_91==COLON) && ((strict == false))) {s = 89;} - else if ( (LA28_91==DOT) && ((strict == false))) {s = 135;} - else if ( (LA28_91==COMMA) ) {s = 167;} @@ -13013,19 +13013,21 @@ public class CMISParser extends Parser { int index28_232 = input.index(); input.rewind(); s = -1; - if ( (LA28_232==COMMA) ) {s = 136;} + 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 = 132;} + else if ( (LA28_232==ID) && ((strict == false))) {s = 134;} - else if ( (LA28_232==DOUBLE_QUOTE) && ((strict == false))) {s = 133;} + else if ( (LA28_232==DOUBLE_QUOTE) && ((strict == false))) {s = 135;} - else if ( (LA28_232==FLOATING_POINT_LITERAL) && ((strict == false))) {s = 83;} + else if ( (LA28_232==FLOATING_POINT_LITERAL) && ((strict == false))) {s = 84;} - else if ( (LA28_232==DECIMAL_INTEGER_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 = 134;} + else if ( (LA28_232==QUOTED_STRING) && ((strict == false))) {s = 136;} else if ( (LA28_232==TRUE) && ((strict == false))) {s = 86;} @@ -13035,8 +13037,6 @@ public class CMISParser extends Parser { else if ( (LA28_232==COLON) && ((strict == false))) {s = 89;} - else if ( (LA28_232==DOT) && ((strict == false))) {s = 135;} - input.seek(index28_232); if ( s>=0 ) return s; @@ -13048,7 +13048,9 @@ public class CMISParser extends Parser { int index28_228 = input.index(); input.rewind(); s = -1; - if ( (LA28_228==AND) ) {s = 239;} + 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;} @@ -13058,8 +13060,6 @@ public class CMISParser extends Parser { else if ( (LA28_228==RPAREN) ) {s = 243;} - else if ( (LA28_228==EQUALS||(LA28_228>=NOTEQUALS && LA28_228<=GREATERTHANOREQUALS)) && ((strict == false))) {s = 128;} - input.seek(index28_228); if ( s>=0 ) return s; @@ -13127,9 +13127,9 @@ public class CMISParser extends Parser { else if ( (LA28_75==DOUBLE_QUOTE) ) {s = 95;} - else if ( (LA28_75==FLOATING_POINT_LITERAL) && ((strict == false))) {s = 83;} + else if ( (LA28_75==FLOATING_POINT_LITERAL) && ((strict == false))) {s = 84;} - else if ( (LA28_75==DECIMAL_INTEGER_LITERAL) && ((strict == false))) {s = 84;} + else if ( (LA28_75==DECIMAL_INTEGER_LITERAL) && ((strict == false))) {s = 85;} else if ( (LA28_75==QUOTED_STRING) ) {s = 96;} @@ -13158,9 +13158,9 @@ public class CMISParser extends Parser { else if ( (LA28_74==DOUBLE_QUOTE) ) {s = 92;} - else if ( (LA28_74==FLOATING_POINT_LITERAL) && ((strict == false))) {s = 83;} + else if ( (LA28_74==FLOATING_POINT_LITERAL) && ((strict == false))) {s = 84;} - else if ( (LA28_74==DECIMAL_INTEGER_LITERAL) && ((strict == false))) {s = 84;} + else if ( (LA28_74==DECIMAL_INTEGER_LITERAL) && ((strict == false))) {s = 85;} else if ( (LA28_74==QUOTED_STRING) ) {s = 93;} @@ -13357,7 +13357,7 @@ public class CMISParser extends Parser { s = -1; if ( (LA28_28==QUOTED_STRING) ) {s = 76;} - else if ( (LA28_28==LPAREN) && ((strict == false))) {s = 40;} + else if ( (LA28_28==LPAREN) && ((strict == false))) {s = 37;} input.seek(index28_28); @@ -13383,16 +13383,16 @@ public class CMISParser extends Parser { int index28_230 = input.index(); input.rewind(); s = -1; - if ( (LA28_230==NOT) && ((strict == false))) {s = 126;} + if ( (LA28_230==EQUALS||(LA28_230>=NOTEQUALS && LA28_230<=GREATERTHANOREQUALS)) && ((strict == false))) {s = 127;} - else if ( (LA28_230==LIKE) && ((strict == false))) {s = 127;} + else if ( (LA28_230==NOT) && ((strict == false))) {s = 128;} - else if ( (LA28_230==IN) && ((strict == false))) {s = 130;} + 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;} - else if ( (LA28_230==EQUALS||(LA28_230>=NOTEQUALS && LA28_230<=GREATERTHANOREQUALS)) && ((strict == false))) {s = 128;} - input.seek(index28_230); if ( s>=0 ) return s; @@ -13450,18 +13450,18 @@ public class CMISParser extends Parser { if ( s>=0 ) return s; break; case 48 : - int LA28_129 = input.LA(1); + int LA28_126 = input.LA(1); - int index28_129 = input.index(); + int index28_126 = input.index(); input.rewind(); s = -1; - if ( (LA28_129==ID) && ((strict == false))) {s = 230;} + if ( (LA28_126==ID) && ((strict == false))) {s = 230;} - else if ( (LA28_129==DOUBLE_QUOTE) && ((strict == false))) {s = 231;} + else if ( (LA28_126==DOUBLE_QUOTE) && ((strict == false))) {s = 231;} - input.seek(index28_129); + input.seek(index28_126); if ( s>=0 ) return s; break; case 49 : @@ -13478,18 +13478,18 @@ public class CMISParser extends Parser { if ( s>=0 ) return s; break; case 50 : - int LA28_126 = input.LA(1); + int LA28_128 = input.LA(1); - int index28_126 = input.index(); + int index28_128 = input.index(); input.rewind(); s = -1; - if ( (LA28_126==IN) && ((strict == false))) {s = 130;} + if ( (LA28_128==IN) && ((strict == false))) {s = 129;} - else if ( (LA28_126==LIKE) && ((strict == false))) {s = 127;} + else if ( (LA28_128==LIKE) && ((strict == false))) {s = 130;} - input.seek(index28_126); + input.seek(index28_128); if ( s>=0 ) return s; break; case 51 : @@ -13506,34 +13506,34 @@ public class CMISParser extends Parser { if ( s>=0 ) return s; break; case 52 : - int LA28_85 = input.LA(1); + int LA28_83 = input.LA(1); - int index28_85 = input.index(); + int index28_83 = input.index(); input.rewind(); s = -1; - if ( (LA28_85==RPAREN) ) {s = 166;} + if ( (LA28_83==RPAREN) ) {s = 166;} - else if ( (LA28_85==ID) && ((strict == false))) {s = 132;} + else if ( (LA28_83==ID) && ((strict == false))) {s = 134;} - else if ( (LA28_85==DOUBLE_QUOTE) && ((strict == false))) {s = 133;} + else if ( (LA28_83==DOUBLE_QUOTE) && ((strict == false))) {s = 135;} - else if ( (LA28_85==FLOATING_POINT_LITERAL) && ((strict == false))) {s = 83;} + else if ( (LA28_83==FLOATING_POINT_LITERAL) && ((strict == false))) {s = 84;} - else if ( (LA28_85==DECIMAL_INTEGER_LITERAL) && ((strict == false))) {s = 84;} + else if ( (LA28_83==DECIMAL_INTEGER_LITERAL) && ((strict == false))) {s = 85;} - else if ( (LA28_85==QUOTED_STRING) && ((strict == false))) {s = 134;} + else if ( (LA28_83==QUOTED_STRING) && ((strict == false))) {s = 136;} - else if ( (LA28_85==TRUE) && ((strict == false))) {s = 86;} + else if ( (LA28_83==TRUE) && ((strict == false))) {s = 86;} - else if ( (LA28_85==FALSE) && ((strict == false))) {s = 87;} + else if ( (LA28_83==FALSE) && ((strict == false))) {s = 87;} - else if ( (LA28_85==TIMESTAMP) && ((strict == false))) {s = 88;} + else if ( (LA28_83==TIMESTAMP) && ((strict == false))) {s = 88;} - else if ( (LA28_85==COLON) && ((strict == false))) {s = 89;} + else if ( (LA28_83==COLON) && ((strict == false))) {s = 89;} - input.seek(index28_85); + input.seek(index28_83); if ( s>=0 ) return s; break; case 53 : @@ -13543,13 +13543,13 @@ public class CMISParser extends Parser { int index28_274 = input.index(); input.rewind(); s = -1; - if ( (LA28_274==NOT) && ((strict == false))) {s = 126;} + if ( (LA28_274==EQUALS||(LA28_274>=NOTEQUALS && LA28_274<=GREATERTHANOREQUALS)) && ((strict == false))) {s = 127;} - else if ( (LA28_274==LIKE) && ((strict == false))) {s = 127;} + else if ( (LA28_274==NOT) && ((strict == false))) {s = 128;} - else if ( (LA28_274==EQUALS||(LA28_274>=NOTEQUALS && LA28_274<=GREATERTHANOREQUALS)) && ((strict == false))) {s = 128;} + else if ( (LA28_274==IN) && ((strict == false))) {s = 129;} - else if ( (LA28_274==IN) && ((strict == false))) {s = 130;} + else if ( (LA28_274==LIKE) && ((strict == false))) {s = 130;} else if ( (LA28_274==IS) && ((strict == false))) {s = 131;} @@ -13776,19 +13776,19 @@ public class CMISParser extends Parser { int index28_1 = input.index(); input.rewind(); s = -1; - if ( (LA28_1==NOT) ) {s = 35;} + if ( (LA28_1==DOT) ) {s = 35;} - else if ( (LA28_1==LIKE) ) {s = 36;} + else if ( (LA28_1==EQUALS||(LA28_1>=NOTEQUALS && LA28_1<=GREATERTHANOREQUALS)) ) {s = 36;} - else if ( (LA28_1==IN) ) {s = 37;} + else if ( (LA28_1==LPAREN) && ((strict == false))) {s = 37;} - else if ( (LA28_1==DOT) ) {s = 38;} + else if ( (LA28_1==NOT) ) {s = 38;} - else if ( (LA28_1==IS) ) {s = 39;} + else if ( (LA28_1==IN) ) {s = 39;} - else if ( (LA28_1==LPAREN) && ((strict == false))) {s = 40;} + else if ( (LA28_1==LIKE) ) {s = 40;} - else if ( (LA28_1==EQUALS||(LA28_1>=NOTEQUALS && LA28_1<=GREATERTHANOREQUALS)) ) {s = 41;} + else if ( (LA28_1==IS) ) {s = 41;} input.seek(index28_1); @@ -13974,11 +13974,11 @@ public class CMISParser extends Parser { else if ( (LA28_73==DOUBLE_QUOTE) ) {s = 82;} - else if ( (LA28_73==FLOATING_POINT_LITERAL) && ((strict == false))) {s = 83;} + else if ( (LA28_73==QUOTED_STRING) ) {s = 83;} - else if ( (LA28_73==DECIMAL_INTEGER_LITERAL) && ((strict == false))) {s = 84;} + else if ( (LA28_73==FLOATING_POINT_LITERAL) && ((strict == false))) {s = 84;} - else if ( (LA28_73==QUOTED_STRING) ) {s = 85;} + else if ( (LA28_73==DECIMAL_INTEGER_LITERAL) && ((strict == false))) {s = 85;} else if ( (LA28_73==TRUE) && ((strict == false))) {s = 86;} @@ -14024,7 +14024,7 @@ public class CMISParser extends Parser { else if ( (LA28_166==RPAREN) ) {s = 237;} - else if ( (LA28_166==EQUALS||(LA28_166>=NOTEQUALS && LA28_166<=GREATERTHANOREQUALS)) && ((strict == false))) {s = 128;} + else if ( (LA28_166==EQUALS||(LA28_166>=NOTEQUALS && LA28_166<=GREATERTHANOREQUALS)) && ((strict == false))) {s = 127;} input.seek(index28_166); @@ -14037,15 +14037,15 @@ public class CMISParser extends Parser { int index28_80 = input.index(); input.rewind(); s = -1; - if ( (LA28_80==NOT) && ((strict == false))) {s = 126;} + if ( (LA28_80==DOT) && ((strict == false))) {s = 126;} - else if ( (LA28_80==LIKE) && ((strict == false))) {s = 127;} + else if ( (LA28_80==EQUALS||(LA28_80>=NOTEQUALS && LA28_80<=GREATERTHANOREQUALS)) && ((strict == false))) {s = 127;} - else if ( (LA28_80==EQUALS||(LA28_80>=NOTEQUALS && LA28_80<=GREATERTHANOREQUALS)) && ((strict == false))) {s = 128;} + else if ( (LA28_80==NOT) && ((strict == false))) {s = 128;} - else if ( (LA28_80==DOT) && ((strict == false))) {s = 129;} + else if ( (LA28_80==IN) && ((strict == false))) {s = 129;} - else if ( (LA28_80==IN) && ((strict == false))) {s = 130;} + else if ( (LA28_80==LIKE) && ((strict == false))) {s = 130;} else if ( (LA28_80==IS) && ((strict == false))) {s = 131;} @@ -14098,7 +14098,7 @@ public class CMISParser extends Parser { "\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\2\1\1\36\uffff"; + "\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"+ @@ -14182,7 +14182,7 @@ public class CMISParser extends Parser { "\1\106", "\1\106", "\1\107\1\110", - "\1\111\10\uffff\1\112", + "\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"+ @@ -15086,9 +15086,9 @@ public class CMISParser extends Parser { int index34_69 = input.index(); input.rewind(); s = -1; - if ( (LA34_69==NOT) && ((strict == false))) {s = 73;} + if ( (LA34_69==NULL) && ((strict == false))) {s = 73;} - else if ( (LA34_69==NULL) && ((strict == false))) {s = 74;} + else if ( (LA34_69==NOT) && ((strict == false))) {s = 74;} input.seek(index34_69); @@ -15248,21 +15248,21 @@ public class CMISParser extends Parser { static final String DFA41_eotS = "\153\uffff"; static final String DFA41_eofS = - "\1\uffff\1\5\43\uffff\1\5\1\uffff\1\111\42\uffff\1\5\1\111\36\uffff"+ - "\1\111"; + "\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\2\uffff"+ - "\1\106\2\uffff\2\42\1\40\35\107\1\42"; + "\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\35\107"+ - "\2\uffff\1\107\2\uffff\2\103\1\115\35\107\1\103"; + "\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\75\uffff\2\2\1\uffff\2\1\41\uffff"; + "\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\37\uffff"+ - "\1\16\3\uffff\1\37\1\25\1\12\1\15\1\13\1\21\1\17\1\23\1\22\1\2\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 = { @@ -15311,7 +15311,7 @@ public class CMISParser extends Parser { "\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\110\2\uffff\1\107\34\uffff\1\105\1\106", + "\1\106\2\uffff\1\105\34\uffff\1\110\1\111", "\1\112", "\1\112", "\1\112", @@ -15341,13 +15341,13 @@ public class CMISParser extends Parser { "\1\112", "\1\112", "\1\112", - "", - "", "\1\113\1\114", "", "", + "", + "", "\1\4\37\uffff\1\6\1\7", - "\1\110\37\uffff\1\105\1\106", + "\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"+ @@ -15381,7 +15381,7 @@ public class CMISParser extends Parser { "\1\152", "\1\152", "\1\152", - "\1\110\37\uffff\1\105\1\106" + "\1\106\37\uffff\1\110\1\111" }; static final short[] DFA41_eot = DFA.unpackEncodedString(DFA41_eotS); @@ -15603,18 +15603,18 @@ public class CMISParser extends Parser { if ( s>=0 ) return s; break; case 14 : - int LA41_71 = input.LA(1); + int LA41_69 = input.LA(1); - int index41_71 = input.index(); + int index41_69 = input.index(); input.rewind(); s = -1; - if ( (LA41_71==ID) && ((strict == false))) {s = 75;} + if ( (LA41_69==ID) && ((strict == false))) {s = 75;} - else if ( (LA41_71==DOUBLE_QUOTE) && ((strict == false))) {s = 76;} + else if ( (LA41_69==DOUBLE_QUOTE) && ((strict == false))) {s = 76;} - input.seek(index41_71); + input.seek(index41_69); if ( s>=0 ) return s; break; case 15 : @@ -15797,15 +15797,15 @@ public class CMISParser extends Parser { int index41_39 = input.index(); input.rewind(); s = -1; - if ( (LA41_39==ASC) && ((strict == false))) {s = 69;} + if ( (LA41_39==DOT) && ((strict == false))) {s = 69;} - else if ( (LA41_39==DESC) && ((strict == false))) {s = 70;} + else if ( (LA41_39==COMMA) && ((strict == false))) {s = 70;} - else if ( (LA41_39==DOT) && ((strict == false))) {s = 71;} + else if ( (LA41_39==EOF) && ((strict == false))) {s = 71;} - else if ( (LA41_39==COMMA) && ((strict == false))) {s = 72;} + else if ( (LA41_39==ASC) && ((strict == false))) {s = 72;} - else if ( (LA41_39==EOF) && ((strict == false))) {s = 73;} + else if ( (LA41_39==DESC) && ((strict == false))) {s = 73;} input.seek(index41_39); @@ -15896,13 +15896,13 @@ public class CMISParser extends Parser { int index41_75 = input.index(); input.rewind(); s = -1; - if ( (LA41_75==COMMA) && ((strict == false))) {s = 72;} + if ( (LA41_75==COMMA) && ((strict == false))) {s = 70;} - else if ( (LA41_75==EOF) && ((strict == false))) {s = 73;} + else if ( (LA41_75==EOF) && ((strict == false))) {s = 71;} - else if ( (LA41_75==ASC) && ((strict == false))) {s = 69;} + else if ( (LA41_75==ASC) && ((strict == false))) {s = 72;} - else if ( (LA41_75==DESC) && ((strict == false))) {s = 70;} + else if ( (LA41_75==DESC) && ((strict == false))) {s = 73;} input.seek(index41_75); @@ -15928,13 +15928,13 @@ public class CMISParser extends Parser { int index41_106 = input.index(); input.rewind(); s = -1; - if ( (LA41_106==ASC) && ((strict == false))) {s = 69;} + if ( (LA41_106==COMMA) && ((strict == false))) {s = 70;} - else if ( (LA41_106==DESC) && ((strict == false))) {s = 70;} + else if ( (LA41_106==EOF) && ((strict == false))) {s = 71;} - else if ( (LA41_106==COMMA) && ((strict == false))) {s = 72;} + else if ( (LA41_106==ASC) && ((strict == false))) {s = 72;} - else if ( (LA41_106==EOF) && ((strict == false))) {s = 73;} + else if ( (LA41_106==DESC) && ((strict == false))) {s = 73;} input.seek(index41_106); 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 index f15209ed56..72ebd52679 100644 --- a/source/java/org/alfresco/repo/search/impl/parsers/CMIS_FTS.tokens +++ b/source/java/org/alfresco/repo/search/impl/parsers/CMIS_FTS.tokens @@ -1,14 +1,14 @@ -TERM=6 -START_WORD=16 DISJUNCTION=4 -WS=15 -FTSPHRASE=12 CONJUNCTION=5 -OR=13 -DEFAULT=8 -IN_WORD=17 -MINUS=10 -F_ESC=14 -FTSWORD=11 +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 index 9b5de76dd7..58a8128421 100644 --- a/source/java/org/alfresco/repo/search/impl/parsers/CMIS_FTSLexer.java +++ b/source/java/org/alfresco/repo/search/impl/parsers/CMIS_FTSLexer.java @@ -1,4 +1,4 @@ -// $ANTLR 3.2 Sep 23, 2009 12:02:23 W:\\alfresco\\BRANCHES\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS_FTS.g 2011-01-12 12:54:17 +// $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; @@ -10,21 +10,21 @@ import java.util.List; import java.util.ArrayList; public class CMIS_FTSLexer extends Lexer { - public static final int TERM=6; - public static final int START_WORD=16; - public static final int DISJUNCTION=4; - public static final int WS=15; - public static final int FTSPHRASE=12; - public static final int CONJUNCTION=5; - public static final int DEFAULT=8; - public static final int OR=13; - public static final int IN_WORD=17; - public static final int MINUS=10; public static final int EOF=-1; - public static final int F_ESC=14; + 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 FTSWORD=11; + 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) { @@ -91,18 +91,18 @@ public class CMIS_FTSLexer extends Lexer { super(input,state); } - public String getGrammarFileName() { return "W:\\alfresco\\BRANCHES\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS_FTS.g"; } + 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\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS_FTS.g:346:9: ( '\\'' ( F_ESC | ~ ( '\\\\' | '\\'' ) )* '\\'' ) - // W:\\alfresco\\BRANCHES\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS_FTS.g:347:9: '\\'' ( F_ESC | ~ ( '\\\\' | '\\'' ) )* '\\'' + // 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\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS_FTS.g:348:9: ( F_ESC | ~ ( '\\\\' | '\\'' ) )* + // 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; @@ -118,14 +118,14 @@ public class CMIS_FTSLexer extends Lexer { switch (alt1) { case 1 : - // W:\\alfresco\\BRANCHES\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS_FTS.g:349:17: F_ESC + // 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\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS_FTS.g:351:17: ~ ( '\\\\' | '\\'' ) + // 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(); @@ -160,8 +160,8 @@ public class CMIS_FTSLexer extends Lexer { // $ANTLR start "F_ESC" public final void mF_ESC() throws RecognitionException { try { - // W:\\alfresco\\BRANCHES\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS_FTS.g:362:9: ( '\\\\' ( '\\\\' | '\\'' ) ) - // W:\\alfresco\\BRANCHES\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS_FTS.g:363:9: '\\\\' ( '\\\\' | '\\'' ) + // 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)=='\\' ) { @@ -187,8 +187,8 @@ public class CMIS_FTSLexer extends Lexer { try { int _type = OR; int _channel = DEFAULT_TOKEN_CHANNEL; - // W:\\alfresco\\BRANCHES\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS_FTS.g:372:9: ( ( 'O' | 'o' ) ( 'R' | 'r' ) ) - // W:\\alfresco\\BRANCHES\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS_FTS.g:373:9: ( 'O' | 'o' ) ( 'R' | 'r' ) + // 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(); @@ -224,8 +224,8 @@ public class CMIS_FTSLexer extends Lexer { try { int _type = MINUS; int _channel = DEFAULT_TOKEN_CHANNEL; - // W:\\alfresco\\BRANCHES\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS_FTS.g:384:9: ( '-' ) - // W:\\alfresco\\BRANCHES\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS_FTS.g:385:9: '-' + // 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('-'); @@ -244,10 +244,10 @@ public class CMIS_FTSLexer extends Lexer { try { int _type = WS; int _channel = DEFAULT_TOKEN_CHANNEL; - // W:\\alfresco\\BRANCHES\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS_FTS.g:395:9: ( ( ' ' | '\\t' | '\\r' | '\\n' )+ ) - // W:\\alfresco\\BRANCHES\\V3.3\\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: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\\V3.3\\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 { @@ -261,7 +261,7 @@ public class CMIS_FTSLexer extends Lexer { switch (alt2) { case 1 : - // W:\\alfresco\\BRANCHES\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS_FTS.g: + // 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(); @@ -302,11 +302,11 @@ public class CMIS_FTSLexer extends Lexer { try { int _type = FTSWORD; int _channel = DEFAULT_TOKEN_CHANNEL; - // W:\\alfresco\\BRANCHES\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS_FTS.g:407:9: ( START_WORD ( IN_WORD )* ) - // W:\\alfresco\\BRANCHES\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS_FTS.g:408:9: START_WORD ( IN_WORD )* + // 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\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS_FTS.g:408:20: ( IN_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; @@ -319,7 +319,7 @@ public class CMIS_FTSLexer extends Lexer { switch (alt3) { case 1 : - // W:\\alfresco\\BRANCHES\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS_FTS.g:408:20: IN_WORD + // 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(); @@ -345,8 +345,8 @@ public class CMIS_FTSLexer extends Lexer { // $ANTLR start "START_WORD" public final void mSTART_WORD() throws RecognitionException { try { - // W:\\alfresco\\BRANCHES\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS_FTS.g:413:9: (~ ( ' ' | '\\t' | '\\r' | '\\n' | '-' ) ) - // W:\\alfresco\\BRANCHES\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS_FTS.g:414:9: ~ ( ' ' | '\\t' | '\\r' | '\\n' | '-' ) + // 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(); @@ -369,8 +369,8 @@ public class CMIS_FTSLexer extends Lexer { // $ANTLR start "IN_WORD" public final void mIN_WORD() throws RecognitionException { try { - // W:\\alfresco\\BRANCHES\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS_FTS.g:425:9: (~ ( ' ' | '\\t' | '\\r' | '\\n' ) ) - // W:\\alfresco\\BRANCHES\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS_FTS.g:426:9: ~ ( ' ' | '\\t' | '\\r' | '\\n' ) + // 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(); @@ -391,40 +391,40 @@ public class CMIS_FTSLexer extends Lexer { // $ANTLR end "IN_WORD" public void mTokens() throws RecognitionException { - // W:\\alfresco\\BRANCHES\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS_FTS.g:1:8: ( FTSPHRASE | OR | MINUS | WS | FTSWORD ) + // 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\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS_FTS.g:1:10: FTSPHRASE + // 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\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS_FTS.g:1:20: OR + // 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\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS_FTS.g:1:23: MINUS + // 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\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS_FTS.g:1:29: WS + // 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\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS_FTS.g:1:32: FTSWORD + // W:\\alfresco\\BRANCHES\\DEV\\SWIFT\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS_FTS.g:1:32: FTSWORD { mFTSWORD(); @@ -438,38 +438,36 @@ public class CMIS_FTSLexer extends Lexer { protected DFA4 dfa4 = new DFA4(this); static final String DFA4_eotS = - "\1\uffff\2\6\4\uffff\2\6\1\16\1\uffff\1\17\1\uffff\1\6\2\uffff"; + "\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\4\uffff\3\0\1\uffff\1\0\1\uffff\1\0\2\uffff"; + "\3\0\3\uffff\3\0\2\uffff\1\0\1\uffff\1\0\2\uffff"; static final String DFA4_maxS = - "\3\uffff\4\uffff\3\uffff\1\uffff\1\uffff\1\uffff\1\uffff\2\uffff"; + "\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\2\5\3\uffff\1\1\1\uffff\1\5\1\uffff\1\1\1\2"; + "\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\4\uffff\1\1\1\0\1\7\1\uffff\1\2\1\uffff\1\3\2\uffff}>"; + "\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\10\2\12\2\10\1\12\22\10\1\12\6\10\1\11\64\10\1\7\uffa3"+ - "\10", + "\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\10\2\12\2\10\1\12\22\10\1\12\6\10\1\11\64\10\1\7\uffa3"+ - "\10", + "\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\10\2\12\2\10\1\12\22\10\1\12\6\10\1\11\64\10\1\7\uffa3"+ - "\10", + "\11\7\2\12\2\7\1\12\22\7\1\12\6\7\1\10\64\7\1\6\uffa3\7", "", "" }; @@ -511,30 +509,30 @@ public class CMIS_FTSLexer extends Lexer { int _s = s; switch ( s ) { case 0 : - int LA4_8 = input.LA(1); + int LA4_7 = input.LA(1); s = -1; - if ( (LA4_8=='\'') ) {s = 9;} + if ( (LA4_7=='\'') ) {s = 8;} - else if ( (LA4_8=='\\') ) {s = 7;} + else if ( (LA4_7=='\\') ) {s = 6;} - else if ( ((LA4_8>='\u0000' && LA4_8<='\b')||(LA4_8>='\u000B' && LA4_8<='\f')||(LA4_8>='\u000E' && LA4_8<='\u001F')||(LA4_8>='!' && LA4_8<='&')||(LA4_8>='(' && LA4_8<='[')||(LA4_8>=']' && LA4_8<='\uFFFF')) ) {s = 8;} + 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_8>='\t' && LA4_8<='\n')||LA4_8=='\r'||LA4_8==' ') ) {s = 10;} + else if ( ((LA4_7>='\t' && LA4_7<='\n')||LA4_7=='\r'||LA4_7==' ') ) {s = 10;} - else s = 6; + else s = 9; if ( s>=0 ) return s; break; case 1 : - int LA4_7 = input.LA(1); + int LA4_6 = input.LA(1); s = -1; - if ( (LA4_7=='\''||LA4_7=='\\') ) {s = 13;} + if ( (LA4_6=='\''||LA4_6=='\\') ) {s = 13;} - 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 = 12;} + 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 = 6; + else s = 9; if ( s>=0 ) return s; break; @@ -552,15 +550,15 @@ public class CMIS_FTSLexer extends Lexer { int LA4_13 = input.LA(1); s = -1; - if ( (LA4_13=='\'') ) {s = 9;} + if ( (LA4_13=='\'') ) {s = 8;} - else if ( (LA4_13=='\\') ) {s = 7;} + 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 = 8;} + 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 = 6; + else s = 9; if ( s>=0 ) return s; break; @@ -572,7 +570,7 @@ public class CMIS_FTSLexer extends Lexer { 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 = 6; + else s = 9; if ( s>=0 ) return s; break; @@ -580,15 +578,15 @@ public class CMIS_FTSLexer extends Lexer { int LA4_1 = input.LA(1); s = -1; - if ( (LA4_1=='\\') ) {s = 7;} + 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 = 8;} + 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 = 9;} + else if ( (LA4_1=='\'') ) {s = 8;} else if ( ((LA4_1>='\t' && LA4_1<='\n')||LA4_1=='\r'||LA4_1==' ') ) {s = 10;} - else s = 6; + else s = 9; if ( s>=0 ) return s; break; @@ -609,10 +607,10 @@ public class CMIS_FTSLexer extends Lexer { if ( s>=0 ) return s; break; case 7 : - int LA4_9 = input.LA(1); + int LA4_8 = input.LA(1); s = -1; - if ( ((LA4_9>='\u0000' && LA4_9<='\b')||(LA4_9>='\u000B' && LA4_9<='\f')||(LA4_9>='\u000E' && LA4_9<='\u001F')||(LA4_9>='!' && LA4_9<='\uFFFF')) ) {s = 12;} + 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; 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 index 66a4685737..4b1a22af76 100644 --- a/source/java/org/alfresco/repo/search/impl/parsers/CMIS_FTSParser.java +++ b/source/java/org/alfresco/repo/search/impl/parsers/CMIS_FTSParser.java @@ -1,4 +1,4 @@ -// $ANTLR 3.2 Sep 23, 2009 12:02:23 W:\\alfresco\\BRANCHES\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS_FTS.g 2011-01-12 12:54:17 +// $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; @@ -15,21 +15,21 @@ public class CMIS_FTSParser extends Parser { public static final String[] tokenNames = new String[] { "", "", "", "", "DISJUNCTION", "CONJUNCTION", "TERM", "PHRASE", "DEFAULT", "EXCLUDE", "MINUS", "FTSWORD", "FTSPHRASE", "OR", "F_ESC", "WS", "START_WORD", "IN_WORD" }; - public static final int TERM=6; - public static final int START_WORD=16; - public static final int DISJUNCTION=4; - public static final int WS=15; - public static final int FTSPHRASE=12; - public static final int CONJUNCTION=5; - public static final int OR=13; - public static final int DEFAULT=8; - public static final int IN_WORD=17; - public static final int MINUS=10; public static final int EOF=-1; - public static final int F_ESC=14; - public static final int FTSWORD=11; + 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 @@ -53,7 +53,7 @@ public class CMIS_FTSParser extends Parser { } public String[] getTokenNames() { return CMIS_FTSParser.tokenNames; } - public String getGrammarFileName() { return "W:\\alfresco\\BRANCHES\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS_FTS.g"; } + 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 paraphrases = new Stack(); @@ -191,7 +191,7 @@ public class CMIS_FTSParser extends Parser { }; // $ANTLR start "cmisFtsQuery" - // W:\\alfresco\\BRANCHES\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS_FTS.g:278:1: cmisFtsQuery : ftsCmisDisjunction EOF -> ftsCmisDisjunction ; + // 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); @@ -206,8 +206,8 @@ public class CMIS_FTSParser extends Parser { RewriteRuleTokenStream stream_EOF=new RewriteRuleTokenStream(adaptor,"token EOF"); RewriteRuleSubtreeStream stream_ftsCmisDisjunction=new RewriteRuleSubtreeStream(adaptor,"rule ftsCmisDisjunction"); try { - // W:\\alfresco\\BRANCHES\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS_FTS.g:279:9: ( ftsCmisDisjunction EOF -> ftsCmisDisjunction ) - // W:\\alfresco\\BRANCHES\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS_FTS.g:280:9: ftsCmisDisjunction EOF + // 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(); @@ -263,7 +263,7 @@ public class CMIS_FTSParser extends Parser { }; // $ANTLR start "ftsCmisDisjunction" - // W:\\alfresco\\BRANCHES\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS_FTS.g:289:1: ftsCmisDisjunction : ftsCmisConjunction ( or ftsCmisConjunction )* -> ^( DISJUNCTION ( ftsCmisConjunction )+ ) ; + // 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); @@ -280,8 +280,8 @@ public class CMIS_FTSParser extends Parser { RewriteRuleSubtreeStream stream_ftsCmisConjunction=new RewriteRuleSubtreeStream(adaptor,"rule ftsCmisConjunction"); RewriteRuleSubtreeStream stream_or=new RewriteRuleSubtreeStream(adaptor,"rule or"); try { - // W:\\alfresco\\BRANCHES\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS_FTS.g:290:9: ( ftsCmisConjunction ( or ftsCmisConjunction )* -> ^( DISJUNCTION ( ftsCmisConjunction )+ ) ) - // W:\\alfresco\\BRANCHES\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS_FTS.g:291:9: ftsCmisConjunction ( or ftsCmisConjunction )* + // 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(); @@ -289,7 +289,7 @@ public class CMIS_FTSParser extends Parser { state._fsp--; stream_ftsCmisConjunction.add(ftsCmisConjunction3.getTree()); - // W:\\alfresco\\BRANCHES\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS_FTS.g:291:28: ( or ftsCmisConjunction )* + // 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; @@ -302,7 +302,7 @@ public class CMIS_FTSParser extends Parser { switch (alt1) { case 1 : - // W:\\alfresco\\BRANCHES\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS_FTS.g:291:29: or ftsCmisConjunction + // 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(); @@ -340,7 +340,7 @@ public class CMIS_FTSParser extends Parser { root_0 = (Object)adaptor.nil(); // 292:17: -> ^( DISJUNCTION ( ftsCmisConjunction )+ ) { - // W:\\alfresco\\BRANCHES\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS_FTS.g:293:25: ^( 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); @@ -385,7 +385,7 @@ public class CMIS_FTSParser extends Parser { }; // $ANTLR start "ftsCmisConjunction" - // W:\\alfresco\\BRANCHES\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS_FTS.g:296:1: ftsCmisConjunction : ( ftsCmisPrefixed )+ -> ^( CONJUNCTION ( ftsCmisPrefixed )+ ) ; + // 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); @@ -397,10 +397,10 @@ public class CMIS_FTSParser extends Parser { RewriteRuleSubtreeStream stream_ftsCmisPrefixed=new RewriteRuleSubtreeStream(adaptor,"rule ftsCmisPrefixed"); try { - // W:\\alfresco\\BRANCHES\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS_FTS.g:297:9: ( ( ftsCmisPrefixed )+ -> ^( CONJUNCTION ( ftsCmisPrefixed )+ ) ) - // W:\\alfresco\\BRANCHES\\V3.3\\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: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\\V3.3\\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 { @@ -414,7 +414,7 @@ public class CMIS_FTSParser extends Parser { switch (alt2) { case 1 : - // W:\\alfresco\\BRANCHES\\V3.3\\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 { pushFollow(FOLLOW_ftsCmisPrefixed_in_ftsCmisConjunction341); ftsCmisPrefixed6=ftsCmisPrefixed(); @@ -450,7 +450,7 @@ public class CMIS_FTSParser extends Parser { root_0 = (Object)adaptor.nil(); // 299:17: -> ^( CONJUNCTION ( ftsCmisPrefixed )+ ) { - // W:\\alfresco\\BRANCHES\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS_FTS.g:300:25: ^( 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); @@ -495,7 +495,7 @@ public class CMIS_FTSParser extends Parser { }; // $ANTLR start "ftsCmisPrefixed" - // W:\\alfresco\\BRANCHES\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS_FTS.g:303:1: ftsCmisPrefixed : ( cmisTest -> ^( DEFAULT cmisTest ) | MINUS cmisTest -> ^( EXCLUDE cmisTest ) ); + // 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); @@ -512,7 +512,7 @@ public class CMIS_FTSParser extends Parser { RewriteRuleTokenStream stream_MINUS=new RewriteRuleTokenStream(adaptor,"token MINUS"); RewriteRuleSubtreeStream stream_cmisTest=new RewriteRuleSubtreeStream(adaptor,"rule cmisTest"); try { - // W:\\alfresco\\BRANCHES\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS_FTS.g:304:9: ( cmisTest -> ^( DEFAULT cmisTest ) | MINUS cmisTest -> ^( EXCLUDE cmisTest ) ) + // 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); @@ -530,7 +530,7 @@ public class CMIS_FTSParser extends Parser { } switch (alt3) { case 1 : - // W:\\alfresco\\BRANCHES\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS_FTS.g:305:9: cmisTest + // 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(); @@ -553,7 +553,7 @@ public class CMIS_FTSParser extends Parser { root_0 = (Object)adaptor.nil(); // 306:17: -> ^( DEFAULT cmisTest ) { - // W:\\alfresco\\BRANCHES\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS_FTS.g:307:25: ^( 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); @@ -569,7 +569,7 @@ public class CMIS_FTSParser extends Parser { } break; case 2 : - // W:\\alfresco\\BRANCHES\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS_FTS.g:308:11: MINUS cmisTest + // 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); @@ -595,7 +595,7 @@ public class CMIS_FTSParser extends Parser { root_0 = (Object)adaptor.nil(); // 309:17: -> ^( EXCLUDE cmisTest ) { - // W:\\alfresco\\BRANCHES\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS_FTS.g:310:25: ^( 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); @@ -635,7 +635,7 @@ public class CMIS_FTSParser extends Parser { }; // $ANTLR start "cmisTest" - // W:\\alfresco\\BRANCHES\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS_FTS.g:313:1: cmisTest : ( cmisTerm -> ^( TERM cmisTerm ) | cmisPhrase -> ^( PHRASE cmisPhrase ) ); + // 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); @@ -650,7 +650,7 @@ public class CMIS_FTSParser extends Parser { RewriteRuleSubtreeStream stream_cmisPhrase=new RewriteRuleSubtreeStream(adaptor,"rule cmisPhrase"); RewriteRuleSubtreeStream stream_cmisTerm=new RewriteRuleSubtreeStream(adaptor,"rule cmisTerm"); try { - // W:\\alfresco\\BRANCHES\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS_FTS.g:314:9: ( cmisTerm -> ^( TERM cmisTerm ) | cmisPhrase -> ^( PHRASE cmisPhrase ) ) + // 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); @@ -668,7 +668,7 @@ public class CMIS_FTSParser extends Parser { } switch (alt4) { case 1 : - // W:\\alfresco\\BRANCHES\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS_FTS.g:315:9: cmisTerm + // 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(); @@ -691,7 +691,7 @@ public class CMIS_FTSParser extends Parser { root_0 = (Object)adaptor.nil(); // 316:17: -> ^( TERM cmisTerm ) { - // W:\\alfresco\\BRANCHES\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS_FTS.g:317:25: ^( 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); @@ -707,7 +707,7 @@ public class CMIS_FTSParser extends Parser { } break; case 2 : - // W:\\alfresco\\BRANCHES\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS_FTS.g:318:11: cmisPhrase + // 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(); @@ -730,7 +730,7 @@ public class CMIS_FTSParser extends Parser { root_0 = (Object)adaptor.nil(); // 319:17: -> ^( PHRASE cmisPhrase ) { - // W:\\alfresco\\BRANCHES\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS_FTS.g:320:25: ^( 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); @@ -770,7 +770,7 @@ public class CMIS_FTSParser extends Parser { }; // $ANTLR start "cmisTerm" - // W:\\alfresco\\BRANCHES\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS_FTS.g:324:1: cmisTerm : FTSWORD -> FTSWORD ; + // 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); @@ -783,8 +783,8 @@ public class CMIS_FTSParser extends Parser { RewriteRuleTokenStream stream_FTSWORD=new RewriteRuleTokenStream(adaptor,"token FTSWORD"); try { - // W:\\alfresco\\BRANCHES\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS_FTS.g:325:9: ( FTSWORD -> FTSWORD ) - // W:\\alfresco\\BRANCHES\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS_FTS.g:326:9: FTSWORD + // 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); @@ -834,7 +834,7 @@ public class CMIS_FTSParser extends Parser { }; // $ANTLR start "cmisPhrase" - // W:\\alfresco\\BRANCHES\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS_FTS.g:330:1: cmisPhrase : FTSPHRASE -> FTSPHRASE ; + // 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); @@ -847,8 +847,8 @@ public class CMIS_FTSParser extends Parser { RewriteRuleTokenStream stream_FTSPHRASE=new RewriteRuleTokenStream(adaptor,"token FTSPHRASE"); try { - // W:\\alfresco\\BRANCHES\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS_FTS.g:331:9: ( FTSPHRASE -> FTSPHRASE ) - // W:\\alfresco\\BRANCHES\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS_FTS.g:332:9: FTSPHRASE + // 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); @@ -898,7 +898,7 @@ public class CMIS_FTSParser extends Parser { }; // $ANTLR start "or" - // W:\\alfresco\\BRANCHES\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS_FTS.g:336:1: or : 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); @@ -910,8 +910,8 @@ public class CMIS_FTSParser extends Parser { Object OR14_tree=null; try { - // W:\\alfresco\\BRANCHES\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS_FTS.g:337:9: ( OR ) - // W:\\alfresco\\BRANCHES\\V3.3\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS_FTS.g:338:9: OR + // 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();