diff --git a/source/java/org/alfresco/cmis/CMISQueryOptions.java b/source/java/org/alfresco/cmis/CMISQueryOptions.java
index 0034e9fd63..e3cc2e608a 100644
--- a/source/java/org/alfresco/cmis/CMISQueryOptions.java
+++ b/source/java/org/alfresco/cmis/CMISQueryOptions.java
@@ -20,14 +20,13 @@ package org.alfresco.cmis;
 
 import java.util.Locale;
 
-import org.springframework.extensions.surf.util.I18NUtil;
 import org.alfresco.repo.search.impl.querymodel.QueryOptions;
-import org.alfresco.repo.search.impl.querymodel.QueryOptions.Connective;
 import org.alfresco.service.cmr.repository.StoreRef;
 import org.alfresco.service.cmr.search.LimitBy;
 import org.alfresco.service.cmr.search.QueryParameterDefinition;
 import org.alfresco.service.cmr.search.SearchParameters;
 import org.alfresco.service.cmr.search.SearchService;
+import org.springframework.extensions.surf.util.I18NUtil;
 
 /**
  * The options for a CMIS query
diff --git a/source/java/org/alfresco/cmis/mapping/AbstractSimpleProperty.java b/source/java/org/alfresco/cmis/mapping/AbstractSimpleProperty.java
index 524f617f62..03b6cf2250 100644
--- a/source/java/org/alfresco/cmis/mapping/AbstractSimpleProperty.java
+++ b/source/java/org/alfresco/cmis/mapping/AbstractSimpleProperty.java
@@ -19,7 +19,6 @@
 package org.alfresco.cmis.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;
@@ -27,7 +26,6 @@ import org.alfresco.repo.search.impl.lucene.LuceneQueryParserAdaptor;
 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;
 
 /**
diff --git a/source/java/org/alfresco/cmis/mapping/AbstractVersioningProperty.java b/source/java/org/alfresco/cmis/mapping/AbstractVersioningProperty.java
index 69a5bec3b2..f28b994fd3 100644
--- a/source/java/org/alfresco/cmis/mapping/AbstractVersioningProperty.java
+++ b/source/java/org/alfresco/cmis/mapping/AbstractVersioningProperty.java
@@ -69,6 +69,7 @@ public abstract class AbstractVersioningProperty extends AbstractProperty
         return getServiceRegistry().getCheckOutCheckInService().isWorkingCopy(nodeRef);
     }
     
+    @SuppressWarnings("deprecation")
     public boolean isImmutable(NodeRef nodeRef)
     {
         return getServiceRegistry().getLockService().getLockType(nodeRef) == LockType.READ_ONLY_LOCK;
diff --git a/source/java/org/alfresco/cmis/mapping/BaseTypeIdProperty.java b/source/java/org/alfresco/cmis/mapping/BaseTypeIdProperty.java
index cca2c87c17..8c09f1ff7b 100644
--- a/source/java/org/alfresco/cmis/mapping/BaseTypeIdProperty.java
+++ b/source/java/org/alfresco/cmis/mapping/BaseTypeIdProperty.java
@@ -19,13 +19,11 @@
 package org.alfresco.cmis.mapping;
 
 import java.io.Serializable;
-import java.util.Collection;
 
 import org.alfresco.cmis.CMISDictionaryModel;
 import org.alfresco.cmis.CMISQueryException;
 import org.alfresco.cmis.CMISScope;
 import org.alfresco.cmis.CMISTypeDefinition;
-import org.alfresco.repo.search.impl.lucene.AbstractLuceneQueryParser;
 import org.alfresco.repo.search.impl.lucene.AnalysisMode;
 import org.alfresco.repo.search.impl.lucene.LuceneFunction;
 import org.alfresco.repo.search.impl.lucene.LuceneQueryParserAdaptor;
@@ -35,12 +33,6 @@ 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.Term;
-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;
 
 /**
  * Get the CMIS object type id property
diff --git a/source/java/org/alfresco/cmis/mapping/CMISMapping.java b/source/java/org/alfresco/cmis/mapping/CMISMapping.java
index 3a6ab5f723..583a73d230 100644
--- a/source/java/org/alfresco/cmis/mapping/CMISMapping.java
+++ b/source/java/org/alfresco/cmis/mapping/CMISMapping.java
@@ -37,6 +37,9 @@ import org.alfresco.cmis.CMISPropertyId;
 import org.alfresco.cmis.CMISScope;
 import org.alfresco.cmis.CMISServices;
 import org.alfresco.cmis.CMISTypeId;
+import org.alfresco.cmis.mapping.ParentTypeActionEvaluator.ParentTypeEnum;
+import org.alfresco.cmis.mapping.PropertyActionEvaluator.PropertyDescriptor;
+import org.alfresco.cmis.mapping.TypeAttributeActionEvaluator.TypeDefinitionAttributeEnum;
 import org.alfresco.error.AlfrescoRuntimeException;
 import org.alfresco.model.ContentModel;
 import org.alfresco.opencmis.CMISAccessControlFormatEnum;
@@ -55,9 +58,6 @@ import org.alfresco.util.Pair;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.springframework.beans.factory.InitializingBean;
-import org.alfresco.cmis.mapping.ParentTypeActionEvaluator.ParentTypeEnum;
-import org.alfresco.cmis.mapping.PropertyActionEvaluator.PropertyDescriptor;
-import org.alfresco.cmis.mapping.TypeAttributeActionEvaluator.TypeDefinitionAttributeEnum;
 
 
 /**
@@ -140,6 +140,7 @@ public class CMISMapping implements InitializingBean
      * (non-Javadoc)
      * @see org.springframework.beans.factory.InitializingBean#afterPropertiesSet()
      */
+    @SuppressWarnings("deprecation")
     public void afterPropertiesSet() throws Exception
     {
         //
diff --git a/source/java/org/alfresco/cmis/mapping/CMISServicesImpl.java b/source/java/org/alfresco/cmis/mapping/CMISServicesImpl.java
index f3231cdf30..809d1c0566 100644
--- a/source/java/org/alfresco/cmis/mapping/CMISServicesImpl.java
+++ b/source/java/org/alfresco/cmis/mapping/CMISServicesImpl.java
@@ -68,7 +68,6 @@ import org.alfresco.query.PagingRequest;
 import org.alfresco.query.PagingResults;
 import org.alfresco.repo.model.Repository;
 import org.alfresco.repo.node.getchildren.GetChildrenCannedQuery;
-import org.alfresco.repo.search.QueryParameterDefImpl;
 import org.alfresco.repo.security.authentication.AuthenticationUtil;
 import org.alfresco.repo.security.authentication.AuthenticationUtil.RunAsWork;
 import org.alfresco.repo.security.permissions.AccessDeniedException;
@@ -94,7 +93,6 @@ import org.alfresco.service.cmr.repository.InvalidNodeRefException;
 import org.alfresco.service.cmr.repository.NodeRef;
 import org.alfresco.service.cmr.repository.NodeService;
 import org.alfresco.service.cmr.repository.StoreRef;
-import org.alfresco.service.cmr.search.QueryParameterDefinition;
 import org.alfresco.service.cmr.search.ResultSet;
 import org.alfresco.service.cmr.search.SearchParameters;
 import org.alfresco.service.cmr.search.SearchService;
@@ -159,7 +157,9 @@ public class CMISServicesImpl implements CMISServices, ApplicationContextAware,
     private Map<String, NodeRef> defaultRootNodeRefs;
     
     // data types for query
+    @SuppressWarnings("unused")
     private DataTypeDefinition nodeRefDataType;
+    @SuppressWarnings("unused")
     private DataTypeDefinition textDataType;
     
     
diff --git a/source/java/org/alfresco/cmis/mapping/CanCheckInActionEvaluator.java b/source/java/org/alfresco/cmis/mapping/CanCheckInActionEvaluator.java
index 18a134a574..5592e0d872 100644
--- a/source/java/org/alfresco/cmis/mapping/CanCheckInActionEvaluator.java
+++ b/source/java/org/alfresco/cmis/mapping/CanCheckInActionEvaluator.java
@@ -34,13 +34,13 @@ public class CanCheckInActionEvaluator extends AbstractActionEvaluator<NodeRef>
 {
     private NodeService nodeService;
 
-    private PermissionActionEvaluator permissionEvaluator;
+    private PermissionActionEvaluator<NodeRef> permissionEvaluator;
 
     protected CanCheckInActionEvaluator(ServiceRegistry serviceRegistry)
     {
         super(serviceRegistry, CMISAllowedActionEnum.CAN_CHECKIN);
 
-        permissionEvaluator = new PermissionActionEvaluator(serviceRegistry, CMISAllowedActionEnum.CAN_CHECKIN, false, PermissionService.CHECK_IN);
+        permissionEvaluator = new PermissionActionEvaluator<NodeRef>(serviceRegistry, CMISAllowedActionEnum.CAN_CHECKIN, false, PermissionService.CHECK_IN);
 
         nodeService = serviceRegistry.getNodeService();
     }
diff --git a/source/java/org/alfresco/cmis/mapping/DirectProperty.java b/source/java/org/alfresco/cmis/mapping/DirectProperty.java
index 3f10129b29..03eb62fc16 100644
--- a/source/java/org/alfresco/cmis/mapping/DirectProperty.java
+++ b/source/java/org/alfresco/cmis/mapping/DirectProperty.java
@@ -19,12 +19,7 @@
 package org.alfresco.cmis.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.impl.lucene.LuceneQueryParserAdaptor;
 import org.alfresco.repo.search.impl.lucene.analysis.DateTimeAnalyser;
 import org.alfresco.service.ServiceRegistry;
@@ -35,7 +30,6 @@ 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.exceptions.CmisInvalidArgumentException;
-import org.springframework.extensions.surf.util.I18NUtil;
 
 /**
  * A simple 1-1 property mapping from a CMIS property name to an alfresco property
@@ -94,7 +88,6 @@ public class DirectProperty extends AbstractSimpleProperty
 
         String field = getLuceneFieldName();
         // need to find the real field to use
-        Locale sortLocale = null;
 
         PropertyDefinition propertyDef = getServiceRegistry().getDictionaryService().getProperty(QName.createQName(field.substring(1)));
 
@@ -104,63 +97,7 @@ public class DirectProperty extends AbstractSimpleProperty
         }
         else if ((propertyDef.getDataType().getName().equals(DataTypeDefinition.MLTEXT)) || (propertyDef.getDataType().getName().equals(DataTypeDefinition.TEXT)))
         {
-//            List<Locale> locales = lqpa.getSearchParameters().getLocales();
-//            if (((locales == null) || (locales.size() == 0)))
-//            {
-//                locales = Collections.singletonList(I18NUtil.getLocale());
-//            }
-//
-//            if (locales.size() > 1)
-//            {
-//                throw new CmisInvalidArgumentException("Order on text/mltext properties with more than one locale is not curently supported");
-//            }
-//
-//            sortLocale = locales.get(0);
-//            // find best field match
-//
-//            HashSet<String> allowableLocales = new HashSet<String>();
-//            MLAnalysisMode analysisMode = lqpa.getDefaultSearchMLAnalysisMode();
-//            for (Locale l : MLAnalysisMode.getLocales(analysisMode, sortLocale, false))
-//            {
-//                allowableLocales.add(l.toString());
-//            }
-
             field = lqpa.getSortField(field);
-//            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))
         {
@@ -174,74 +111,6 @@ public class DirectProperty extends AbstractSimpleProperty
         return field;
     }
 
-    /**
-     * @param lqp
-     * @param field
-     * @return
-     */
-//    private <Q, S, E extends Throwable> String findSortField(LuceneQueryParserAdaptor<Q, S, E> lqpa, String field)
-//    {
-//        Locale sortLocale;
-//        List<Locale> locales = lqpa.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<String> allowableLocales = new HashSet<String>();
-//        MLAnalysisMode analysisMode = lqpa.getDefaultSearchMLAnalysisMode();
-//        for (Locale l : MLAnalysisMode.getLocales(analysisMode, sortLocale, false))
-//        {
-//            allowableLocales.add(l.toString());
-//        }
-//        
-//        field = lqpa.getSortField(field);
-//
-//        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;
-//        return field;
-//    }
-
     private QName alfrescoName;
 
     /**
diff --git a/source/java/org/alfresco/cmis/mapping/FixedValueProperty.java b/source/java/org/alfresco/cmis/mapping/FixedValueProperty.java
index 323279467b..683c1a3e38 100644
--- a/source/java/org/alfresco/cmis/mapping/FixedValueProperty.java
+++ b/source/java/org/alfresco/cmis/mapping/FixedValueProperty.java
@@ -19,11 +19,9 @@
 package org.alfresco.cmis.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.AbstractLuceneQueryParser;
 import org.alfresco.repo.search.impl.lucene.LuceneFunction;
 import org.alfresco.repo.search.impl.lucene.LuceneQueryParserAdaptor;
 import org.alfresco.repo.search.impl.querymodel.PredicateMode;
@@ -33,10 +31,6 @@ 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.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)
@@ -134,6 +128,7 @@ public class FixedValueProperty extends AbstractProperty
     {
         if (value instanceof Comparable)
         {
+            @SuppressWarnings("rawtypes")
             Comparable comparable = (Comparable) value;
             if (comparable.compareTo(fixedValue) > 0)
             {
@@ -159,6 +154,7 @@ public class FixedValueProperty extends AbstractProperty
     {
         if (value instanceof Comparable)
         {
+            @SuppressWarnings("rawtypes")
             Comparable comparable = (Comparable) value;
             if (comparable.compareTo(fixedValue) >= 0)
             {
@@ -184,6 +180,7 @@ public class FixedValueProperty extends AbstractProperty
     {
         if (value instanceof Comparable)
         {
+            @SuppressWarnings("rawtypes")
             Comparable comparable = (Comparable) value;
             if (comparable.compareTo(fixedValue) < 0)
             {
@@ -209,6 +206,7 @@ public class FixedValueProperty extends AbstractProperty
     {
         if (value instanceof Comparable)
         {
+            @SuppressWarnings("rawtypes")
             Comparable comparable = (Comparable) value;
             if (comparable.compareTo(fixedValue) <= 0)
             {
diff --git a/source/java/org/alfresco/cmis/mapping/ObjectIdProperty.java b/source/java/org/alfresco/cmis/mapping/ObjectIdProperty.java
index 96ffd2a034..c5ce322e44 100644
--- a/source/java/org/alfresco/cmis/mapping/ObjectIdProperty.java
+++ b/source/java/org/alfresco/cmis/mapping/ObjectIdProperty.java
@@ -20,13 +20,11 @@ package org.alfresco.cmis.mapping;
 
 import java.io.Serializable;
 import java.util.ArrayList;
-import java.util.Collection;
 
 import org.alfresco.cmis.CMISDictionaryModel;
 import org.alfresco.cmis.CMISQueryException;
 import org.alfresco.cmis.CMISServices;
 import org.alfresco.model.ContentModel;
-import org.alfresco.repo.search.impl.lucene.AbstractLuceneQueryParser;
 import org.alfresco.repo.search.impl.lucene.AnalysisMode;
 import org.alfresco.repo.search.impl.lucene.LuceneFunction;
 import org.alfresco.repo.search.impl.lucene.LuceneQueryParserAdaptor;
@@ -37,12 +35,6 @@ import org.alfresco.service.cmr.repository.AssociationRef;
 import org.alfresco.service.cmr.repository.NodeRef;
 import org.alfresco.service.cmr.repository.StoreRef;
 import org.alfresco.service.cmr.repository.datatype.DefaultTypeConverter;
-import org.apache.lucene.index.Term;
-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.
diff --git a/source/java/org/alfresco/cmis/mapping/ObjectTypeIdProperty.java b/source/java/org/alfresco/cmis/mapping/ObjectTypeIdProperty.java
index c48e1a46dc..856fef2dd4 100644
--- a/source/java/org/alfresco/cmis/mapping/ObjectTypeIdProperty.java
+++ b/source/java/org/alfresco/cmis/mapping/ObjectTypeIdProperty.java
@@ -19,14 +19,11 @@
 package org.alfresco.cmis.mapping;
 
 import java.io.Serializable;
-import java.util.ArrayList;
-import java.util.Collection;
 
 import org.alfresco.cmis.CMISDictionaryModel;
 import org.alfresco.cmis.CMISQueryException;
 import org.alfresco.cmis.CMISScope;
 import org.alfresco.cmis.CMISTypeDefinition;
-import org.alfresco.repo.search.impl.lucene.AbstractLuceneQueryParser;
 import org.alfresco.repo.search.impl.lucene.AnalysisMode;
 import org.alfresco.repo.search.impl.lucene.LuceneFunction;
 import org.alfresco.repo.search.impl.lucene.LuceneQueryParserAdaptor;
@@ -36,12 +33,6 @@ 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.Term;
-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;
 
 /**
  * Get the CMIS object type id property
diff --git a/source/java/org/alfresco/cmis/mapping/ParentProperty.java b/source/java/org/alfresco/cmis/mapping/ParentProperty.java
index 53e2e59b17..d0b36d2259 100644
--- a/source/java/org/alfresco/cmis/mapping/ParentProperty.java
+++ b/source/java/org/alfresco/cmis/mapping/ParentProperty.java
@@ -19,11 +19,8 @@
 package org.alfresco.cmis.mapping;
 
 import java.io.Serializable;
-import java.util.ArrayList;
-import java.util.Collection;
 
 import org.alfresco.cmis.CMISDictionaryModel;
-import org.alfresco.repo.search.impl.lucene.AbstractLuceneQueryParser;
 import org.alfresco.repo.search.impl.lucene.AnalysisMode;
 import org.alfresco.repo.search.impl.lucene.LuceneFunction;
 import org.alfresco.repo.search.impl.lucene.LuceneQueryParserAdaptor;
@@ -32,14 +29,7 @@ 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.StoreRef;
 import org.alfresco.service.cmr.repository.datatype.DefaultTypeConverter;
-import org.apache.lucene.index.Term;
-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
@@ -93,32 +83,6 @@ public class ParentProperty extends AbstractProperty
         return asString;
     }
     
-    private <Q, S, E extends Throwable> StoreRef getStore(LuceneQueryParserAdaptor<Q, S, E> lqpa)
-    {
-        ArrayList<StoreRef> stores = lqpa.getSearchParameters().getStores();
-        if(stores.size() < 1)
-        {
-            // default
-            return StoreRef.STORE_REF_WORKSPACE_SPACESSTORE;
-        }
-        return stores.get(0);
-    }
-    
-    private <Q, S, E extends Throwable> String getValueAsString(LuceneQueryParserAdaptor<Q, S, E> lqpa, Serializable value)
-    {
-        String nodeRefStr = (String)value;
-        if(!NodeRef.isNodeRef((String)value))
-        {
-            // assume the value (object id) is the node guid
-            StoreRef storeRef = getStore(lqpa);
-            nodeRefStr = storeRef.toString() + "/" + (String)value;
-        }
-
-        Object converted = DefaultTypeConverter.INSTANCE.convert(getServiceRegistry().getDictionaryService().getDataType(DataTypeDefinition.NODE_REF), nodeRefStr);
-        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)
diff --git a/source/java/org/alfresco/cmis/mapping/ParentTypeActionEvaluator.java b/source/java/org/alfresco/cmis/mapping/ParentTypeActionEvaluator.java
index df1c81cd5f..8088763c59 100644
--- a/source/java/org/alfresco/cmis/mapping/ParentTypeActionEvaluator.java
+++ b/source/java/org/alfresco/cmis/mapping/ParentTypeActionEvaluator.java
@@ -27,6 +27,7 @@ import org.alfresco.service.cmr.repository.ChildAssociationRef;
 import org.alfresco.service.cmr.repository.NodeRef;
 import org.alfresco.service.cmr.repository.NodeService;
 import org.apache.chemistry.abdera.ext.CMISAllowableActions;
+import org.apache.chemistry.opencmis.commons.impl.jaxb.MultiFilingServicePort;
 
 /**
  * This evaluator determines an action availability in accordance with parent(s) of object. The rules are:<br />
diff --git a/source/java/org/alfresco/cmis/mapping/TypeAttributeActionEvaluator.java b/source/java/org/alfresco/cmis/mapping/TypeAttributeActionEvaluator.java
index c42ae939d0..b58f4597ec 100644
--- a/source/java/org/alfresco/cmis/mapping/TypeAttributeActionEvaluator.java
+++ b/source/java/org/alfresco/cmis/mapping/TypeAttributeActionEvaluator.java
@@ -257,7 +257,7 @@ public class TypeAttributeActionEvaluator<ObjectType> extends AbstractActionEval
          * @return - {@link Boolean} value, which determines: <code>true</code> - actual attribute value satisfies all the conditions of the <code>comparator</code> parameter,
          *         <code>false</code> - actual attribute value doesn't satisfy conditions of the <code>comparator</code> parameter
          */
-        @SuppressWarnings("unchecked")
+        @SuppressWarnings("rawtypes")
         public boolean satisfies(CMISTypeDefinition typeDefinition, Pair<Object, Comparable<Object>> comparator, boolean nullExpected, boolean defaultAllowing)
         {
             if (null == typeDefinition)
diff --git a/source/java/org/alfresco/cmis/search/CMISFTSQueryParser.java b/source/java/org/alfresco/cmis/search/CMISFTSQueryParser.java
index c71774fd8e..6d0af0a4b2 100644
--- a/source/java/org/alfresco/cmis/search/CMISFTSQueryParser.java
+++ b/source/java/org/alfresco/cmis/search/CMISFTSQueryParser.java
@@ -50,6 +50,7 @@ import org.antlr.runtime.tree.Tree;
 
 public class CMISFTSQueryParser
 {
+    @SuppressWarnings("unused")
     static public Constraint buildFTS(String ftsExpression, QueryModelFactory factory, FunctionEvaluationContext functionEvaluationContext, Selector selector,
             Map<String, Column> columnMap, String defaultField)
     {
diff --git a/source/java/org/alfresco/cmis/search/CMISQueryParser.java b/source/java/org/alfresco/cmis/search/CMISQueryParser.java
index 1d383f8b7e..d782087f0e 100644
--- a/source/java/org/alfresco/cmis/search/CMISQueryParser.java
+++ b/source/java/org/alfresco/cmis/search/CMISQueryParser.java
@@ -120,6 +120,7 @@ public class CMISQueryParser
         this.validScopes = (options.getQueryMode() == CMISQueryMode.CMS_STRICT) ? CmisFunctionEvaluationContext.STRICT_SCOPES : CmisFunctionEvaluationContext.ALFRESCO_SCOPES;
     }
 
+    @SuppressWarnings("unused")
     public Query parse(QueryModelFactory factory, FunctionEvaluationContext functionEvaluationContext)
     {
 
diff --git a/source/java/org/alfresco/cmis/search/CmisFunctionEvaluationContext.java b/source/java/org/alfresco/cmis/search/CmisFunctionEvaluationContext.java
index 90107b3af5..fed52dfbf9 100644
--- a/source/java/org/alfresco/cmis/search/CmisFunctionEvaluationContext.java
+++ b/source/java/org/alfresco/cmis/search/CmisFunctionEvaluationContext.java
@@ -30,8 +30,6 @@ import org.alfresco.cmis.CMISPropertyDefinition;
 import org.alfresco.cmis.CMISQueryException;
 import org.alfresco.cmis.CMISScope;
 import org.alfresco.cmis.CMISTypeDefinition;
-import org.alfresco.opencmis.dictionary.PropertyDefinitionWrapper;
-import org.alfresco.opencmis.dictionary.TypeDefinitionWrapper;
 import org.alfresco.repo.search.impl.lucene.AbstractLuceneQueryParser;
 import org.alfresco.repo.search.impl.lucene.LuceneFunction;
 import org.alfresco.repo.search.impl.lucene.LuceneQueryParserAdaptor;
@@ -47,11 +45,11 @@ import org.alfresco.service.cmr.repository.NodeRef;
 import org.alfresco.service.cmr.repository.NodeService;
 import org.alfresco.service.namespace.QName;
 import org.apache.chemistry.opencmis.commons.exceptions.CmisInvalidArgumentException;
-import org.apache.lucene.search.Query;
 
 /**
  * @author andyh
  */
+@SuppressWarnings("deprecation")
 public class CmisFunctionEvaluationContext implements FunctionEvaluationContext
 {
     private static HashSet<String> EXPOSED_FIELDS = new HashSet<String>();
diff --git a/source/java/org/alfresco/repo/search/SearcherComponent.java b/source/java/org/alfresco/repo/search/SearcherComponent.java
index 4e2d2def8f..eb25c05bd9 100644
--- a/source/java/org/alfresco/repo/search/SearcherComponent.java
+++ b/source/java/org/alfresco/repo/search/SearcherComponent.java
@@ -23,7 +23,6 @@ import java.util.List;
 
 import org.alfresco.service.cmr.repository.InvalidNodeRefException;
 import org.alfresco.service.cmr.repository.NodeRef;
-import org.alfresco.service.cmr.repository.Path;
 import org.alfresco.service.cmr.repository.StoreRef;
 import org.alfresco.service.cmr.repository.XPathException;
 import org.alfresco.service.cmr.search.QueryParameter;
diff --git a/source/java/org/alfresco/repo/search/impl/NodeSearcher.java b/source/java/org/alfresco/repo/search/impl/NodeSearcher.java
index fd823b14ed..e51b2c4de2 100644
--- a/source/java/org/alfresco/repo/search/impl/NodeSearcher.java
+++ b/source/java/org/alfresco/repo/search/impl/NodeSearcher.java
@@ -127,6 +127,7 @@ public class NodeSearcher
             {
                 nsXPath.addNamespace(prefix, namespacePrefixResolver.getNamespaceURI(prefix));
             }
+            @SuppressWarnings("rawtypes")
             List list = nsXPath.selectNodes(nodeService.getPrimaryParent(contextNodeRef));
             HashSet<NodeRef> unique = new HashSet<NodeRef>(list.size());
             for (Object o : list)
@@ -183,7 +184,7 @@ public class NodeSearcher
             this.order = order;
         }
         
-        @SuppressWarnings("unchecked")
+        @SuppressWarnings({ "unchecked", "rawtypes" })
         public int compare(NodeRef n1, NodeRef n2)
         {
             for (AttributeOrder attributeOrder : order)
@@ -244,6 +245,7 @@ public class NodeSearcher
             {
                 nsXPath.addNamespace(prefix, namespacePrefixResolver.getNamespaceURI(prefix));
             }
+            @SuppressWarnings("rawtypes")
             List list = nsXPath.selectNodes(nodeService.getPrimaryParent(contextNodeRef));
             List<Serializable> answer = new ArrayList<Serializable>(list.size());
             for (Object o : list)
diff --git a/source/java/org/alfresco/repo/search/impl/querymodel/impl/lucene/LuceneQueryEngine.java b/source/java/org/alfresco/repo/search/impl/querymodel/impl/lucene/LuceneQueryEngine.java
index 160c1fd78e..b458d7e40b 100644
--- a/source/java/org/alfresco/repo/search/impl/querymodel/impl/lucene/LuceneQueryEngine.java
+++ b/source/java/org/alfresco/repo/search/impl/querymodel/impl/lucene/LuceneQueryEngine.java
@@ -57,6 +57,7 @@ import org.apache.lucene.search.SortField;
 /**
  * @author andyh
  */
+@SuppressWarnings("deprecation")
 public class LuceneQueryEngine implements QueryEngine
 {
     protected static final Log logger = LogFactory.getLog(LuceneQueryEngine.class);
@@ -122,7 +123,7 @@ public class LuceneQueryEngine implements QueryEngine
 
     public QueryModelFactory getQueryModelFactory()
     {
-        return new LuceneQueryModelFactory();
+        return new LuceneQueryModelFactory<org.apache.lucene.search.Query, Sort, ParseException>();
     }
     
     /**
diff --git a/source/java/org/alfresco/repo/search/results/ResultSetSPIWrapper.java b/source/java/org/alfresco/repo/search/results/ResultSetSPIWrapper.java
index e06860c860..cd6f31ddfb 100644
--- a/source/java/org/alfresco/repo/search/results/ResultSetSPIWrapper.java
+++ b/source/java/org/alfresco/repo/search/results/ResultSetSPIWrapper.java
@@ -18,7 +18,6 @@
  */
 package org.alfresco.repo.search.results;
 
-import java.util.Collections;
 import java.util.Iterator;
 import java.util.List;
 
diff --git a/source/java/org/alfresco/repo/search/results/SortedResultSet.java b/source/java/org/alfresco/repo/search/results/SortedResultSet.java
index 0e0e2d5ac8..4e958ff657 100644
--- a/source/java/org/alfresco/repo/search/results/SortedResultSet.java
+++ b/source/java/org/alfresco/repo/search/results/SortedResultSet.java
@@ -27,7 +27,6 @@ import java.util.Iterator;
 import java.util.List;
 import java.util.Locale;
 
-import org.alfresco.error.AlfrescoRuntimeException;
 import org.alfresco.repo.search.SearcherException;
 import org.alfresco.repo.search.impl.lucene.LuceneResultSetRow;
 import org.alfresco.service.cmr.dictionary.DataTypeDefinition;
@@ -333,6 +332,7 @@ public class SortedResultSet implements ResultSet
             this.locale = locale;
         }
 
+        @SuppressWarnings({ "rawtypes", "unchecked" })
         public int compare(NodeRefAndScore n1, NodeRefAndScore n2)
         {
             // Treat missing nodes as null for comparison