From 94569df2e833a271c5978714593d69cc9ebbdbf7 Mon Sep 17 00:00:00 2001 From: Chris Shields Date: Tue, 21 Jul 2020 10:43:24 +0100 Subject: [PATCH] Moved data-model master into its own directory --- .gitattributes => data-model/.gitattributes | 0 .gitbugtraq => data-model/.gitbugtraq | 0 .gitignore => data-model/.gitignore | 0 .travis.settings.xml => data-model/.travis.settings.xml | 0 .travis.yml => data-model/.travis.yml | 0 .whitesource => data-model/.whitesource | 0 .wss-unified-agent.config => data-model/.wss-unified-agent.config | 0 CONTRIBUTING.md => data-model/CONTRIBUTING.md | 0 LICENSE.txt => data-model/LICENSE.txt | 0 README.md => data-model/README.md | 0 l10n.properties => data-model/l10n.properties | 0 pom.xml => data-model/pom.xml | 0 .../src}/main/java/org/alfresco/encoding/TikaCharsetFinder.java | 0 .../src}/main/java/org/alfresco/model/ContentModel.java | 0 .../src}/main/java/org/alfresco/model/RenditionModel.java | 0 .../java/org/alfresco/opencmis/CMISAccessControlFormatEnum.java | 0 .../src}/main/java/org/alfresco/opencmis/CMISUtils.java | 0 .../src}/main/java/org/alfresco/opencmis/EnumFactory.java | 0 .../src}/main/java/org/alfresco/opencmis/EnumLabel.java | 0 .../opencmis/dictionary/AbstractTypeDefinitionWrapper.java | 0 .../opencmis/dictionary/BasePropertyDefintionWrapper.java | 0 .../opencmis/dictionary/CMISAbstractDictionaryService.java | 0 .../org/alfresco/opencmis/dictionary/CMISActionEvaluator.java | 0 .../org/alfresco/opencmis/dictionary/CMISDictionaryRegistry.java | 0 .../alfresco/opencmis/dictionary/CMISDictionaryRegistryImpl.java | 0 .../org/alfresco/opencmis/dictionary/CMISDictionaryService.java | 0 .../main/java/org/alfresco/opencmis/dictionary/CMISNodeInfo.java | 0 .../java/org/alfresco/opencmis/dictionary/CMISObjectVariant.java | 0 .../org/alfresco/opencmis/dictionary/CMISPropertyAccessor.java | 0 .../alfresco/opencmis/dictionary/CMISPropertyLuceneBuilder.java | 0 .../alfresco/opencmis/dictionary/CMISStrictDictionaryService.java | 0 .../opencmis/dictionary/DocumentTypeDefinitionWrapper.java | 0 .../alfresco/opencmis/dictionary/FilteredDictionaryComponent.java | 0 .../alfresco/opencmis/dictionary/FolderTypeDefintionWrapper.java | 0 .../alfresco/opencmis/dictionary/ItemTypeDefinitionWrapper.java | 0 .../alfresco/opencmis/dictionary/PolicyTypeDefintionWrapper.java | 0 .../org/alfresco/opencmis/dictionary/PropertyAccessorMapping.java | 0 .../alfresco/opencmis/dictionary/PropertyDefinitionWrapper.java | 0 .../opencmis/dictionary/PropertyLuceneBuilderMapping.java | 0 .../main/java/org/alfresco/opencmis/dictionary/QNameFilter.java | 0 .../java/org/alfresco/opencmis/dictionary/QNameFilterImpl.java | 0 .../opencmis/dictionary/RelationshipTypeDefintionWrapper.java | 0 .../opencmis/dictionary/SecondaryTypeDefinitionWrapper.java | 0 .../alfresco/opencmis/dictionary/ShadowTypeDefinitionWrapper.java | 0 .../org/alfresco/opencmis/dictionary/TypeDefinitionWrapper.java | 0 .../alfresco/opencmis/mapping/AbstractSimpleLuceneBuilder.java | 0 .../java/org/alfresco/opencmis/mapping/BaseLuceneBuilder.java | 0 .../org/alfresco/opencmis/mapping/BaseTypeIdLuceneBuilder.java | 0 .../src}/main/java/org/alfresco/opencmis/mapping/CMISMapping.java | 0 .../opencmis/mapping/ContentStreamLengthLuceneBuilder.java | 0 .../opencmis/mapping/ContentStreamMimetypeLuceneBuilder.java | 0 .../java/org/alfresco/opencmis/mapping/DirectLuceneBuilder.java | 0 .../org/alfresco/opencmis/mapping/FixedValueLuceneBuilder.java | 0 .../org/alfresco/opencmis/mapping/NotSupportedLuceneBuilder.java | 0 .../java/org/alfresco/opencmis/mapping/ObjectIdLuceneBuilder.java | 0 .../org/alfresco/opencmis/mapping/ObjectTypeIdLuceneBuilder.java | 0 .../java/org/alfresco/opencmis/mapping/ParentLuceneBuilder.java | 0 .../opencmis/mapping/RuntimePropertyLuceneBuilderMapping.java | 0 .../java/org/alfresco/opencmis/search/CMISFTSQueryParser.java | 0 .../main/java/org/alfresco/opencmis/search/CMISQueryOptions.java | 0 .../main/java/org/alfresco/opencmis/search/CMISQueryParser.java | 0 .../alfresco/opencmis/search/CmisFunctionEvaluationContext.java | 0 .../src}/main/java/org/alfresco/repo/cache/LockingCache.java | 0 .../src}/main/java/org/alfresco/repo/cache/MemoryCache.java | 0 .../src}/main/java/org/alfresco/repo/cache/SimpleCache.java | 0 .../src}/main/java/org/alfresco/repo/content/ContentContext.java | 0 .../src}/main/java/org/alfresco/repo/content/ContentStore.java | 0 .../main/java/org/alfresco/repo/content/ContentStoreCaps.java | 0 .../src}/main/java/org/alfresco/repo/content/MimetypeMap.java | 0 .../org/alfresco/repo/content/encoding/ContentCharsetFinder.java | 0 .../org/alfresco/repo/dictionary/AbstractDictionaryRegistry.java | 0 .../main/java/org/alfresco/repo/dictionary/CompiledModel.java | 0 .../java/org/alfresco/repo/dictionary/CompiledModelsCache.java | 0 .../org/alfresco/repo/dictionary/CoreDictionaryRegistryImpl.java | 0 .../org/alfresco/repo/dictionary/CustomModelDefinitionImpl.java | 0 .../main/java/org/alfresco/repo/dictionary/CustomModelsInfo.java | 0 .../java/org/alfresco/repo/dictionary/DelegateModelQuery.java | 0 .../java/org/alfresco/repo/dictionary/DictionaryBootstrap.java | 0 .../java/org/alfresco/repo/dictionary/DictionaryComponent.java | 0 .../main/java/org/alfresco/repo/dictionary/DictionaryDAO.java | 0 .../main/java/org/alfresco/repo/dictionary/DictionaryDAOImpl.java | 0 .../java/org/alfresco/repo/dictionary/DictionaryListener.java | 0 .../alfresco/repo/dictionary/DictionaryNamespaceComponent.java | 0 .../java/org/alfresco/repo/dictionary/DictionaryRegistry.java | 0 .../org/alfresco/repo/dictionary/ExtendedDictionaryListener.java | 0 .../src}/main/java/org/alfresco/repo/dictionary/Facetable.java | 0 .../java/org/alfresco/repo/dictionary/IndexTokenisationMode.java | 0 .../org/alfresco/repo/dictionary/M2AnonymousTypeDefinition.java | 0 .../src}/main/java/org/alfresco/repo/dictionary/M2Aspect.java | 0 .../java/org/alfresco/repo/dictionary/M2AspectDefinition.java | 0 .../main/java/org/alfresco/repo/dictionary/M2Association.java | 0 .../org/alfresco/repo/dictionary/M2AssociationDefinition.java | 0 .../java/org/alfresco/repo/dictionary/M2ChildAssociation.java | 0 .../alfresco/repo/dictionary/M2ChildAssociationDefinition.java | 0 .../src}/main/java/org/alfresco/repo/dictionary/M2Class.java | 0 .../java/org/alfresco/repo/dictionary/M2ClassAssociation.java | 0 .../main/java/org/alfresco/repo/dictionary/M2ClassDefinition.java | 0 .../src}/main/java/org/alfresco/repo/dictionary/M2Constraint.java | 0 .../java/org/alfresco/repo/dictionary/M2ConstraintDefinition.java | 0 .../src}/main/java/org/alfresco/repo/dictionary/M2DataType.java | 0 .../java/org/alfresco/repo/dictionary/M2DataTypeDefinition.java | 0 .../src}/main/java/org/alfresco/repo/dictionary/M2Label.java | 0 .../src}/main/java/org/alfresco/repo/dictionary/M2Model.java | 0 .../main/java/org/alfresco/repo/dictionary/M2ModelDefinition.java | 0 .../src}/main/java/org/alfresco/repo/dictionary/M2ModelDiff.java | 0 .../src}/main/java/org/alfresco/repo/dictionary/M2NamedValue.java | 0 .../src}/main/java/org/alfresco/repo/dictionary/M2Namespace.java | 0 .../java/org/alfresco/repo/dictionary/M2NamespaceDefinition.java | 0 .../src}/main/java/org/alfresco/repo/dictionary/M2Property.java | 0 .../java/org/alfresco/repo/dictionary/M2PropertyDefinition.java | 0 .../java/org/alfresco/repo/dictionary/M2PropertyOverride.java | 0 .../src}/main/java/org/alfresco/repo/dictionary/M2Type.java | 0 .../main/java/org/alfresco/repo/dictionary/M2TypeDefinition.java | 0 .../src}/main/java/org/alfresco/repo/dictionary/M2XML.java | 0 .../src}/main/java/org/alfresco/repo/dictionary/ModelQuery.java | 0 .../src}/main/java/org/alfresco/repo/dictionary/NamespaceDAO.java | 0 .../alfresco/repo/dictionary/TenantDictionaryRegistryImpl.java | 0 .../alfresco/repo/dictionary/constraint/AbstractConstraint.java | 0 .../alfresco/repo/dictionary/constraint/ConstraintRegistry.java | 0 .../repo/dictionary/constraint/ListOfValuesConstraint.java | 0 .../java/org/alfresco/repo/dictionary/constraint/NameChecker.java | 0 .../org/alfresco/repo/dictionary/constraint/NoOpConstraint.java | 0 .../repo/dictionary/constraint/NumericRangeConstraint.java | 0 .../org/alfresco/repo/dictionary/constraint/RegexConstraint.java | 0 .../alfresco/repo/dictionary/constraint/RegisteredConstraint.java | 0 .../repo/dictionary/constraint/StringLengthConstraint.java | 0 .../src}/main/java/org/alfresco/repo/dictionary/m2binding.xml | 0 .../main/java/org/alfresco/repo/i18n/StaticMessageLookup.java | 0 .../src}/main/java/org/alfresco/repo/index/shard/Floc.java | 0 .../src}/main/java/org/alfresco/repo/index/shard/Shard.java | 0 .../main/java/org/alfresco/repo/index/shard/ShardInstance.java | 0 .../main/java/org/alfresco/repo/index/shard/ShardMethodEnum.java | 0 .../src}/main/java/org/alfresco/repo/index/shard/ShardState.java | 0 .../java/org/alfresco/repo/index/shard/ShardStateBuilder.java | 0 .../src}/main/java/org/alfresco/repo/search/MLAnalysisMode.java | 0 .../org/alfresco/repo/search/adaptor/lucene/AnalysisMode.java | 0 .../org/alfresco/repo/search/adaptor/lucene/LuceneFunction.java | 0 .../repo/search/adaptor/lucene/LuceneQueryParserAdaptor.java | 0 .../search/adaptor/lucene/LuceneQueryParserExpressionAdaptor.java | 0 .../org/alfresco/repo/search/adaptor/lucene/QueryConstants.java | 0 .../main/java/org/alfresco/repo/search/impl/QueryParserUtils.java | 0 .../search/impl/parsers/AlfrescoFunctionEvaluationContext.java | 0 .../src}/main/java/org/alfresco/repo/search/impl/parsers/CMIS.g | 0 .../main/java/org/alfresco/repo/search/impl/parsers/CMIS.tokens | 0 .../java/org/alfresco/repo/search/impl/parsers/CMISLexer.java | 0 .../java/org/alfresco/repo/search/impl/parsers/CMISParser.java | 0 .../main/java/org/alfresco/repo/search/impl/parsers/CMIS_FTS.g | 0 .../java/org/alfresco/repo/search/impl/parsers/CMIS_FTS.tokens | 0 .../java/org/alfresco/repo/search/impl/parsers/CMIS_FTSLexer.java | 0 .../org/alfresco/repo/search/impl/parsers/CMIS_FTSParser.java | 0 .../src}/main/java/org/alfresco/repo/search/impl/parsers/FTS.g | 0 .../main/java/org/alfresco/repo/search/impl/parsers/FTS.tokens | 0 .../main/java/org/alfresco/repo/search/impl/parsers/FTSLexer.java | 0 .../java/org/alfresco/repo/search/impl/parsers/FTSParser.java | 0 .../org/alfresco/repo/search/impl/parsers/FTSQueryException.java | 0 .../org/alfresco/repo/search/impl/parsers/FTSQueryParser.java | 0 .../alfresco/repo/search/impl/parsers/GenerateUnicodeRanges.java | 0 .../main/java/org/alfresco/repo/search/impl/parsers/README.md | 0 .../java/org/alfresco/repo/search/impl/querymodel/Argument.java | 0 .../alfresco/repo/search/impl/querymodel/ArgumentDefinition.java | 0 .../java/org/alfresco/repo/search/impl/querymodel/Column.java | 0 .../org/alfresco/repo/search/impl/querymodel/Conjunction.java | 0 .../java/org/alfresco/repo/search/impl/querymodel/Constraint.java | 0 .../org/alfresco/repo/search/impl/querymodel/Disjunction.java | 0 .../org/alfresco/repo/search/impl/querymodel/DynamicArgument.java | 0 .../java/org/alfresco/repo/search/impl/querymodel/Function.java | 0 .../alfresco/repo/search/impl/querymodel/FunctionArgument.java | 0 .../repo/search/impl/querymodel/FunctionEvaluationContext.java | 0 .../alfresco/repo/search/impl/querymodel/FunctionInvokation.java | 0 .../repo/search/impl/querymodel/FunctionalConstraint.java | 0 .../main/java/org/alfresco/repo/search/impl/querymodel/Join.java | 0 .../java/org/alfresco/repo/search/impl/querymodel/JoinType.java | 0 .../org/alfresco/repo/search/impl/querymodel/ListArgument.java | 0 .../org/alfresco/repo/search/impl/querymodel/LiteralArgument.java | 0 .../org/alfresco/repo/search/impl/querymodel/Multiplicity.java | 0 .../main/java/org/alfresco/repo/search/impl/querymodel/Order.java | 0 .../java/org/alfresco/repo/search/impl/querymodel/Ordering.java | 0 .../alfresco/repo/search/impl/querymodel/ParameterArgument.java | 0 .../org/alfresco/repo/search/impl/querymodel/PredicateMode.java | 0 .../alfresco/repo/search/impl/querymodel/PropertyArgument.java | 0 .../main/java/org/alfresco/repo/search/impl/querymodel/Query.java | 0 .../org/alfresco/repo/search/impl/querymodel/QueryEngine.java | 0 .../alfresco/repo/search/impl/querymodel/QueryEngineResults.java | 0 .../alfresco/repo/search/impl/querymodel/QueryModelException.java | 0 .../alfresco/repo/search/impl/querymodel/QueryModelFactory.java | 0 .../org/alfresco/repo/search/impl/querymodel/QueryOptions.java | 0 .../java/org/alfresco/repo/search/impl/querymodel/Selector.java | 0 .../alfresco/repo/search/impl/querymodel/SelectorArgument.java | 0 .../java/org/alfresco/repo/search/impl/querymodel/Source.java | 0 .../org/alfresco/repo/search/impl/querymodel/StaticArgument.java | 0 .../alfresco/repo/search/impl/querymodel/impl/BaseArgument.java | 0 .../repo/search/impl/querymodel/impl/BaseArgumentDefinition.java | 0 .../org/alfresco/repo/search/impl/querymodel/impl/BaseColumn.java | 0 .../alfresco/repo/search/impl/querymodel/impl/BaseComparison.java | 0 .../repo/search/impl/querymodel/impl/BaseConjunction.java | 0 .../alfresco/repo/search/impl/querymodel/impl/BaseConstraint.java | 0 .../repo/search/impl/querymodel/impl/BaseDisjunction.java | 0 .../repo/search/impl/querymodel/impl/BaseDynamicArgument.java | 0 .../alfresco/repo/search/impl/querymodel/impl/BaseFunction.java | 0 .../repo/search/impl/querymodel/impl/BaseFunctionArgument.java | 0 .../search/impl/querymodel/impl/BaseFunctionalConstraint.java | 0 .../org/alfresco/repo/search/impl/querymodel/impl/BaseJoin.java | 0 .../repo/search/impl/querymodel/impl/BaseListArgument.java | 0 .../repo/search/impl/querymodel/impl/BaseLiteralArgument.java | 0 .../alfresco/repo/search/impl/querymodel/impl/BaseOrdering.java | 0 .../repo/search/impl/querymodel/impl/BaseParameterArgument.java | 0 .../repo/search/impl/querymodel/impl/BasePropertyArgument.java | 0 .../org/alfresco/repo/search/impl/querymodel/impl/BaseQuery.java | 0 .../alfresco/repo/search/impl/querymodel/impl/BaseSelector.java | 0 .../repo/search/impl/querymodel/impl/BaseSelectorArgument.java | 0 .../repo/search/impl/querymodel/impl/BaseStaticArgument.java | 0 .../impl/querymodel/impl/DuplicateSelectorNameException.java | 0 .../repo/search/impl/querymodel/impl/SimpleConstraint.java | 0 .../repo/search/impl/querymodel/impl/functions/Child.java | 0 .../repo/search/impl/querymodel/impl/functions/Descendant.java | 0 .../repo/search/impl/querymodel/impl/functions/Equals.java | 0 .../repo/search/impl/querymodel/impl/functions/Exists.java | 0 .../repo/search/impl/querymodel/impl/functions/FTSFuzzyTerm.java | 0 .../repo/search/impl/querymodel/impl/functions/FTSPhrase.java | 0 .../repo/search/impl/querymodel/impl/functions/FTSPrefixTerm.java | 0 .../repo/search/impl/querymodel/impl/functions/FTSProximity.java | 0 .../repo/search/impl/querymodel/impl/functions/FTSRange.java | 0 .../repo/search/impl/querymodel/impl/functions/FTSTerm.java | 0 .../repo/search/impl/querymodel/impl/functions/FTSWildTerm.java | 0 .../repo/search/impl/querymodel/impl/functions/GreaterThan.java | 0 .../impl/querymodel/impl/functions/GreaterThanOrEquals.java | 0 .../alfresco/repo/search/impl/querymodel/impl/functions/In.java | 0 .../repo/search/impl/querymodel/impl/functions/LessThan.java | 0 .../search/impl/querymodel/impl/functions/LessThanOrEquals.java | 0 .../alfresco/repo/search/impl/querymodel/impl/functions/Like.java | 0 .../repo/search/impl/querymodel/impl/functions/Lower.java | 0 .../repo/search/impl/querymodel/impl/functions/NotEquals.java | 0 .../search/impl/querymodel/impl/functions/PropertyAccessor.java | 0 .../repo/search/impl/querymodel/impl/functions/Score.java | 0 .../repo/search/impl/querymodel/impl/functions/Upper.java | 0 .../repo/search/impl/querymodel/impl/lucene/LuceneColumn.java | 0 .../search/impl/querymodel/impl/lucene/LuceneConjunction.java | 0 .../search/impl/querymodel/impl/lucene/LuceneDisjunction.java | 0 .../impl/querymodel/impl/lucene/LuceneFunctionArgument.java | 0 .../impl/querymodel/impl/lucene/LuceneFunctionalConstraint.java | 0 .../repo/search/impl/querymodel/impl/lucene/LuceneJoin.java | 0 .../search/impl/querymodel/impl/lucene/LuceneListArgument.java | 0 .../search/impl/querymodel/impl/lucene/LuceneLiteralArgument.java | 0 .../repo/search/impl/querymodel/impl/lucene/LuceneOrdering.java | 0 .../impl/querymodel/impl/lucene/LuceneParameterArgument.java | 0 .../impl/querymodel/impl/lucene/LucenePropertyArgument.java | 0 .../repo/search/impl/querymodel/impl/lucene/LuceneQuery.java | 0 .../search/impl/querymodel/impl/lucene/LuceneQueryBuilder.java | 0 .../impl/querymodel/impl/lucene/LuceneQueryBuilderComponent.java | 0 .../impl/querymodel/impl/lucene/LuceneQueryBuilderContext.java | 0 .../impl/querymodel/impl/lucene/LuceneQueryModelFactory.java | 0 .../repo/search/impl/querymodel/impl/lucene/LuceneSelector.java | 0 .../impl/querymodel/impl/lucene/LuceneSelectorArgument.java | 0 .../search/impl/querymodel/impl/lucene/functions/LuceneChild.java | 0 .../impl/querymodel/impl/lucene/functions/LuceneDescendant.java | 0 .../impl/querymodel/impl/lucene/functions/LuceneEquals.java | 0 .../impl/querymodel/impl/lucene/functions/LuceneExists.java | 0 .../impl/querymodel/impl/lucene/functions/LuceneFTSFuzzyTerm.java | 0 .../impl/querymodel/impl/lucene/functions/LuceneFTSPhrase.java | 0 .../querymodel/impl/lucene/functions/LuceneFTSPrefixTerm.java | 0 .../impl/querymodel/impl/lucene/functions/LuceneFTSProximity.java | 0 .../impl/querymodel/impl/lucene/functions/LuceneFTSRange.java | 0 .../impl/querymodel/impl/lucene/functions/LuceneFTSTerm.java | 0 .../impl/querymodel/impl/lucene/functions/LuceneFTSWildTerm.java | 0 .../impl/querymodel/impl/lucene/functions/LuceneGreaterThan.java | 0 .../impl/lucene/functions/LuceneGreaterThanOrEquals.java | 0 .../search/impl/querymodel/impl/lucene/functions/LuceneIn.java | 0 .../impl/querymodel/impl/lucene/functions/LuceneLessThan.java | 0 .../querymodel/impl/lucene/functions/LuceneLessThanOrEquals.java | 0 .../search/impl/querymodel/impl/lucene/functions/LuceneLike.java | 0 .../search/impl/querymodel/impl/lucene/functions/LuceneLower.java | 0 .../impl/querymodel/impl/lucene/functions/LuceneNotEquals.java | 0 .../querymodel/impl/lucene/functions/LucenePropertyAccessor.java | 0 .../search/impl/querymodel/impl/lucene/functions/LuceneScore.java | 0 .../search/impl/querymodel/impl/lucene/functions/LuceneUpper.java | 0 .../repo/security/authentication/AlfrescoSecureContext.java | 0 .../repo/security/authentication/AlfrescoSecureContextImpl.java | 0 .../repo/security/authentication/AuthenticationDiagnostic.java | 0 .../repo/security/authentication/AuthenticationException.java | 0 .../alfresco/repo/security/authentication/AuthenticationStep.java | 0 .../alfresco/repo/security/authentication/AuthenticationUtil.java | 0 .../repo/security/authentication/InMemoryTicketComponentImpl.java | 0 .../alfresco/repo/security/authentication/TicketComponent.java | 0 .../repo/security/authentication/TicketExpiredException.java | 0 .../main/java/org/alfresco/repo/tenant/SingleTServiceImpl.java | 0 .../src}/main/java/org/alfresco/repo/tenant/Tenant.java | 0 .../main/java/org/alfresco/repo/tenant/TenantContextHolder.java | 0 .../src}/main/java/org/alfresco/repo/tenant/TenantDeployer.java | 0 .../src}/main/java/org/alfresco/repo/tenant/TenantService.java | 0 .../main/java/org/alfresco/repo/tenant/TenantUserService.java | 0 .../src}/main/java/org/alfresco/repo/tenant/TenantUtil.java | 0 .../src}/main/java/org/alfresco/service/Auditable.java | 0 .../src}/main/java/org/alfresco/service/NotAuditable.java | 0 .../src}/main/java/org/alfresco/service/PublicService.java | 0 .../org/alfresco/service/cmr/dictionary/AspectDefinition.java | 0 .../alfresco/service/cmr/dictionary/AssociationDefinition.java | 0 .../service/cmr/dictionary/ChildAssociationDefinition.java | 0 .../alfresco/service/cmr/dictionary/ClassAttributeDefinition.java | 0 .../java/org/alfresco/service/cmr/dictionary/ClassDefinition.java | 0 .../main/java/org/alfresco/service/cmr/dictionary/Constraint.java | 0 .../org/alfresco/service/cmr/dictionary/ConstraintDefinition.java | 0 .../org/alfresco/service/cmr/dictionary/ConstraintException.java | 0 .../alfresco/service/cmr/dictionary/CustomModelDefinition.java | 0 .../org/alfresco/service/cmr/dictionary/CustomModelException.java | 0 .../org/alfresco/service/cmr/dictionary/CustomModelService.java | 0 .../org/alfresco/service/cmr/dictionary/DataTypeDefinition.java | 0 .../org/alfresco/service/cmr/dictionary/DictionaryException.java | 0 .../org/alfresco/service/cmr/dictionary/DictionaryService.java | 0 .../alfresco/service/cmr/dictionary/InvalidAspectException.java | 0 .../alfresco/service/cmr/dictionary/InvalidClassException.java | 0 .../org/alfresco/service/cmr/dictionary/InvalidTypeException.java | 0 .../java/org/alfresco/service/cmr/dictionary/ModelDefinition.java | 0 .../org/alfresco/service/cmr/dictionary/NamespaceDefinition.java | 0 .../org/alfresco/service/cmr/dictionary/PropertyDefinition.java | 0 .../java/org/alfresco/service/cmr/dictionary/TypeDefinition.java | 0 .../main/java/org/alfresco/service/cmr/i18n/MessageLookup.java | 0 .../alfresco/service/cmr/repository/AbstractStoreException.java | 0 .../service/cmr/repository/AssociationExistsException.java | 0 .../java/org/alfresco/service/cmr/repository/AssociationRef.java | 0 .../org/alfresco/service/cmr/repository/ChildAssociationRef.java | 0 .../java/org/alfresco/service/cmr/repository/ContentAccessor.java | 0 .../java/org/alfresco/service/cmr/repository/ContentData.java | 0 .../org/alfresco/service/cmr/repository/ContentIOException.java | 0 .../java/org/alfresco/service/cmr/repository/ContentReader.java | 0 .../service/cmr/repository/ContentServiceTransientException.java | 0 .../alfresco/service/cmr/repository/ContentStreamListener.java | 0 .../java/org/alfresco/service/cmr/repository/ContentUrlKey.java | 0 .../java/org/alfresco/service/cmr/repository/ContentWriter.java | 0 .../java/org/alfresco/service/cmr/repository/DirectAccessUrl.java | 0 .../main/java/org/alfresco/service/cmr/repository/EntityRef.java | 0 .../org/alfresco/service/cmr/repository/FileContentReader.java | 0 .../cmr/repository/InvalidChildAssociationRefException.java | 0 .../alfresco/service/cmr/repository/InvalidNodeRefException.java | 0 .../alfresco/service/cmr/repository/InvalidStoreRefException.java | 0 .../main/java/org/alfresco/service/cmr/repository/MLText.java | 0 .../service/cmr/repository/MalformedNodeRefException.java | 0 .../java/org/alfresco/service/cmr/repository/MimetypeService.java | 0 .../org/alfresco/service/cmr/repository/MimetypeServiceAware.java | 0 .../main/java/org/alfresco/service/cmr/repository/NodeRef.java | 0 .../java/org/alfresco/service/cmr/repository/NodeService.java | 0 .../src}/main/java/org/alfresco/service/cmr/repository/Path.java | 0 .../main/java/org/alfresco/service/cmr/repository/Period.java | 0 .../java/org/alfresco/service/cmr/repository/PeriodProvider.java | 0 .../org/alfresco/service/cmr/repository/StoreExistsException.java | 0 .../main/java/org/alfresco/service/cmr/repository/StoreRef.java | 0 .../java/org/alfresco/service/cmr/repository/XPathException.java | 0 .../service/cmr/repository/datatype/DefaultTypeConverter.java | 0 .../org/alfresco/service/cmr/repository/datatype/Duration.java | 0 .../service/cmr/repository/datatype/TypeConversionException.java | 0 .../alfresco/service/cmr/repository/datatype/TypeConverter.java | 0 .../org/alfresco/service/cmr/search/BasicSearchParameters.java | 0 .../main/java/org/alfresco/service/cmr/search/FacetFormat.java | 0 .../org/alfresco/service/cmr/search/FieldHighlightParameters.java | 0 .../alfresco/service/cmr/search/GeneralHighlightParameters.java | 0 .../java/org/alfresco/service/cmr/search/HighlightParameters.java | 0 .../src}/main/java/org/alfresco/service/cmr/search/Interval.java | 0 .../java/org/alfresco/service/cmr/search/IntervalParameters.java | 0 .../main/java/org/alfresco/service/cmr/search/IntervalSet.java | 0 .../src}/main/java/org/alfresco/service/cmr/search/LimitBy.java | 0 .../service/cmr/search/NamedQueryParameterDefinition.java | 0 .../org/alfresco/service/cmr/search/PermissionEvaluationMode.java | 0 .../java/org/alfresco/service/cmr/search/QueryConsistency.java | 0 .../main/java/org/alfresco/service/cmr/search/QueryParameter.java | 0 .../org/alfresco/service/cmr/search/QueryParameterDefinition.java | 0 .../java/org/alfresco/service/cmr/search/RangeParameters.java | 0 .../src}/main/java/org/alfresco/service/cmr/search/ResultSet.java | 0 .../java/org/alfresco/service/cmr/search/ResultSetColumn.java | 0 .../java/org/alfresco/service/cmr/search/ResultSetMetaData.java | 0 .../main/java/org/alfresco/service/cmr/search/ResultSetRow.java | 0 .../main/java/org/alfresco/service/cmr/search/ResultSetSPI.java | 0 .../java/org/alfresco/service/cmr/search/ResultSetSelector.java | 0 .../main/java/org/alfresco/service/cmr/search/ResultSetType.java | 0 .../java/org/alfresco/service/cmr/search/SearchParameters.java | 0 .../java/org/alfresco/service/cmr/search/SearchSQLParameters.java | 0 .../main/java/org/alfresco/service/cmr/search/SearchService.java | 0 .../java/org/alfresco/service/cmr/search/SpellCheckResult.java | 0 .../java/org/alfresco/service/cmr/search/StatsParameters.java | 0 .../main/java/org/alfresco/service/cmr/search/StatsProcessor.java | 0 .../org/alfresco/service/cmr/search/StatsProcessorUsingMap.java | 0 .../org/alfresco/service/cmr/search/StatsRequestParameters.java | 0 .../main/java/org/alfresco/service/cmr/search/StatsResultSet.java | 0 .../java/org/alfresco/service/cmr/search/StatsResultStat.java | 0 .../main/java/org/alfresco/service/cmr/search/StatsService.java | 0 .../java/org/alfresco/service/cmr/security/AccessPermission.java | 0 .../main/java/org/alfresco/service/cmr/security/AccessStatus.java | 0 .../java/org/alfresco/service/cmr/security/AuthorityType.java | 0 .../java/org/alfresco/service/cmr/security/PermissionContext.java | 0 .../java/org/alfresco/service/cmr/security/PermissionService.java | 0 .../service/namespace/DynamicNamespacePrefixResolver.java | 0 .../org/alfresco/service/namespace/InvalidQNameException.java | 0 .../java/org/alfresco/service/namespace/NamespaceException.java | 0 .../org/alfresco/service/namespace/NamespacePrefixResolver.java | 0 .../service/namespace/NamespacePrefixResolverProvider.java | 0 .../java/org/alfresco/service/namespace/NamespaceService.java | 0 .../alfresco/service/namespace/NamespaceServiceMemoryImpl.java | 0 .../src}/main/java/org/alfresco/service/namespace/QName.java | 0 .../src}/main/java/org/alfresco/service/namespace/QNameCache.java | 0 .../src}/main/java/org/alfresco/service/namespace/QNameMap.java | 0 .../main/java/org/alfresco/service/namespace/QNamePattern.java | 0 .../java/org/alfresco/service/namespace/RegexQNamePattern.java | 0 .../main/java/org/alfresco/util/BaseApplicationContextHelper.java | 0 .../src}/main/java/org/alfresco/util/ConfigFileFinder.java | 0 .../src}/main/java/org/alfresco/util/ConfigScheduler.java | 0 .../org/alfresco/util/DataModelTestApplicationContextHelper.java | 0 {src => data-model/src}/main/java/org/alfresco/util/ISO9075.java | 0 .../org/alfresco/util/LazyClassPathXmlApplicationContext.java | 0 .../alfresco/util/NoAutoStartClassPathXmlApplicationContext.java | 0 .../src}/main/java/org/alfresco/util/NumericEncoder.java | 0 .../src}/main/java/org/alfresco/util/SearchDateConversion.java | 0 .../main/java/org/alfresco/util/SearchLanguageConversion.java | 0 .../src}/main/java/org/alfresco/util/ShutdownIndicator.java | 0 .../main/java/org/alfresco/util/WebApplicationContextLoader.java | 0 .../src}/main/java/org/apache/tika/mime/custom-mimetypes.xml | 0 .../main/resources/alfresco/data-model-stand-alone-context.xml | 0 .../resources/alfresco/messages/dictionary-messages.properties | 0 .../main/resources/alfresco/messages/dictionary-model.properties | 0 .../resources/alfresco/messages/dictionary-model_de.properties | 0 .../resources/alfresco/messages/dictionary-model_es.properties | 0 .../resources/alfresco/messages/dictionary-model_fr.properties | 0 .../resources/alfresco/messages/dictionary-model_it.properties | 0 .../resources/alfresco/messages/dictionary-model_ja.properties | 0 .../resources/alfresco/messages/dictionary-model_nb.properties | 0 .../resources/alfresco/messages/dictionary-model_nl.properties | 0 .../resources/alfresco/messages/dictionary-model_pt_BR.properties | 0 .../resources/alfresco/messages/dictionary-model_ru.properties | 0 .../resources/alfresco/messages/dictionary-model_zh_CN.properties | 0 .../main/resources/alfresco/mimetype/mimetype-map-openoffice.xml | 0 .../src}/main/resources/alfresco/mimetype/mimetype-map.xml | 0 .../src}/main/resources/alfresco/model/cmisModel.xml | 0 .../main/resources/alfresco/model/dataTypeAnalyzers.properties | 0 .../main/resources/alfresco/model/dataTypeAnalyzers_cs.properties | 0 .../main/resources/alfresco/model/dataTypeAnalyzers_da.properties | 0 .../main/resources/alfresco/model/dataTypeAnalyzers_de.properties | 0 .../main/resources/alfresco/model/dataTypeAnalyzers_el.properties | 0 .../main/resources/alfresco/model/dataTypeAnalyzers_en.properties | 0 .../main/resources/alfresco/model/dataTypeAnalyzers_es.properties | 0 .../main/resources/alfresco/model/dataTypeAnalyzers_fi.properties | 0 .../main/resources/alfresco/model/dataTypeAnalyzers_fr.properties | 0 .../main/resources/alfresco/model/dataTypeAnalyzers_it.properties | 0 .../main/resources/alfresco/model/dataTypeAnalyzers_ja.properties | 0 .../main/resources/alfresco/model/dataTypeAnalyzers_ko.properties | 0 .../main/resources/alfresco/model/dataTypeAnalyzers_nl.properties | 0 .../main/resources/alfresco/model/dataTypeAnalyzers_no.properties | 0 .../main/resources/alfresco/model/dataTypeAnalyzers_pt.properties | 0 .../resources/alfresco/model/dataTypeAnalyzers_pt_BR.properties | 0 .../main/resources/alfresco/model/dataTypeAnalyzers_ru.properties | 0 .../main/resources/alfresco/model/dataTypeAnalyzers_sv.properties | 0 .../main/resources/alfresco/model/dataTypeAnalyzers_th.properties | 0 .../main/resources/alfresco/model/dataTypeAnalyzers_zh.properties | 0 .../src}/main/resources/alfresco/model/dictionaryModel.xml | 0 .../opencmis/dictionary/CMISAbstractDictionaryServiceTest.java | 0 .../test/java/org/alfresco/repo/cache/SimpleCacheTestBase.java | 0 .../java/org/alfresco/repo/content/DataModelContentTestSuite.java | 0 .../src}/test/java/org/alfresco/repo/content/MimetypeMapTest.java | 0 .../org/alfresco/repo/content/encoding/CharsetFinderTest.java | 0 .../test/java/org/alfresco/repo/dictionary/AbstractModelTest.java | 0 .../org/alfresco/repo/dictionary/DictionaryComponentTest.java | 0 .../test/java/org/alfresco/repo/dictionary/DictionaryDAOTest.java | 0 .../test/java/org/alfresco/repo/dictionary/DiffModelTest.java | 0 .../org/alfresco/repo/dictionary/constraint/ConstraintsTest.java | 0 .../test/java/org/alfresco/repo/index/ShardMethodEnumTest.java | 0 .../test/java/org/alfresco/repo/search/impl/parsers/CMISTest.java | 0 .../java/org/alfresco/repo/search/impl/parsers/CMIS_FTSTest.java | 0 .../test/java/org/alfresco/repo/search/impl/parsers/FTSTest.java | 0 .../java/org/alfresco/repo/search/impl/parsers/gUnitExecutor.java | 0 .../repo/security/authentication/InMemoryTicketComponentTest.java | 0 .../test/java/org/alfresco/service/cmr/repository/MLTextTest.java | 0 .../java/org/alfresco/service/cmr/repository/NodeRefTest.java | 0 .../test/java/org/alfresco/service/cmr/repository/PathTest.java | 0 .../test/java/org/alfresco/service/cmr/repository/PeriodTest.java | 0 .../service/cmr/repository/datatype/DefaultTypeConverterTest.java | 0 .../java/org/alfresco/service/cmr/search/StatsProcessorTest.java | 0 .../alfresco/service/namespace/DynamicNameSpaceResolverTest.java | 0 .../java/org/alfresco/service/namespace/QNamePatternTest.java | 0 .../src}/test/java/org/alfresco/service/namespace/QNameTest.java | 0 .../src}/test/java/org/alfresco/util/ConfigFileFinderTest.java | 0 .../src}/test/java/org/alfresco/util/ConfigSchedulerTest.java | 0 .../src}/test/java/org/alfresco/util/ISO9075Test.java | 0 .../src}/test/java/org/alfresco/util/NumericEncodingTest.java | 0 .../test/java/org/alfresco/util/SearchDateConversionTest.java | 0 .../test/java/org/alfresco/util/SearchLanguageConversionTest.java | 0 .../src}/test/resources/alfresco/test/mimetypes/testMimetype.json | 0 .../org/alfresco/repo/dictionary/commonpropertynschild_model.xml | 0 .../org/alfresco/repo/dictionary/commonpropertynsparent_model.xml | 0 .../alfresco/repo/dictionary/dictionarydaotest_model.properties | 0 .../org/alfresco/repo/dictionary/dictionarydaotest_model.xml | 0 .../alfresco/repo/dictionary/dictionarydaotest_model1.properties | 0 .../org/alfresco/repo/dictionary/dictionarydaotest_model1.xml | 0 .../resources/org/alfresco/repo/dictionary/modelCircularTypes.xml | 0 .../test/resources/org/alfresco/repo/dictionary/nstest_model.xml | 0 .../org/alfresco/repo/search/impl/parsers/cmis_fts_test.gunit | 0 .../org/alfresco/repo/search/impl/parsers/cmis_test.gunit | 0 .../org/alfresco/repo/search/impl/parsers/fts_test.gunit | 0 .../util/configfilefinder/folder with spaces/test File.txt | 0 .../util/configfilefinder/folder with spaces/testFile.txt | 0 .../util/configfilefinder/folderwithoutspaces/test File.txt | 0 .../util/configfilefinder/folderwithoutspaces/testFile.txt | 0 497 files changed, 0 insertions(+), 0 deletions(-) rename .gitattributes => data-model/.gitattributes (100%) rename .gitbugtraq => data-model/.gitbugtraq (100%) rename .gitignore => data-model/.gitignore (100%) rename .travis.settings.xml => data-model/.travis.settings.xml (100%) rename .travis.yml => data-model/.travis.yml (100%) rename .whitesource => data-model/.whitesource (100%) rename .wss-unified-agent.config => data-model/.wss-unified-agent.config (100%) rename CONTRIBUTING.md => data-model/CONTRIBUTING.md (100%) rename LICENSE.txt => data-model/LICENSE.txt (100%) rename README.md => data-model/README.md (100%) rename l10n.properties => data-model/l10n.properties (100%) rename pom.xml => data-model/pom.xml (100%) rename {src => data-model/src}/main/java/org/alfresco/encoding/TikaCharsetFinder.java (100%) rename {src => data-model/src}/main/java/org/alfresco/model/ContentModel.java (100%) rename {src => data-model/src}/main/java/org/alfresco/model/RenditionModel.java (100%) rename {src => data-model/src}/main/java/org/alfresco/opencmis/CMISAccessControlFormatEnum.java (100%) rename {src => data-model/src}/main/java/org/alfresco/opencmis/CMISUtils.java (100%) rename {src => data-model/src}/main/java/org/alfresco/opencmis/EnumFactory.java (100%) rename {src => data-model/src}/main/java/org/alfresco/opencmis/EnumLabel.java (100%) rename {src => data-model/src}/main/java/org/alfresco/opencmis/dictionary/AbstractTypeDefinitionWrapper.java (100%) rename {src => data-model/src}/main/java/org/alfresco/opencmis/dictionary/BasePropertyDefintionWrapper.java (100%) rename {src => data-model/src}/main/java/org/alfresco/opencmis/dictionary/CMISAbstractDictionaryService.java (100%) rename {src => data-model/src}/main/java/org/alfresco/opencmis/dictionary/CMISActionEvaluator.java (100%) rename {src => data-model/src}/main/java/org/alfresco/opencmis/dictionary/CMISDictionaryRegistry.java (100%) rename {src => data-model/src}/main/java/org/alfresco/opencmis/dictionary/CMISDictionaryRegistryImpl.java (100%) rename {src => data-model/src}/main/java/org/alfresco/opencmis/dictionary/CMISDictionaryService.java (100%) rename {src => data-model/src}/main/java/org/alfresco/opencmis/dictionary/CMISNodeInfo.java (100%) rename {src => data-model/src}/main/java/org/alfresco/opencmis/dictionary/CMISObjectVariant.java (100%) rename {src => data-model/src}/main/java/org/alfresco/opencmis/dictionary/CMISPropertyAccessor.java (100%) rename {src => data-model/src}/main/java/org/alfresco/opencmis/dictionary/CMISPropertyLuceneBuilder.java (100%) rename {src => data-model/src}/main/java/org/alfresco/opencmis/dictionary/CMISStrictDictionaryService.java (100%) rename {src => data-model/src}/main/java/org/alfresco/opencmis/dictionary/DocumentTypeDefinitionWrapper.java (100%) rename {src => data-model/src}/main/java/org/alfresco/opencmis/dictionary/FilteredDictionaryComponent.java (100%) rename {src => data-model/src}/main/java/org/alfresco/opencmis/dictionary/FolderTypeDefintionWrapper.java (100%) rename {src => data-model/src}/main/java/org/alfresco/opencmis/dictionary/ItemTypeDefinitionWrapper.java (100%) rename {src => data-model/src}/main/java/org/alfresco/opencmis/dictionary/PolicyTypeDefintionWrapper.java (100%) rename {src => data-model/src}/main/java/org/alfresco/opencmis/dictionary/PropertyAccessorMapping.java (100%) rename {src => data-model/src}/main/java/org/alfresco/opencmis/dictionary/PropertyDefinitionWrapper.java (100%) rename {src => data-model/src}/main/java/org/alfresco/opencmis/dictionary/PropertyLuceneBuilderMapping.java (100%) rename {src => data-model/src}/main/java/org/alfresco/opencmis/dictionary/QNameFilter.java (100%) rename {src => data-model/src}/main/java/org/alfresco/opencmis/dictionary/QNameFilterImpl.java (100%) rename {src => data-model/src}/main/java/org/alfresco/opencmis/dictionary/RelationshipTypeDefintionWrapper.java (100%) rename {src => data-model/src}/main/java/org/alfresco/opencmis/dictionary/SecondaryTypeDefinitionWrapper.java (100%) rename {src => data-model/src}/main/java/org/alfresco/opencmis/dictionary/ShadowTypeDefinitionWrapper.java (100%) rename {src => data-model/src}/main/java/org/alfresco/opencmis/dictionary/TypeDefinitionWrapper.java (100%) rename {src => data-model/src}/main/java/org/alfresco/opencmis/mapping/AbstractSimpleLuceneBuilder.java (100%) rename {src => data-model/src}/main/java/org/alfresco/opencmis/mapping/BaseLuceneBuilder.java (100%) rename {src => data-model/src}/main/java/org/alfresco/opencmis/mapping/BaseTypeIdLuceneBuilder.java (100%) rename {src => data-model/src}/main/java/org/alfresco/opencmis/mapping/CMISMapping.java (100%) rename {src => data-model/src}/main/java/org/alfresco/opencmis/mapping/ContentStreamLengthLuceneBuilder.java (100%) rename {src => data-model/src}/main/java/org/alfresco/opencmis/mapping/ContentStreamMimetypeLuceneBuilder.java (100%) rename {src => data-model/src}/main/java/org/alfresco/opencmis/mapping/DirectLuceneBuilder.java (100%) rename {src => data-model/src}/main/java/org/alfresco/opencmis/mapping/FixedValueLuceneBuilder.java (100%) rename {src => data-model/src}/main/java/org/alfresco/opencmis/mapping/NotSupportedLuceneBuilder.java (100%) rename {src => data-model/src}/main/java/org/alfresco/opencmis/mapping/ObjectIdLuceneBuilder.java (100%) rename {src => data-model/src}/main/java/org/alfresco/opencmis/mapping/ObjectTypeIdLuceneBuilder.java (100%) rename {src => data-model/src}/main/java/org/alfresco/opencmis/mapping/ParentLuceneBuilder.java (100%) rename {src => data-model/src}/main/java/org/alfresco/opencmis/mapping/RuntimePropertyLuceneBuilderMapping.java (100%) rename {src => data-model/src}/main/java/org/alfresco/opencmis/search/CMISFTSQueryParser.java (100%) rename {src => data-model/src}/main/java/org/alfresco/opencmis/search/CMISQueryOptions.java (100%) rename {src => data-model/src}/main/java/org/alfresco/opencmis/search/CMISQueryParser.java (100%) rename {src => data-model/src}/main/java/org/alfresco/opencmis/search/CmisFunctionEvaluationContext.java (100%) rename {src => data-model/src}/main/java/org/alfresco/repo/cache/LockingCache.java (100%) rename {src => data-model/src}/main/java/org/alfresco/repo/cache/MemoryCache.java (100%) rename {src => data-model/src}/main/java/org/alfresco/repo/cache/SimpleCache.java (100%) rename {src => data-model/src}/main/java/org/alfresco/repo/content/ContentContext.java (100%) rename {src => data-model/src}/main/java/org/alfresco/repo/content/ContentStore.java (100%) rename {src => data-model/src}/main/java/org/alfresco/repo/content/ContentStoreCaps.java (100%) rename {src => data-model/src}/main/java/org/alfresco/repo/content/MimetypeMap.java (100%) rename {src => data-model/src}/main/java/org/alfresco/repo/content/encoding/ContentCharsetFinder.java (100%) rename {src => data-model/src}/main/java/org/alfresco/repo/dictionary/AbstractDictionaryRegistry.java (100%) rename {src => data-model/src}/main/java/org/alfresco/repo/dictionary/CompiledModel.java (100%) rename {src => data-model/src}/main/java/org/alfresco/repo/dictionary/CompiledModelsCache.java (100%) rename {src => data-model/src}/main/java/org/alfresco/repo/dictionary/CoreDictionaryRegistryImpl.java (100%) rename {src => data-model/src}/main/java/org/alfresco/repo/dictionary/CustomModelDefinitionImpl.java (100%) rename {src => data-model/src}/main/java/org/alfresco/repo/dictionary/CustomModelsInfo.java (100%) rename {src => data-model/src}/main/java/org/alfresco/repo/dictionary/DelegateModelQuery.java (100%) rename {src => data-model/src}/main/java/org/alfresco/repo/dictionary/DictionaryBootstrap.java (100%) rename {src => data-model/src}/main/java/org/alfresco/repo/dictionary/DictionaryComponent.java (100%) rename {src => data-model/src}/main/java/org/alfresco/repo/dictionary/DictionaryDAO.java (100%) rename {src => data-model/src}/main/java/org/alfresco/repo/dictionary/DictionaryDAOImpl.java (100%) rename {src => data-model/src}/main/java/org/alfresco/repo/dictionary/DictionaryListener.java (100%) rename {src => data-model/src}/main/java/org/alfresco/repo/dictionary/DictionaryNamespaceComponent.java (100%) rename {src => data-model/src}/main/java/org/alfresco/repo/dictionary/DictionaryRegistry.java (100%) rename {src => data-model/src}/main/java/org/alfresco/repo/dictionary/ExtendedDictionaryListener.java (100%) rename {src => data-model/src}/main/java/org/alfresco/repo/dictionary/Facetable.java (100%) rename {src => data-model/src}/main/java/org/alfresco/repo/dictionary/IndexTokenisationMode.java (100%) rename {src => data-model/src}/main/java/org/alfresco/repo/dictionary/M2AnonymousTypeDefinition.java (100%) rename {src => data-model/src}/main/java/org/alfresco/repo/dictionary/M2Aspect.java (100%) rename {src => data-model/src}/main/java/org/alfresco/repo/dictionary/M2AspectDefinition.java (100%) rename {src => data-model/src}/main/java/org/alfresco/repo/dictionary/M2Association.java (100%) rename {src => data-model/src}/main/java/org/alfresco/repo/dictionary/M2AssociationDefinition.java (100%) rename {src => data-model/src}/main/java/org/alfresco/repo/dictionary/M2ChildAssociation.java (100%) rename {src => data-model/src}/main/java/org/alfresco/repo/dictionary/M2ChildAssociationDefinition.java (100%) rename {src => data-model/src}/main/java/org/alfresco/repo/dictionary/M2Class.java (100%) rename {src => data-model/src}/main/java/org/alfresco/repo/dictionary/M2ClassAssociation.java (100%) rename {src => data-model/src}/main/java/org/alfresco/repo/dictionary/M2ClassDefinition.java (100%) rename {src => data-model/src}/main/java/org/alfresco/repo/dictionary/M2Constraint.java (100%) rename {src => data-model/src}/main/java/org/alfresco/repo/dictionary/M2ConstraintDefinition.java (100%) rename {src => data-model/src}/main/java/org/alfresco/repo/dictionary/M2DataType.java (100%) rename {src => data-model/src}/main/java/org/alfresco/repo/dictionary/M2DataTypeDefinition.java (100%) rename {src => data-model/src}/main/java/org/alfresco/repo/dictionary/M2Label.java (100%) rename {src => data-model/src}/main/java/org/alfresco/repo/dictionary/M2Model.java (100%) rename {src => data-model/src}/main/java/org/alfresco/repo/dictionary/M2ModelDefinition.java (100%) rename {src => data-model/src}/main/java/org/alfresco/repo/dictionary/M2ModelDiff.java (100%) rename {src => data-model/src}/main/java/org/alfresco/repo/dictionary/M2NamedValue.java (100%) rename {src => data-model/src}/main/java/org/alfresco/repo/dictionary/M2Namespace.java (100%) rename {src => data-model/src}/main/java/org/alfresco/repo/dictionary/M2NamespaceDefinition.java (100%) rename {src => data-model/src}/main/java/org/alfresco/repo/dictionary/M2Property.java (100%) rename {src => data-model/src}/main/java/org/alfresco/repo/dictionary/M2PropertyDefinition.java (100%) rename {src => data-model/src}/main/java/org/alfresco/repo/dictionary/M2PropertyOverride.java (100%) rename {src => data-model/src}/main/java/org/alfresco/repo/dictionary/M2Type.java (100%) rename {src => data-model/src}/main/java/org/alfresco/repo/dictionary/M2TypeDefinition.java (100%) rename {src => data-model/src}/main/java/org/alfresco/repo/dictionary/M2XML.java (100%) rename {src => data-model/src}/main/java/org/alfresco/repo/dictionary/ModelQuery.java (100%) rename {src => data-model/src}/main/java/org/alfresco/repo/dictionary/NamespaceDAO.java (100%) rename {src => data-model/src}/main/java/org/alfresco/repo/dictionary/TenantDictionaryRegistryImpl.java (100%) rename {src => data-model/src}/main/java/org/alfresco/repo/dictionary/constraint/AbstractConstraint.java (100%) rename {src => data-model/src}/main/java/org/alfresco/repo/dictionary/constraint/ConstraintRegistry.java (100%) rename {src => data-model/src}/main/java/org/alfresco/repo/dictionary/constraint/ListOfValuesConstraint.java (100%) rename {src => data-model/src}/main/java/org/alfresco/repo/dictionary/constraint/NameChecker.java (100%) rename {src => data-model/src}/main/java/org/alfresco/repo/dictionary/constraint/NoOpConstraint.java (100%) rename {src => data-model/src}/main/java/org/alfresco/repo/dictionary/constraint/NumericRangeConstraint.java (100%) rename {src => data-model/src}/main/java/org/alfresco/repo/dictionary/constraint/RegexConstraint.java (100%) rename {src => data-model/src}/main/java/org/alfresco/repo/dictionary/constraint/RegisteredConstraint.java (100%) rename {src => data-model/src}/main/java/org/alfresco/repo/dictionary/constraint/StringLengthConstraint.java (100%) rename {src => data-model/src}/main/java/org/alfresco/repo/dictionary/m2binding.xml (100%) rename {src => data-model/src}/main/java/org/alfresco/repo/i18n/StaticMessageLookup.java (100%) rename {src => data-model/src}/main/java/org/alfresco/repo/index/shard/Floc.java (100%) rename {src => data-model/src}/main/java/org/alfresco/repo/index/shard/Shard.java (100%) rename {src => data-model/src}/main/java/org/alfresco/repo/index/shard/ShardInstance.java (100%) rename {src => data-model/src}/main/java/org/alfresco/repo/index/shard/ShardMethodEnum.java (100%) rename {src => data-model/src}/main/java/org/alfresco/repo/index/shard/ShardState.java (100%) rename {src => data-model/src}/main/java/org/alfresco/repo/index/shard/ShardStateBuilder.java (100%) rename {src => data-model/src}/main/java/org/alfresco/repo/search/MLAnalysisMode.java (100%) rename {src => data-model/src}/main/java/org/alfresco/repo/search/adaptor/lucene/AnalysisMode.java (100%) rename {src => data-model/src}/main/java/org/alfresco/repo/search/adaptor/lucene/LuceneFunction.java (100%) rename {src => data-model/src}/main/java/org/alfresco/repo/search/adaptor/lucene/LuceneQueryParserAdaptor.java (100%) rename {src => data-model/src}/main/java/org/alfresco/repo/search/adaptor/lucene/LuceneQueryParserExpressionAdaptor.java (100%) rename {src => data-model/src}/main/java/org/alfresco/repo/search/adaptor/lucene/QueryConstants.java (100%) rename {src => data-model/src}/main/java/org/alfresco/repo/search/impl/QueryParserUtils.java (100%) rename {src => data-model/src}/main/java/org/alfresco/repo/search/impl/parsers/AlfrescoFunctionEvaluationContext.java (100%) rename {src => data-model/src}/main/java/org/alfresco/repo/search/impl/parsers/CMIS.g (100%) rename {src => data-model/src}/main/java/org/alfresco/repo/search/impl/parsers/CMIS.tokens (100%) rename {src => data-model/src}/main/java/org/alfresco/repo/search/impl/parsers/CMISLexer.java (100%) rename {src => data-model/src}/main/java/org/alfresco/repo/search/impl/parsers/CMISParser.java (100%) rename {src => data-model/src}/main/java/org/alfresco/repo/search/impl/parsers/CMIS_FTS.g (100%) rename {src => data-model/src}/main/java/org/alfresco/repo/search/impl/parsers/CMIS_FTS.tokens (100%) rename {src => data-model/src}/main/java/org/alfresco/repo/search/impl/parsers/CMIS_FTSLexer.java (100%) rename {src => data-model/src}/main/java/org/alfresco/repo/search/impl/parsers/CMIS_FTSParser.java (100%) rename {src => data-model/src}/main/java/org/alfresco/repo/search/impl/parsers/FTS.g (100%) rename {src => data-model/src}/main/java/org/alfresco/repo/search/impl/parsers/FTS.tokens (100%) rename {src => data-model/src}/main/java/org/alfresco/repo/search/impl/parsers/FTSLexer.java (100%) rename {src => data-model/src}/main/java/org/alfresco/repo/search/impl/parsers/FTSParser.java (100%) rename {src => data-model/src}/main/java/org/alfresco/repo/search/impl/parsers/FTSQueryException.java (100%) rename {src => data-model/src}/main/java/org/alfresco/repo/search/impl/parsers/FTSQueryParser.java (100%) rename {src => data-model/src}/main/java/org/alfresco/repo/search/impl/parsers/GenerateUnicodeRanges.java (100%) rename {src => data-model/src}/main/java/org/alfresco/repo/search/impl/parsers/README.md (100%) rename {src => data-model/src}/main/java/org/alfresco/repo/search/impl/querymodel/Argument.java (100%) rename {src => data-model/src}/main/java/org/alfresco/repo/search/impl/querymodel/ArgumentDefinition.java (100%) rename {src => data-model/src}/main/java/org/alfresco/repo/search/impl/querymodel/Column.java (100%) rename {src => data-model/src}/main/java/org/alfresco/repo/search/impl/querymodel/Conjunction.java (100%) rename {src => data-model/src}/main/java/org/alfresco/repo/search/impl/querymodel/Constraint.java (100%) rename {src => data-model/src}/main/java/org/alfresco/repo/search/impl/querymodel/Disjunction.java (100%) rename {src => data-model/src}/main/java/org/alfresco/repo/search/impl/querymodel/DynamicArgument.java (100%) rename {src => data-model/src}/main/java/org/alfresco/repo/search/impl/querymodel/Function.java (100%) rename {src => data-model/src}/main/java/org/alfresco/repo/search/impl/querymodel/FunctionArgument.java (100%) rename {src => data-model/src}/main/java/org/alfresco/repo/search/impl/querymodel/FunctionEvaluationContext.java (100%) rename {src => data-model/src}/main/java/org/alfresco/repo/search/impl/querymodel/FunctionInvokation.java (100%) rename {src => data-model/src}/main/java/org/alfresco/repo/search/impl/querymodel/FunctionalConstraint.java (100%) rename {src => data-model/src}/main/java/org/alfresco/repo/search/impl/querymodel/Join.java (100%) rename {src => data-model/src}/main/java/org/alfresco/repo/search/impl/querymodel/JoinType.java (100%) rename {src => data-model/src}/main/java/org/alfresco/repo/search/impl/querymodel/ListArgument.java (100%) rename {src => data-model/src}/main/java/org/alfresco/repo/search/impl/querymodel/LiteralArgument.java (100%) rename {src => data-model/src}/main/java/org/alfresco/repo/search/impl/querymodel/Multiplicity.java (100%) rename {src => data-model/src}/main/java/org/alfresco/repo/search/impl/querymodel/Order.java (100%) rename {src => data-model/src}/main/java/org/alfresco/repo/search/impl/querymodel/Ordering.java (100%) rename {src => data-model/src}/main/java/org/alfresco/repo/search/impl/querymodel/ParameterArgument.java (100%) rename {src => data-model/src}/main/java/org/alfresco/repo/search/impl/querymodel/PredicateMode.java (100%) rename {src => data-model/src}/main/java/org/alfresco/repo/search/impl/querymodel/PropertyArgument.java (100%) rename {src => data-model/src}/main/java/org/alfresco/repo/search/impl/querymodel/Query.java (100%) rename {src => data-model/src}/main/java/org/alfresco/repo/search/impl/querymodel/QueryEngine.java (100%) rename {src => data-model/src}/main/java/org/alfresco/repo/search/impl/querymodel/QueryEngineResults.java (100%) rename {src => data-model/src}/main/java/org/alfresco/repo/search/impl/querymodel/QueryModelException.java (100%) rename {src => data-model/src}/main/java/org/alfresco/repo/search/impl/querymodel/QueryModelFactory.java (100%) rename {src => data-model/src}/main/java/org/alfresco/repo/search/impl/querymodel/QueryOptions.java (100%) rename {src => data-model/src}/main/java/org/alfresco/repo/search/impl/querymodel/Selector.java (100%) rename {src => data-model/src}/main/java/org/alfresco/repo/search/impl/querymodel/SelectorArgument.java (100%) rename {src => data-model/src}/main/java/org/alfresco/repo/search/impl/querymodel/Source.java (100%) rename {src => data-model/src}/main/java/org/alfresco/repo/search/impl/querymodel/StaticArgument.java (100%) rename {src => data-model/src}/main/java/org/alfresco/repo/search/impl/querymodel/impl/BaseArgument.java (100%) rename {src => data-model/src}/main/java/org/alfresco/repo/search/impl/querymodel/impl/BaseArgumentDefinition.java (100%) rename {src => data-model/src}/main/java/org/alfresco/repo/search/impl/querymodel/impl/BaseColumn.java (100%) rename {src => data-model/src}/main/java/org/alfresco/repo/search/impl/querymodel/impl/BaseComparison.java (100%) rename {src => data-model/src}/main/java/org/alfresco/repo/search/impl/querymodel/impl/BaseConjunction.java (100%) rename {src => data-model/src}/main/java/org/alfresco/repo/search/impl/querymodel/impl/BaseConstraint.java (100%) rename {src => data-model/src}/main/java/org/alfresco/repo/search/impl/querymodel/impl/BaseDisjunction.java (100%) rename {src => data-model/src}/main/java/org/alfresco/repo/search/impl/querymodel/impl/BaseDynamicArgument.java (100%) rename {src => data-model/src}/main/java/org/alfresco/repo/search/impl/querymodel/impl/BaseFunction.java (100%) rename {src => data-model/src}/main/java/org/alfresco/repo/search/impl/querymodel/impl/BaseFunctionArgument.java (100%) rename {src => data-model/src}/main/java/org/alfresco/repo/search/impl/querymodel/impl/BaseFunctionalConstraint.java (100%) rename {src => data-model/src}/main/java/org/alfresco/repo/search/impl/querymodel/impl/BaseJoin.java (100%) rename {src => data-model/src}/main/java/org/alfresco/repo/search/impl/querymodel/impl/BaseListArgument.java (100%) rename {src => data-model/src}/main/java/org/alfresco/repo/search/impl/querymodel/impl/BaseLiteralArgument.java (100%) rename {src => data-model/src}/main/java/org/alfresco/repo/search/impl/querymodel/impl/BaseOrdering.java (100%) rename {src => data-model/src}/main/java/org/alfresco/repo/search/impl/querymodel/impl/BaseParameterArgument.java (100%) rename {src => data-model/src}/main/java/org/alfresco/repo/search/impl/querymodel/impl/BasePropertyArgument.java (100%) rename {src => data-model/src}/main/java/org/alfresco/repo/search/impl/querymodel/impl/BaseQuery.java (100%) rename {src => data-model/src}/main/java/org/alfresco/repo/search/impl/querymodel/impl/BaseSelector.java (100%) rename {src => data-model/src}/main/java/org/alfresco/repo/search/impl/querymodel/impl/BaseSelectorArgument.java (100%) rename {src => data-model/src}/main/java/org/alfresco/repo/search/impl/querymodel/impl/BaseStaticArgument.java (100%) rename {src => data-model/src}/main/java/org/alfresco/repo/search/impl/querymodel/impl/DuplicateSelectorNameException.java (100%) rename {src => data-model/src}/main/java/org/alfresco/repo/search/impl/querymodel/impl/SimpleConstraint.java (100%) rename {src => data-model/src}/main/java/org/alfresco/repo/search/impl/querymodel/impl/functions/Child.java (100%) rename {src => data-model/src}/main/java/org/alfresco/repo/search/impl/querymodel/impl/functions/Descendant.java (100%) rename {src => data-model/src}/main/java/org/alfresco/repo/search/impl/querymodel/impl/functions/Equals.java (100%) rename {src => data-model/src}/main/java/org/alfresco/repo/search/impl/querymodel/impl/functions/Exists.java (100%) rename {src => data-model/src}/main/java/org/alfresco/repo/search/impl/querymodel/impl/functions/FTSFuzzyTerm.java (100%) rename {src => data-model/src}/main/java/org/alfresco/repo/search/impl/querymodel/impl/functions/FTSPhrase.java (100%) rename {src => data-model/src}/main/java/org/alfresco/repo/search/impl/querymodel/impl/functions/FTSPrefixTerm.java (100%) rename {src => data-model/src}/main/java/org/alfresco/repo/search/impl/querymodel/impl/functions/FTSProximity.java (100%) rename {src => data-model/src}/main/java/org/alfresco/repo/search/impl/querymodel/impl/functions/FTSRange.java (100%) rename {src => data-model/src}/main/java/org/alfresco/repo/search/impl/querymodel/impl/functions/FTSTerm.java (100%) rename {src => data-model/src}/main/java/org/alfresco/repo/search/impl/querymodel/impl/functions/FTSWildTerm.java (100%) rename {src => data-model/src}/main/java/org/alfresco/repo/search/impl/querymodel/impl/functions/GreaterThan.java (100%) rename {src => data-model/src}/main/java/org/alfresco/repo/search/impl/querymodel/impl/functions/GreaterThanOrEquals.java (100%) rename {src => data-model/src}/main/java/org/alfresco/repo/search/impl/querymodel/impl/functions/In.java (100%) rename {src => data-model/src}/main/java/org/alfresco/repo/search/impl/querymodel/impl/functions/LessThan.java (100%) rename {src => data-model/src}/main/java/org/alfresco/repo/search/impl/querymodel/impl/functions/LessThanOrEquals.java (100%) rename {src => data-model/src}/main/java/org/alfresco/repo/search/impl/querymodel/impl/functions/Like.java (100%) rename {src => data-model/src}/main/java/org/alfresco/repo/search/impl/querymodel/impl/functions/Lower.java (100%) rename {src => data-model/src}/main/java/org/alfresco/repo/search/impl/querymodel/impl/functions/NotEquals.java (100%) rename {src => data-model/src}/main/java/org/alfresco/repo/search/impl/querymodel/impl/functions/PropertyAccessor.java (100%) rename {src => data-model/src}/main/java/org/alfresco/repo/search/impl/querymodel/impl/functions/Score.java (100%) rename {src => data-model/src}/main/java/org/alfresco/repo/search/impl/querymodel/impl/functions/Upper.java (100%) rename {src => data-model/src}/main/java/org/alfresco/repo/search/impl/querymodel/impl/lucene/LuceneColumn.java (100%) rename {src => data-model/src}/main/java/org/alfresco/repo/search/impl/querymodel/impl/lucene/LuceneConjunction.java (100%) rename {src => data-model/src}/main/java/org/alfresco/repo/search/impl/querymodel/impl/lucene/LuceneDisjunction.java (100%) rename {src => data-model/src}/main/java/org/alfresco/repo/search/impl/querymodel/impl/lucene/LuceneFunctionArgument.java (100%) rename {src => data-model/src}/main/java/org/alfresco/repo/search/impl/querymodel/impl/lucene/LuceneFunctionalConstraint.java (100%) rename {src => data-model/src}/main/java/org/alfresco/repo/search/impl/querymodel/impl/lucene/LuceneJoin.java (100%) rename {src => data-model/src}/main/java/org/alfresco/repo/search/impl/querymodel/impl/lucene/LuceneListArgument.java (100%) rename {src => data-model/src}/main/java/org/alfresco/repo/search/impl/querymodel/impl/lucene/LuceneLiteralArgument.java (100%) rename {src => data-model/src}/main/java/org/alfresco/repo/search/impl/querymodel/impl/lucene/LuceneOrdering.java (100%) rename {src => data-model/src}/main/java/org/alfresco/repo/search/impl/querymodel/impl/lucene/LuceneParameterArgument.java (100%) rename {src => data-model/src}/main/java/org/alfresco/repo/search/impl/querymodel/impl/lucene/LucenePropertyArgument.java (100%) rename {src => data-model/src}/main/java/org/alfresco/repo/search/impl/querymodel/impl/lucene/LuceneQuery.java (100%) rename {src => data-model/src}/main/java/org/alfresco/repo/search/impl/querymodel/impl/lucene/LuceneQueryBuilder.java (100%) rename {src => data-model/src}/main/java/org/alfresco/repo/search/impl/querymodel/impl/lucene/LuceneQueryBuilderComponent.java (100%) rename {src => data-model/src}/main/java/org/alfresco/repo/search/impl/querymodel/impl/lucene/LuceneQueryBuilderContext.java (100%) rename {src => data-model/src}/main/java/org/alfresco/repo/search/impl/querymodel/impl/lucene/LuceneQueryModelFactory.java (100%) rename {src => data-model/src}/main/java/org/alfresco/repo/search/impl/querymodel/impl/lucene/LuceneSelector.java (100%) rename {src => data-model/src}/main/java/org/alfresco/repo/search/impl/querymodel/impl/lucene/LuceneSelectorArgument.java (100%) rename {src => data-model/src}/main/java/org/alfresco/repo/search/impl/querymodel/impl/lucene/functions/LuceneChild.java (100%) rename {src => data-model/src}/main/java/org/alfresco/repo/search/impl/querymodel/impl/lucene/functions/LuceneDescendant.java (100%) rename {src => data-model/src}/main/java/org/alfresco/repo/search/impl/querymodel/impl/lucene/functions/LuceneEquals.java (100%) rename {src => data-model/src}/main/java/org/alfresco/repo/search/impl/querymodel/impl/lucene/functions/LuceneExists.java (100%) rename {src => data-model/src}/main/java/org/alfresco/repo/search/impl/querymodel/impl/lucene/functions/LuceneFTSFuzzyTerm.java (100%) rename {src => data-model/src}/main/java/org/alfresco/repo/search/impl/querymodel/impl/lucene/functions/LuceneFTSPhrase.java (100%) rename {src => data-model/src}/main/java/org/alfresco/repo/search/impl/querymodel/impl/lucene/functions/LuceneFTSPrefixTerm.java (100%) rename {src => data-model/src}/main/java/org/alfresco/repo/search/impl/querymodel/impl/lucene/functions/LuceneFTSProximity.java (100%) rename {src => data-model/src}/main/java/org/alfresco/repo/search/impl/querymodel/impl/lucene/functions/LuceneFTSRange.java (100%) rename {src => data-model/src}/main/java/org/alfresco/repo/search/impl/querymodel/impl/lucene/functions/LuceneFTSTerm.java (100%) rename {src => data-model/src}/main/java/org/alfresco/repo/search/impl/querymodel/impl/lucene/functions/LuceneFTSWildTerm.java (100%) rename {src => data-model/src}/main/java/org/alfresco/repo/search/impl/querymodel/impl/lucene/functions/LuceneGreaterThan.java (100%) rename {src => data-model/src}/main/java/org/alfresco/repo/search/impl/querymodel/impl/lucene/functions/LuceneGreaterThanOrEquals.java (100%) rename {src => data-model/src}/main/java/org/alfresco/repo/search/impl/querymodel/impl/lucene/functions/LuceneIn.java (100%) rename {src => data-model/src}/main/java/org/alfresco/repo/search/impl/querymodel/impl/lucene/functions/LuceneLessThan.java (100%) rename {src => data-model/src}/main/java/org/alfresco/repo/search/impl/querymodel/impl/lucene/functions/LuceneLessThanOrEquals.java (100%) rename {src => data-model/src}/main/java/org/alfresco/repo/search/impl/querymodel/impl/lucene/functions/LuceneLike.java (100%) rename {src => data-model/src}/main/java/org/alfresco/repo/search/impl/querymodel/impl/lucene/functions/LuceneLower.java (100%) rename {src => data-model/src}/main/java/org/alfresco/repo/search/impl/querymodel/impl/lucene/functions/LuceneNotEquals.java (100%) rename {src => data-model/src}/main/java/org/alfresco/repo/search/impl/querymodel/impl/lucene/functions/LucenePropertyAccessor.java (100%) rename {src => data-model/src}/main/java/org/alfresco/repo/search/impl/querymodel/impl/lucene/functions/LuceneScore.java (100%) rename {src => data-model/src}/main/java/org/alfresco/repo/search/impl/querymodel/impl/lucene/functions/LuceneUpper.java (100%) rename {src => data-model/src}/main/java/org/alfresco/repo/security/authentication/AlfrescoSecureContext.java (100%) rename {src => data-model/src}/main/java/org/alfresco/repo/security/authentication/AlfrescoSecureContextImpl.java (100%) rename {src => data-model/src}/main/java/org/alfresco/repo/security/authentication/AuthenticationDiagnostic.java (100%) rename {src => data-model/src}/main/java/org/alfresco/repo/security/authentication/AuthenticationException.java (100%) rename {src => data-model/src}/main/java/org/alfresco/repo/security/authentication/AuthenticationStep.java (100%) rename {src => data-model/src}/main/java/org/alfresco/repo/security/authentication/AuthenticationUtil.java (100%) rename {src => data-model/src}/main/java/org/alfresco/repo/security/authentication/InMemoryTicketComponentImpl.java (100%) rename {src => data-model/src}/main/java/org/alfresco/repo/security/authentication/TicketComponent.java (100%) rename {src => data-model/src}/main/java/org/alfresco/repo/security/authentication/TicketExpiredException.java (100%) rename {src => data-model/src}/main/java/org/alfresco/repo/tenant/SingleTServiceImpl.java (100%) rename {src => data-model/src}/main/java/org/alfresco/repo/tenant/Tenant.java (100%) rename {src => data-model/src}/main/java/org/alfresco/repo/tenant/TenantContextHolder.java (100%) rename {src => data-model/src}/main/java/org/alfresco/repo/tenant/TenantDeployer.java (100%) rename {src => data-model/src}/main/java/org/alfresco/repo/tenant/TenantService.java (100%) rename {src => data-model/src}/main/java/org/alfresco/repo/tenant/TenantUserService.java (100%) rename {src => data-model/src}/main/java/org/alfresco/repo/tenant/TenantUtil.java (100%) rename {src => data-model/src}/main/java/org/alfresco/service/Auditable.java (100%) rename {src => data-model/src}/main/java/org/alfresco/service/NotAuditable.java (100%) rename {src => data-model/src}/main/java/org/alfresco/service/PublicService.java (100%) rename {src => data-model/src}/main/java/org/alfresco/service/cmr/dictionary/AspectDefinition.java (100%) rename {src => data-model/src}/main/java/org/alfresco/service/cmr/dictionary/AssociationDefinition.java (100%) rename {src => data-model/src}/main/java/org/alfresco/service/cmr/dictionary/ChildAssociationDefinition.java (100%) rename {src => data-model/src}/main/java/org/alfresco/service/cmr/dictionary/ClassAttributeDefinition.java (100%) rename {src => data-model/src}/main/java/org/alfresco/service/cmr/dictionary/ClassDefinition.java (100%) rename {src => data-model/src}/main/java/org/alfresco/service/cmr/dictionary/Constraint.java (100%) rename {src => data-model/src}/main/java/org/alfresco/service/cmr/dictionary/ConstraintDefinition.java (100%) rename {src => data-model/src}/main/java/org/alfresco/service/cmr/dictionary/ConstraintException.java (100%) rename {src => data-model/src}/main/java/org/alfresco/service/cmr/dictionary/CustomModelDefinition.java (100%) rename {src => data-model/src}/main/java/org/alfresco/service/cmr/dictionary/CustomModelException.java (100%) rename {src => data-model/src}/main/java/org/alfresco/service/cmr/dictionary/CustomModelService.java (100%) rename {src => data-model/src}/main/java/org/alfresco/service/cmr/dictionary/DataTypeDefinition.java (100%) rename {src => data-model/src}/main/java/org/alfresco/service/cmr/dictionary/DictionaryException.java (100%) rename {src => data-model/src}/main/java/org/alfresco/service/cmr/dictionary/DictionaryService.java (100%) rename {src => data-model/src}/main/java/org/alfresco/service/cmr/dictionary/InvalidAspectException.java (100%) rename {src => data-model/src}/main/java/org/alfresco/service/cmr/dictionary/InvalidClassException.java (100%) rename {src => data-model/src}/main/java/org/alfresco/service/cmr/dictionary/InvalidTypeException.java (100%) rename {src => data-model/src}/main/java/org/alfresco/service/cmr/dictionary/ModelDefinition.java (100%) rename {src => data-model/src}/main/java/org/alfresco/service/cmr/dictionary/NamespaceDefinition.java (100%) rename {src => data-model/src}/main/java/org/alfresco/service/cmr/dictionary/PropertyDefinition.java (100%) rename {src => data-model/src}/main/java/org/alfresco/service/cmr/dictionary/TypeDefinition.java (100%) rename {src => data-model/src}/main/java/org/alfresco/service/cmr/i18n/MessageLookup.java (100%) rename {src => data-model/src}/main/java/org/alfresco/service/cmr/repository/AbstractStoreException.java (100%) rename {src => data-model/src}/main/java/org/alfresco/service/cmr/repository/AssociationExistsException.java (100%) rename {src => data-model/src}/main/java/org/alfresco/service/cmr/repository/AssociationRef.java (100%) rename {src => data-model/src}/main/java/org/alfresco/service/cmr/repository/ChildAssociationRef.java (100%) rename {src => data-model/src}/main/java/org/alfresco/service/cmr/repository/ContentAccessor.java (100%) rename {src => data-model/src}/main/java/org/alfresco/service/cmr/repository/ContentData.java (100%) rename {src => data-model/src}/main/java/org/alfresco/service/cmr/repository/ContentIOException.java (100%) rename {src => data-model/src}/main/java/org/alfresco/service/cmr/repository/ContentReader.java (100%) rename {src => data-model/src}/main/java/org/alfresco/service/cmr/repository/ContentServiceTransientException.java (100%) rename {src => data-model/src}/main/java/org/alfresco/service/cmr/repository/ContentStreamListener.java (100%) rename {src => data-model/src}/main/java/org/alfresco/service/cmr/repository/ContentUrlKey.java (100%) rename {src => data-model/src}/main/java/org/alfresco/service/cmr/repository/ContentWriter.java (100%) rename {src => data-model/src}/main/java/org/alfresco/service/cmr/repository/DirectAccessUrl.java (100%) rename {src => data-model/src}/main/java/org/alfresco/service/cmr/repository/EntityRef.java (100%) rename {src => data-model/src}/main/java/org/alfresco/service/cmr/repository/FileContentReader.java (100%) rename {src => data-model/src}/main/java/org/alfresco/service/cmr/repository/InvalidChildAssociationRefException.java (100%) rename {src => data-model/src}/main/java/org/alfresco/service/cmr/repository/InvalidNodeRefException.java (100%) rename {src => data-model/src}/main/java/org/alfresco/service/cmr/repository/InvalidStoreRefException.java (100%) rename {src => data-model/src}/main/java/org/alfresco/service/cmr/repository/MLText.java (100%) rename {src => data-model/src}/main/java/org/alfresco/service/cmr/repository/MalformedNodeRefException.java (100%) rename {src => data-model/src}/main/java/org/alfresco/service/cmr/repository/MimetypeService.java (100%) rename {src => data-model/src}/main/java/org/alfresco/service/cmr/repository/MimetypeServiceAware.java (100%) rename {src => data-model/src}/main/java/org/alfresco/service/cmr/repository/NodeRef.java (100%) rename {src => data-model/src}/main/java/org/alfresco/service/cmr/repository/NodeService.java (100%) rename {src => data-model/src}/main/java/org/alfresco/service/cmr/repository/Path.java (100%) rename {src => data-model/src}/main/java/org/alfresco/service/cmr/repository/Period.java (100%) rename {src => data-model/src}/main/java/org/alfresco/service/cmr/repository/PeriodProvider.java (100%) rename {src => data-model/src}/main/java/org/alfresco/service/cmr/repository/StoreExistsException.java (100%) rename {src => data-model/src}/main/java/org/alfresco/service/cmr/repository/StoreRef.java (100%) rename {src => data-model/src}/main/java/org/alfresco/service/cmr/repository/XPathException.java (100%) rename {src => data-model/src}/main/java/org/alfresco/service/cmr/repository/datatype/DefaultTypeConverter.java (100%) rename {src => data-model/src}/main/java/org/alfresco/service/cmr/repository/datatype/Duration.java (100%) rename {src => data-model/src}/main/java/org/alfresco/service/cmr/repository/datatype/TypeConversionException.java (100%) rename {src => data-model/src}/main/java/org/alfresco/service/cmr/repository/datatype/TypeConverter.java (100%) rename {src => data-model/src}/main/java/org/alfresco/service/cmr/search/BasicSearchParameters.java (100%) rename {src => data-model/src}/main/java/org/alfresco/service/cmr/search/FacetFormat.java (100%) rename {src => data-model/src}/main/java/org/alfresco/service/cmr/search/FieldHighlightParameters.java (100%) rename {src => data-model/src}/main/java/org/alfresco/service/cmr/search/GeneralHighlightParameters.java (100%) rename {src => data-model/src}/main/java/org/alfresco/service/cmr/search/HighlightParameters.java (100%) rename {src => data-model/src}/main/java/org/alfresco/service/cmr/search/Interval.java (100%) rename {src => data-model/src}/main/java/org/alfresco/service/cmr/search/IntervalParameters.java (100%) rename {src => data-model/src}/main/java/org/alfresco/service/cmr/search/IntervalSet.java (100%) rename {src => data-model/src}/main/java/org/alfresco/service/cmr/search/LimitBy.java (100%) rename {src => data-model/src}/main/java/org/alfresco/service/cmr/search/NamedQueryParameterDefinition.java (100%) rename {src => data-model/src}/main/java/org/alfresco/service/cmr/search/PermissionEvaluationMode.java (100%) rename {src => data-model/src}/main/java/org/alfresco/service/cmr/search/QueryConsistency.java (100%) rename {src => data-model/src}/main/java/org/alfresco/service/cmr/search/QueryParameter.java (100%) rename {src => data-model/src}/main/java/org/alfresco/service/cmr/search/QueryParameterDefinition.java (100%) rename {src => data-model/src}/main/java/org/alfresco/service/cmr/search/RangeParameters.java (100%) rename {src => data-model/src}/main/java/org/alfresco/service/cmr/search/ResultSet.java (100%) rename {src => data-model/src}/main/java/org/alfresco/service/cmr/search/ResultSetColumn.java (100%) rename {src => data-model/src}/main/java/org/alfresco/service/cmr/search/ResultSetMetaData.java (100%) rename {src => data-model/src}/main/java/org/alfresco/service/cmr/search/ResultSetRow.java (100%) rename {src => data-model/src}/main/java/org/alfresco/service/cmr/search/ResultSetSPI.java (100%) rename {src => data-model/src}/main/java/org/alfresco/service/cmr/search/ResultSetSelector.java (100%) rename {src => data-model/src}/main/java/org/alfresco/service/cmr/search/ResultSetType.java (100%) rename {src => data-model/src}/main/java/org/alfresco/service/cmr/search/SearchParameters.java (100%) rename {src => data-model/src}/main/java/org/alfresco/service/cmr/search/SearchSQLParameters.java (100%) rename {src => data-model/src}/main/java/org/alfresco/service/cmr/search/SearchService.java (100%) rename {src => data-model/src}/main/java/org/alfresco/service/cmr/search/SpellCheckResult.java (100%) rename {src => data-model/src}/main/java/org/alfresco/service/cmr/search/StatsParameters.java (100%) rename {src => data-model/src}/main/java/org/alfresco/service/cmr/search/StatsProcessor.java (100%) rename {src => data-model/src}/main/java/org/alfresco/service/cmr/search/StatsProcessorUsingMap.java (100%) rename {src => data-model/src}/main/java/org/alfresco/service/cmr/search/StatsRequestParameters.java (100%) rename {src => data-model/src}/main/java/org/alfresco/service/cmr/search/StatsResultSet.java (100%) rename {src => data-model/src}/main/java/org/alfresco/service/cmr/search/StatsResultStat.java (100%) rename {src => data-model/src}/main/java/org/alfresco/service/cmr/search/StatsService.java (100%) rename {src => data-model/src}/main/java/org/alfresco/service/cmr/security/AccessPermission.java (100%) rename {src => data-model/src}/main/java/org/alfresco/service/cmr/security/AccessStatus.java (100%) rename {src => data-model/src}/main/java/org/alfresco/service/cmr/security/AuthorityType.java (100%) rename {src => data-model/src}/main/java/org/alfresco/service/cmr/security/PermissionContext.java (100%) rename {src => data-model/src}/main/java/org/alfresco/service/cmr/security/PermissionService.java (100%) rename {src => data-model/src}/main/java/org/alfresco/service/namespace/DynamicNamespacePrefixResolver.java (100%) rename {src => data-model/src}/main/java/org/alfresco/service/namespace/InvalidQNameException.java (100%) rename {src => data-model/src}/main/java/org/alfresco/service/namespace/NamespaceException.java (100%) rename {src => data-model/src}/main/java/org/alfresco/service/namespace/NamespacePrefixResolver.java (100%) rename {src => data-model/src}/main/java/org/alfresco/service/namespace/NamespacePrefixResolverProvider.java (100%) rename {src => data-model/src}/main/java/org/alfresco/service/namespace/NamespaceService.java (100%) rename {src => data-model/src}/main/java/org/alfresco/service/namespace/NamespaceServiceMemoryImpl.java (100%) rename {src => data-model/src}/main/java/org/alfresco/service/namespace/QName.java (100%) rename {src => data-model/src}/main/java/org/alfresco/service/namespace/QNameCache.java (100%) rename {src => data-model/src}/main/java/org/alfresco/service/namespace/QNameMap.java (100%) rename {src => data-model/src}/main/java/org/alfresco/service/namespace/QNamePattern.java (100%) rename {src => data-model/src}/main/java/org/alfresco/service/namespace/RegexQNamePattern.java (100%) rename {src => data-model/src}/main/java/org/alfresco/util/BaseApplicationContextHelper.java (100%) rename {src => data-model/src}/main/java/org/alfresco/util/ConfigFileFinder.java (100%) rename {src => data-model/src}/main/java/org/alfresco/util/ConfigScheduler.java (100%) rename {src => data-model/src}/main/java/org/alfresco/util/DataModelTestApplicationContextHelper.java (100%) rename {src => data-model/src}/main/java/org/alfresco/util/ISO9075.java (100%) rename {src => data-model/src}/main/java/org/alfresco/util/LazyClassPathXmlApplicationContext.java (100%) rename {src => data-model/src}/main/java/org/alfresco/util/NoAutoStartClassPathXmlApplicationContext.java (100%) rename {src => data-model/src}/main/java/org/alfresco/util/NumericEncoder.java (100%) rename {src => data-model/src}/main/java/org/alfresco/util/SearchDateConversion.java (100%) rename {src => data-model/src}/main/java/org/alfresco/util/SearchLanguageConversion.java (100%) rename {src => data-model/src}/main/java/org/alfresco/util/ShutdownIndicator.java (100%) rename {src => data-model/src}/main/java/org/alfresco/util/WebApplicationContextLoader.java (100%) rename {src => data-model/src}/main/java/org/apache/tika/mime/custom-mimetypes.xml (100%) rename {src => data-model/src}/main/resources/alfresco/data-model-stand-alone-context.xml (100%) rename {src => data-model/src}/main/resources/alfresco/messages/dictionary-messages.properties (100%) rename {src => data-model/src}/main/resources/alfresco/messages/dictionary-model.properties (100%) rename {src => data-model/src}/main/resources/alfresco/messages/dictionary-model_de.properties (100%) rename {src => data-model/src}/main/resources/alfresco/messages/dictionary-model_es.properties (100%) rename {src => data-model/src}/main/resources/alfresco/messages/dictionary-model_fr.properties (100%) rename {src => data-model/src}/main/resources/alfresco/messages/dictionary-model_it.properties (100%) rename {src => data-model/src}/main/resources/alfresco/messages/dictionary-model_ja.properties (100%) rename {src => data-model/src}/main/resources/alfresco/messages/dictionary-model_nb.properties (100%) rename {src => data-model/src}/main/resources/alfresco/messages/dictionary-model_nl.properties (100%) rename {src => data-model/src}/main/resources/alfresco/messages/dictionary-model_pt_BR.properties (100%) rename {src => data-model/src}/main/resources/alfresco/messages/dictionary-model_ru.properties (100%) rename {src => data-model/src}/main/resources/alfresco/messages/dictionary-model_zh_CN.properties (100%) rename {src => data-model/src}/main/resources/alfresco/mimetype/mimetype-map-openoffice.xml (100%) rename {src => data-model/src}/main/resources/alfresco/mimetype/mimetype-map.xml (100%) rename {src => data-model/src}/main/resources/alfresco/model/cmisModel.xml (100%) rename {src => data-model/src}/main/resources/alfresco/model/dataTypeAnalyzers.properties (100%) rename {src => data-model/src}/main/resources/alfresco/model/dataTypeAnalyzers_cs.properties (100%) rename {src => data-model/src}/main/resources/alfresco/model/dataTypeAnalyzers_da.properties (100%) rename {src => data-model/src}/main/resources/alfresco/model/dataTypeAnalyzers_de.properties (100%) rename {src => data-model/src}/main/resources/alfresco/model/dataTypeAnalyzers_el.properties (100%) rename {src => data-model/src}/main/resources/alfresco/model/dataTypeAnalyzers_en.properties (100%) rename {src => data-model/src}/main/resources/alfresco/model/dataTypeAnalyzers_es.properties (100%) rename {src => data-model/src}/main/resources/alfresco/model/dataTypeAnalyzers_fi.properties (100%) rename {src => data-model/src}/main/resources/alfresco/model/dataTypeAnalyzers_fr.properties (100%) rename {src => data-model/src}/main/resources/alfresco/model/dataTypeAnalyzers_it.properties (100%) rename {src => data-model/src}/main/resources/alfresco/model/dataTypeAnalyzers_ja.properties (100%) rename {src => data-model/src}/main/resources/alfresco/model/dataTypeAnalyzers_ko.properties (100%) rename {src => data-model/src}/main/resources/alfresco/model/dataTypeAnalyzers_nl.properties (100%) rename {src => data-model/src}/main/resources/alfresco/model/dataTypeAnalyzers_no.properties (100%) rename {src => data-model/src}/main/resources/alfresco/model/dataTypeAnalyzers_pt.properties (100%) rename {src => data-model/src}/main/resources/alfresco/model/dataTypeAnalyzers_pt_BR.properties (100%) rename {src => data-model/src}/main/resources/alfresco/model/dataTypeAnalyzers_ru.properties (100%) rename {src => data-model/src}/main/resources/alfresco/model/dataTypeAnalyzers_sv.properties (100%) rename {src => data-model/src}/main/resources/alfresco/model/dataTypeAnalyzers_th.properties (100%) rename {src => data-model/src}/main/resources/alfresco/model/dataTypeAnalyzers_zh.properties (100%) rename {src => data-model/src}/main/resources/alfresco/model/dictionaryModel.xml (100%) rename {src => data-model/src}/test/java/org/alfresco/opencmis/dictionary/CMISAbstractDictionaryServiceTest.java (100%) rename {src => data-model/src}/test/java/org/alfresco/repo/cache/SimpleCacheTestBase.java (100%) rename {src => data-model/src}/test/java/org/alfresco/repo/content/DataModelContentTestSuite.java (100%) rename {src => data-model/src}/test/java/org/alfresco/repo/content/MimetypeMapTest.java (100%) rename {src => data-model/src}/test/java/org/alfresco/repo/content/encoding/CharsetFinderTest.java (100%) rename {src => data-model/src}/test/java/org/alfresco/repo/dictionary/AbstractModelTest.java (100%) rename {src => data-model/src}/test/java/org/alfresco/repo/dictionary/DictionaryComponentTest.java (100%) rename {src => data-model/src}/test/java/org/alfresco/repo/dictionary/DictionaryDAOTest.java (100%) rename {src => data-model/src}/test/java/org/alfresco/repo/dictionary/DiffModelTest.java (100%) rename {src => data-model/src}/test/java/org/alfresco/repo/dictionary/constraint/ConstraintsTest.java (100%) rename {src => data-model/src}/test/java/org/alfresco/repo/index/ShardMethodEnumTest.java (100%) rename {src => data-model/src}/test/java/org/alfresco/repo/search/impl/parsers/CMISTest.java (100%) rename {src => data-model/src}/test/java/org/alfresco/repo/search/impl/parsers/CMIS_FTSTest.java (100%) rename {src => data-model/src}/test/java/org/alfresco/repo/search/impl/parsers/FTSTest.java (100%) rename {src => data-model/src}/test/java/org/alfresco/repo/search/impl/parsers/gUnitExecutor.java (100%) rename {src => data-model/src}/test/java/org/alfresco/repo/security/authentication/InMemoryTicketComponentTest.java (100%) rename {src => data-model/src}/test/java/org/alfresco/service/cmr/repository/MLTextTest.java (100%) rename {src => data-model/src}/test/java/org/alfresco/service/cmr/repository/NodeRefTest.java (100%) rename {src => data-model/src}/test/java/org/alfresco/service/cmr/repository/PathTest.java (100%) rename {src => data-model/src}/test/java/org/alfresco/service/cmr/repository/PeriodTest.java (100%) rename {src => data-model/src}/test/java/org/alfresco/service/cmr/repository/datatype/DefaultTypeConverterTest.java (100%) rename {src => data-model/src}/test/java/org/alfresco/service/cmr/search/StatsProcessorTest.java (100%) rename {src => data-model/src}/test/java/org/alfresco/service/namespace/DynamicNameSpaceResolverTest.java (100%) rename {src => data-model/src}/test/java/org/alfresco/service/namespace/QNamePatternTest.java (100%) rename {src => data-model/src}/test/java/org/alfresco/service/namespace/QNameTest.java (100%) rename {src => data-model/src}/test/java/org/alfresco/util/ConfigFileFinderTest.java (100%) rename {src => data-model/src}/test/java/org/alfresco/util/ConfigSchedulerTest.java (100%) rename {src => data-model/src}/test/java/org/alfresco/util/ISO9075Test.java (100%) rename {src => data-model/src}/test/java/org/alfresco/util/NumericEncodingTest.java (100%) rename {src => data-model/src}/test/java/org/alfresco/util/SearchDateConversionTest.java (100%) rename {src => data-model/src}/test/java/org/alfresco/util/SearchLanguageConversionTest.java (100%) rename {src => data-model/src}/test/resources/alfresco/test/mimetypes/testMimetype.json (100%) rename {src => data-model/src}/test/resources/org/alfresco/repo/dictionary/commonpropertynschild_model.xml (100%) rename {src => data-model/src}/test/resources/org/alfresco/repo/dictionary/commonpropertynsparent_model.xml (100%) rename {src => data-model/src}/test/resources/org/alfresco/repo/dictionary/dictionarydaotest_model.properties (100%) rename {src => data-model/src}/test/resources/org/alfresco/repo/dictionary/dictionarydaotest_model.xml (100%) rename {src => data-model/src}/test/resources/org/alfresco/repo/dictionary/dictionarydaotest_model1.properties (100%) rename {src => data-model/src}/test/resources/org/alfresco/repo/dictionary/dictionarydaotest_model1.xml (100%) rename {src => data-model/src}/test/resources/org/alfresco/repo/dictionary/modelCircularTypes.xml (100%) rename {src => data-model/src}/test/resources/org/alfresco/repo/dictionary/nstest_model.xml (100%) rename {src => data-model/src}/test/resources/org/alfresco/repo/search/impl/parsers/cmis_fts_test.gunit (100%) rename {src => data-model/src}/test/resources/org/alfresco/repo/search/impl/parsers/cmis_test.gunit (100%) rename {src => data-model/src}/test/resources/org/alfresco/repo/search/impl/parsers/fts_test.gunit (100%) rename {src => data-model/src}/test/resources/org/alfresco/util/configfilefinder/folder with spaces/test File.txt (100%) rename {src => data-model/src}/test/resources/org/alfresco/util/configfilefinder/folder with spaces/testFile.txt (100%) rename {src => data-model/src}/test/resources/org/alfresco/util/configfilefinder/folderwithoutspaces/test File.txt (100%) rename {src => data-model/src}/test/resources/org/alfresco/util/configfilefinder/folderwithoutspaces/testFile.txt (100%) diff --git a/.gitattributes b/data-model/.gitattributes similarity index 100% rename from .gitattributes rename to data-model/.gitattributes diff --git a/.gitbugtraq b/data-model/.gitbugtraq similarity index 100% rename from .gitbugtraq rename to data-model/.gitbugtraq diff --git a/.gitignore b/data-model/.gitignore similarity index 100% rename from .gitignore rename to data-model/.gitignore diff --git a/.travis.settings.xml b/data-model/.travis.settings.xml similarity index 100% rename from .travis.settings.xml rename to data-model/.travis.settings.xml diff --git a/.travis.yml b/data-model/.travis.yml similarity index 100% rename from .travis.yml rename to data-model/.travis.yml diff --git a/.whitesource b/data-model/.whitesource similarity index 100% rename from .whitesource rename to data-model/.whitesource diff --git a/.wss-unified-agent.config b/data-model/.wss-unified-agent.config similarity index 100% rename from .wss-unified-agent.config rename to data-model/.wss-unified-agent.config diff --git a/CONTRIBUTING.md b/data-model/CONTRIBUTING.md similarity index 100% rename from CONTRIBUTING.md rename to data-model/CONTRIBUTING.md diff --git a/LICENSE.txt b/data-model/LICENSE.txt similarity index 100% rename from LICENSE.txt rename to data-model/LICENSE.txt diff --git a/README.md b/data-model/README.md similarity index 100% rename from README.md rename to data-model/README.md diff --git a/l10n.properties b/data-model/l10n.properties similarity index 100% rename from l10n.properties rename to data-model/l10n.properties diff --git a/pom.xml b/data-model/pom.xml similarity index 100% rename from pom.xml rename to data-model/pom.xml diff --git a/src/main/java/org/alfresco/encoding/TikaCharsetFinder.java b/data-model/src/main/java/org/alfresco/encoding/TikaCharsetFinder.java similarity index 100% rename from src/main/java/org/alfresco/encoding/TikaCharsetFinder.java rename to data-model/src/main/java/org/alfresco/encoding/TikaCharsetFinder.java diff --git a/src/main/java/org/alfresco/model/ContentModel.java b/data-model/src/main/java/org/alfresco/model/ContentModel.java similarity index 100% rename from src/main/java/org/alfresco/model/ContentModel.java rename to data-model/src/main/java/org/alfresco/model/ContentModel.java diff --git a/src/main/java/org/alfresco/model/RenditionModel.java b/data-model/src/main/java/org/alfresco/model/RenditionModel.java similarity index 100% rename from src/main/java/org/alfresco/model/RenditionModel.java rename to data-model/src/main/java/org/alfresco/model/RenditionModel.java diff --git a/src/main/java/org/alfresco/opencmis/CMISAccessControlFormatEnum.java b/data-model/src/main/java/org/alfresco/opencmis/CMISAccessControlFormatEnum.java similarity index 100% rename from src/main/java/org/alfresco/opencmis/CMISAccessControlFormatEnum.java rename to data-model/src/main/java/org/alfresco/opencmis/CMISAccessControlFormatEnum.java diff --git a/src/main/java/org/alfresco/opencmis/CMISUtils.java b/data-model/src/main/java/org/alfresco/opencmis/CMISUtils.java similarity index 100% rename from src/main/java/org/alfresco/opencmis/CMISUtils.java rename to data-model/src/main/java/org/alfresco/opencmis/CMISUtils.java diff --git a/src/main/java/org/alfresco/opencmis/EnumFactory.java b/data-model/src/main/java/org/alfresco/opencmis/EnumFactory.java similarity index 100% rename from src/main/java/org/alfresco/opencmis/EnumFactory.java rename to data-model/src/main/java/org/alfresco/opencmis/EnumFactory.java diff --git a/src/main/java/org/alfresco/opencmis/EnumLabel.java b/data-model/src/main/java/org/alfresco/opencmis/EnumLabel.java similarity index 100% rename from src/main/java/org/alfresco/opencmis/EnumLabel.java rename to data-model/src/main/java/org/alfresco/opencmis/EnumLabel.java diff --git a/src/main/java/org/alfresco/opencmis/dictionary/AbstractTypeDefinitionWrapper.java b/data-model/src/main/java/org/alfresco/opencmis/dictionary/AbstractTypeDefinitionWrapper.java similarity index 100% rename from src/main/java/org/alfresco/opencmis/dictionary/AbstractTypeDefinitionWrapper.java rename to data-model/src/main/java/org/alfresco/opencmis/dictionary/AbstractTypeDefinitionWrapper.java diff --git a/src/main/java/org/alfresco/opencmis/dictionary/BasePropertyDefintionWrapper.java b/data-model/src/main/java/org/alfresco/opencmis/dictionary/BasePropertyDefintionWrapper.java similarity index 100% rename from src/main/java/org/alfresco/opencmis/dictionary/BasePropertyDefintionWrapper.java rename to data-model/src/main/java/org/alfresco/opencmis/dictionary/BasePropertyDefintionWrapper.java diff --git a/src/main/java/org/alfresco/opencmis/dictionary/CMISAbstractDictionaryService.java b/data-model/src/main/java/org/alfresco/opencmis/dictionary/CMISAbstractDictionaryService.java similarity index 100% rename from src/main/java/org/alfresco/opencmis/dictionary/CMISAbstractDictionaryService.java rename to data-model/src/main/java/org/alfresco/opencmis/dictionary/CMISAbstractDictionaryService.java diff --git a/src/main/java/org/alfresco/opencmis/dictionary/CMISActionEvaluator.java b/data-model/src/main/java/org/alfresco/opencmis/dictionary/CMISActionEvaluator.java similarity index 100% rename from src/main/java/org/alfresco/opencmis/dictionary/CMISActionEvaluator.java rename to data-model/src/main/java/org/alfresco/opencmis/dictionary/CMISActionEvaluator.java diff --git a/src/main/java/org/alfresco/opencmis/dictionary/CMISDictionaryRegistry.java b/data-model/src/main/java/org/alfresco/opencmis/dictionary/CMISDictionaryRegistry.java similarity index 100% rename from src/main/java/org/alfresco/opencmis/dictionary/CMISDictionaryRegistry.java rename to data-model/src/main/java/org/alfresco/opencmis/dictionary/CMISDictionaryRegistry.java diff --git a/src/main/java/org/alfresco/opencmis/dictionary/CMISDictionaryRegistryImpl.java b/data-model/src/main/java/org/alfresco/opencmis/dictionary/CMISDictionaryRegistryImpl.java similarity index 100% rename from src/main/java/org/alfresco/opencmis/dictionary/CMISDictionaryRegistryImpl.java rename to data-model/src/main/java/org/alfresco/opencmis/dictionary/CMISDictionaryRegistryImpl.java diff --git a/src/main/java/org/alfresco/opencmis/dictionary/CMISDictionaryService.java b/data-model/src/main/java/org/alfresco/opencmis/dictionary/CMISDictionaryService.java similarity index 100% rename from src/main/java/org/alfresco/opencmis/dictionary/CMISDictionaryService.java rename to data-model/src/main/java/org/alfresco/opencmis/dictionary/CMISDictionaryService.java diff --git a/src/main/java/org/alfresco/opencmis/dictionary/CMISNodeInfo.java b/data-model/src/main/java/org/alfresco/opencmis/dictionary/CMISNodeInfo.java similarity index 100% rename from src/main/java/org/alfresco/opencmis/dictionary/CMISNodeInfo.java rename to data-model/src/main/java/org/alfresco/opencmis/dictionary/CMISNodeInfo.java diff --git a/src/main/java/org/alfresco/opencmis/dictionary/CMISObjectVariant.java b/data-model/src/main/java/org/alfresco/opencmis/dictionary/CMISObjectVariant.java similarity index 100% rename from src/main/java/org/alfresco/opencmis/dictionary/CMISObjectVariant.java rename to data-model/src/main/java/org/alfresco/opencmis/dictionary/CMISObjectVariant.java diff --git a/src/main/java/org/alfresco/opencmis/dictionary/CMISPropertyAccessor.java b/data-model/src/main/java/org/alfresco/opencmis/dictionary/CMISPropertyAccessor.java similarity index 100% rename from src/main/java/org/alfresco/opencmis/dictionary/CMISPropertyAccessor.java rename to data-model/src/main/java/org/alfresco/opencmis/dictionary/CMISPropertyAccessor.java diff --git a/src/main/java/org/alfresco/opencmis/dictionary/CMISPropertyLuceneBuilder.java b/data-model/src/main/java/org/alfresco/opencmis/dictionary/CMISPropertyLuceneBuilder.java similarity index 100% rename from src/main/java/org/alfresco/opencmis/dictionary/CMISPropertyLuceneBuilder.java rename to data-model/src/main/java/org/alfresco/opencmis/dictionary/CMISPropertyLuceneBuilder.java diff --git a/src/main/java/org/alfresco/opencmis/dictionary/CMISStrictDictionaryService.java b/data-model/src/main/java/org/alfresco/opencmis/dictionary/CMISStrictDictionaryService.java similarity index 100% rename from src/main/java/org/alfresco/opencmis/dictionary/CMISStrictDictionaryService.java rename to data-model/src/main/java/org/alfresco/opencmis/dictionary/CMISStrictDictionaryService.java diff --git a/src/main/java/org/alfresco/opencmis/dictionary/DocumentTypeDefinitionWrapper.java b/data-model/src/main/java/org/alfresco/opencmis/dictionary/DocumentTypeDefinitionWrapper.java similarity index 100% rename from src/main/java/org/alfresco/opencmis/dictionary/DocumentTypeDefinitionWrapper.java rename to data-model/src/main/java/org/alfresco/opencmis/dictionary/DocumentTypeDefinitionWrapper.java diff --git a/src/main/java/org/alfresco/opencmis/dictionary/FilteredDictionaryComponent.java b/data-model/src/main/java/org/alfresco/opencmis/dictionary/FilteredDictionaryComponent.java similarity index 100% rename from src/main/java/org/alfresco/opencmis/dictionary/FilteredDictionaryComponent.java rename to data-model/src/main/java/org/alfresco/opencmis/dictionary/FilteredDictionaryComponent.java diff --git a/src/main/java/org/alfresco/opencmis/dictionary/FolderTypeDefintionWrapper.java b/data-model/src/main/java/org/alfresco/opencmis/dictionary/FolderTypeDefintionWrapper.java similarity index 100% rename from src/main/java/org/alfresco/opencmis/dictionary/FolderTypeDefintionWrapper.java rename to data-model/src/main/java/org/alfresco/opencmis/dictionary/FolderTypeDefintionWrapper.java diff --git a/src/main/java/org/alfresco/opencmis/dictionary/ItemTypeDefinitionWrapper.java b/data-model/src/main/java/org/alfresco/opencmis/dictionary/ItemTypeDefinitionWrapper.java similarity index 100% rename from src/main/java/org/alfresco/opencmis/dictionary/ItemTypeDefinitionWrapper.java rename to data-model/src/main/java/org/alfresco/opencmis/dictionary/ItemTypeDefinitionWrapper.java diff --git a/src/main/java/org/alfresco/opencmis/dictionary/PolicyTypeDefintionWrapper.java b/data-model/src/main/java/org/alfresco/opencmis/dictionary/PolicyTypeDefintionWrapper.java similarity index 100% rename from src/main/java/org/alfresco/opencmis/dictionary/PolicyTypeDefintionWrapper.java rename to data-model/src/main/java/org/alfresco/opencmis/dictionary/PolicyTypeDefintionWrapper.java diff --git a/src/main/java/org/alfresco/opencmis/dictionary/PropertyAccessorMapping.java b/data-model/src/main/java/org/alfresco/opencmis/dictionary/PropertyAccessorMapping.java similarity index 100% rename from src/main/java/org/alfresco/opencmis/dictionary/PropertyAccessorMapping.java rename to data-model/src/main/java/org/alfresco/opencmis/dictionary/PropertyAccessorMapping.java diff --git a/src/main/java/org/alfresco/opencmis/dictionary/PropertyDefinitionWrapper.java b/data-model/src/main/java/org/alfresco/opencmis/dictionary/PropertyDefinitionWrapper.java similarity index 100% rename from src/main/java/org/alfresco/opencmis/dictionary/PropertyDefinitionWrapper.java rename to data-model/src/main/java/org/alfresco/opencmis/dictionary/PropertyDefinitionWrapper.java diff --git a/src/main/java/org/alfresco/opencmis/dictionary/PropertyLuceneBuilderMapping.java b/data-model/src/main/java/org/alfresco/opencmis/dictionary/PropertyLuceneBuilderMapping.java similarity index 100% rename from src/main/java/org/alfresco/opencmis/dictionary/PropertyLuceneBuilderMapping.java rename to data-model/src/main/java/org/alfresco/opencmis/dictionary/PropertyLuceneBuilderMapping.java diff --git a/src/main/java/org/alfresco/opencmis/dictionary/QNameFilter.java b/data-model/src/main/java/org/alfresco/opencmis/dictionary/QNameFilter.java similarity index 100% rename from src/main/java/org/alfresco/opencmis/dictionary/QNameFilter.java rename to data-model/src/main/java/org/alfresco/opencmis/dictionary/QNameFilter.java diff --git a/src/main/java/org/alfresco/opencmis/dictionary/QNameFilterImpl.java b/data-model/src/main/java/org/alfresco/opencmis/dictionary/QNameFilterImpl.java similarity index 100% rename from src/main/java/org/alfresco/opencmis/dictionary/QNameFilterImpl.java rename to data-model/src/main/java/org/alfresco/opencmis/dictionary/QNameFilterImpl.java diff --git a/src/main/java/org/alfresco/opencmis/dictionary/RelationshipTypeDefintionWrapper.java b/data-model/src/main/java/org/alfresco/opencmis/dictionary/RelationshipTypeDefintionWrapper.java similarity index 100% rename from src/main/java/org/alfresco/opencmis/dictionary/RelationshipTypeDefintionWrapper.java rename to data-model/src/main/java/org/alfresco/opencmis/dictionary/RelationshipTypeDefintionWrapper.java diff --git a/src/main/java/org/alfresco/opencmis/dictionary/SecondaryTypeDefinitionWrapper.java b/data-model/src/main/java/org/alfresco/opencmis/dictionary/SecondaryTypeDefinitionWrapper.java similarity index 100% rename from src/main/java/org/alfresco/opencmis/dictionary/SecondaryTypeDefinitionWrapper.java rename to data-model/src/main/java/org/alfresco/opencmis/dictionary/SecondaryTypeDefinitionWrapper.java diff --git a/src/main/java/org/alfresco/opencmis/dictionary/ShadowTypeDefinitionWrapper.java b/data-model/src/main/java/org/alfresco/opencmis/dictionary/ShadowTypeDefinitionWrapper.java similarity index 100% rename from src/main/java/org/alfresco/opencmis/dictionary/ShadowTypeDefinitionWrapper.java rename to data-model/src/main/java/org/alfresco/opencmis/dictionary/ShadowTypeDefinitionWrapper.java diff --git a/src/main/java/org/alfresco/opencmis/dictionary/TypeDefinitionWrapper.java b/data-model/src/main/java/org/alfresco/opencmis/dictionary/TypeDefinitionWrapper.java similarity index 100% rename from src/main/java/org/alfresco/opencmis/dictionary/TypeDefinitionWrapper.java rename to data-model/src/main/java/org/alfresco/opencmis/dictionary/TypeDefinitionWrapper.java diff --git a/src/main/java/org/alfresco/opencmis/mapping/AbstractSimpleLuceneBuilder.java b/data-model/src/main/java/org/alfresco/opencmis/mapping/AbstractSimpleLuceneBuilder.java similarity index 100% rename from src/main/java/org/alfresco/opencmis/mapping/AbstractSimpleLuceneBuilder.java rename to data-model/src/main/java/org/alfresco/opencmis/mapping/AbstractSimpleLuceneBuilder.java diff --git a/src/main/java/org/alfresco/opencmis/mapping/BaseLuceneBuilder.java b/data-model/src/main/java/org/alfresco/opencmis/mapping/BaseLuceneBuilder.java similarity index 100% rename from src/main/java/org/alfresco/opencmis/mapping/BaseLuceneBuilder.java rename to data-model/src/main/java/org/alfresco/opencmis/mapping/BaseLuceneBuilder.java diff --git a/src/main/java/org/alfresco/opencmis/mapping/BaseTypeIdLuceneBuilder.java b/data-model/src/main/java/org/alfresco/opencmis/mapping/BaseTypeIdLuceneBuilder.java similarity index 100% rename from src/main/java/org/alfresco/opencmis/mapping/BaseTypeIdLuceneBuilder.java rename to data-model/src/main/java/org/alfresco/opencmis/mapping/BaseTypeIdLuceneBuilder.java diff --git a/src/main/java/org/alfresco/opencmis/mapping/CMISMapping.java b/data-model/src/main/java/org/alfresco/opencmis/mapping/CMISMapping.java similarity index 100% rename from src/main/java/org/alfresco/opencmis/mapping/CMISMapping.java rename to data-model/src/main/java/org/alfresco/opencmis/mapping/CMISMapping.java diff --git a/src/main/java/org/alfresco/opencmis/mapping/ContentStreamLengthLuceneBuilder.java b/data-model/src/main/java/org/alfresco/opencmis/mapping/ContentStreamLengthLuceneBuilder.java similarity index 100% rename from src/main/java/org/alfresco/opencmis/mapping/ContentStreamLengthLuceneBuilder.java rename to data-model/src/main/java/org/alfresco/opencmis/mapping/ContentStreamLengthLuceneBuilder.java diff --git a/src/main/java/org/alfresco/opencmis/mapping/ContentStreamMimetypeLuceneBuilder.java b/data-model/src/main/java/org/alfresco/opencmis/mapping/ContentStreamMimetypeLuceneBuilder.java similarity index 100% rename from src/main/java/org/alfresco/opencmis/mapping/ContentStreamMimetypeLuceneBuilder.java rename to data-model/src/main/java/org/alfresco/opencmis/mapping/ContentStreamMimetypeLuceneBuilder.java diff --git a/src/main/java/org/alfresco/opencmis/mapping/DirectLuceneBuilder.java b/data-model/src/main/java/org/alfresco/opencmis/mapping/DirectLuceneBuilder.java similarity index 100% rename from src/main/java/org/alfresco/opencmis/mapping/DirectLuceneBuilder.java rename to data-model/src/main/java/org/alfresco/opencmis/mapping/DirectLuceneBuilder.java diff --git a/src/main/java/org/alfresco/opencmis/mapping/FixedValueLuceneBuilder.java b/data-model/src/main/java/org/alfresco/opencmis/mapping/FixedValueLuceneBuilder.java similarity index 100% rename from src/main/java/org/alfresco/opencmis/mapping/FixedValueLuceneBuilder.java rename to data-model/src/main/java/org/alfresco/opencmis/mapping/FixedValueLuceneBuilder.java diff --git a/src/main/java/org/alfresco/opencmis/mapping/NotSupportedLuceneBuilder.java b/data-model/src/main/java/org/alfresco/opencmis/mapping/NotSupportedLuceneBuilder.java similarity index 100% rename from src/main/java/org/alfresco/opencmis/mapping/NotSupportedLuceneBuilder.java rename to data-model/src/main/java/org/alfresco/opencmis/mapping/NotSupportedLuceneBuilder.java diff --git a/src/main/java/org/alfresco/opencmis/mapping/ObjectIdLuceneBuilder.java b/data-model/src/main/java/org/alfresco/opencmis/mapping/ObjectIdLuceneBuilder.java similarity index 100% rename from src/main/java/org/alfresco/opencmis/mapping/ObjectIdLuceneBuilder.java rename to data-model/src/main/java/org/alfresco/opencmis/mapping/ObjectIdLuceneBuilder.java diff --git a/src/main/java/org/alfresco/opencmis/mapping/ObjectTypeIdLuceneBuilder.java b/data-model/src/main/java/org/alfresco/opencmis/mapping/ObjectTypeIdLuceneBuilder.java similarity index 100% rename from src/main/java/org/alfresco/opencmis/mapping/ObjectTypeIdLuceneBuilder.java rename to data-model/src/main/java/org/alfresco/opencmis/mapping/ObjectTypeIdLuceneBuilder.java diff --git a/src/main/java/org/alfresco/opencmis/mapping/ParentLuceneBuilder.java b/data-model/src/main/java/org/alfresco/opencmis/mapping/ParentLuceneBuilder.java similarity index 100% rename from src/main/java/org/alfresco/opencmis/mapping/ParentLuceneBuilder.java rename to data-model/src/main/java/org/alfresco/opencmis/mapping/ParentLuceneBuilder.java diff --git a/src/main/java/org/alfresco/opencmis/mapping/RuntimePropertyLuceneBuilderMapping.java b/data-model/src/main/java/org/alfresco/opencmis/mapping/RuntimePropertyLuceneBuilderMapping.java similarity index 100% rename from src/main/java/org/alfresco/opencmis/mapping/RuntimePropertyLuceneBuilderMapping.java rename to data-model/src/main/java/org/alfresco/opencmis/mapping/RuntimePropertyLuceneBuilderMapping.java diff --git a/src/main/java/org/alfresco/opencmis/search/CMISFTSQueryParser.java b/data-model/src/main/java/org/alfresco/opencmis/search/CMISFTSQueryParser.java similarity index 100% rename from src/main/java/org/alfresco/opencmis/search/CMISFTSQueryParser.java rename to data-model/src/main/java/org/alfresco/opencmis/search/CMISFTSQueryParser.java diff --git a/src/main/java/org/alfresco/opencmis/search/CMISQueryOptions.java b/data-model/src/main/java/org/alfresco/opencmis/search/CMISQueryOptions.java similarity index 100% rename from src/main/java/org/alfresco/opencmis/search/CMISQueryOptions.java rename to data-model/src/main/java/org/alfresco/opencmis/search/CMISQueryOptions.java diff --git a/src/main/java/org/alfresco/opencmis/search/CMISQueryParser.java b/data-model/src/main/java/org/alfresco/opencmis/search/CMISQueryParser.java similarity index 100% rename from src/main/java/org/alfresco/opencmis/search/CMISQueryParser.java rename to data-model/src/main/java/org/alfresco/opencmis/search/CMISQueryParser.java diff --git a/src/main/java/org/alfresco/opencmis/search/CmisFunctionEvaluationContext.java b/data-model/src/main/java/org/alfresco/opencmis/search/CmisFunctionEvaluationContext.java similarity index 100% rename from src/main/java/org/alfresco/opencmis/search/CmisFunctionEvaluationContext.java rename to data-model/src/main/java/org/alfresco/opencmis/search/CmisFunctionEvaluationContext.java diff --git a/src/main/java/org/alfresco/repo/cache/LockingCache.java b/data-model/src/main/java/org/alfresco/repo/cache/LockingCache.java similarity index 100% rename from src/main/java/org/alfresco/repo/cache/LockingCache.java rename to data-model/src/main/java/org/alfresco/repo/cache/LockingCache.java diff --git a/src/main/java/org/alfresco/repo/cache/MemoryCache.java b/data-model/src/main/java/org/alfresco/repo/cache/MemoryCache.java similarity index 100% rename from src/main/java/org/alfresco/repo/cache/MemoryCache.java rename to data-model/src/main/java/org/alfresco/repo/cache/MemoryCache.java diff --git a/src/main/java/org/alfresco/repo/cache/SimpleCache.java b/data-model/src/main/java/org/alfresco/repo/cache/SimpleCache.java similarity index 100% rename from src/main/java/org/alfresco/repo/cache/SimpleCache.java rename to data-model/src/main/java/org/alfresco/repo/cache/SimpleCache.java diff --git a/src/main/java/org/alfresco/repo/content/ContentContext.java b/data-model/src/main/java/org/alfresco/repo/content/ContentContext.java similarity index 100% rename from src/main/java/org/alfresco/repo/content/ContentContext.java rename to data-model/src/main/java/org/alfresco/repo/content/ContentContext.java diff --git a/src/main/java/org/alfresco/repo/content/ContentStore.java b/data-model/src/main/java/org/alfresco/repo/content/ContentStore.java similarity index 100% rename from src/main/java/org/alfresco/repo/content/ContentStore.java rename to data-model/src/main/java/org/alfresco/repo/content/ContentStore.java diff --git a/src/main/java/org/alfresco/repo/content/ContentStoreCaps.java b/data-model/src/main/java/org/alfresco/repo/content/ContentStoreCaps.java similarity index 100% rename from src/main/java/org/alfresco/repo/content/ContentStoreCaps.java rename to data-model/src/main/java/org/alfresco/repo/content/ContentStoreCaps.java diff --git a/src/main/java/org/alfresco/repo/content/MimetypeMap.java b/data-model/src/main/java/org/alfresco/repo/content/MimetypeMap.java similarity index 100% rename from src/main/java/org/alfresco/repo/content/MimetypeMap.java rename to data-model/src/main/java/org/alfresco/repo/content/MimetypeMap.java diff --git a/src/main/java/org/alfresco/repo/content/encoding/ContentCharsetFinder.java b/data-model/src/main/java/org/alfresco/repo/content/encoding/ContentCharsetFinder.java similarity index 100% rename from src/main/java/org/alfresco/repo/content/encoding/ContentCharsetFinder.java rename to data-model/src/main/java/org/alfresco/repo/content/encoding/ContentCharsetFinder.java diff --git a/src/main/java/org/alfresco/repo/dictionary/AbstractDictionaryRegistry.java b/data-model/src/main/java/org/alfresco/repo/dictionary/AbstractDictionaryRegistry.java similarity index 100% rename from src/main/java/org/alfresco/repo/dictionary/AbstractDictionaryRegistry.java rename to data-model/src/main/java/org/alfresco/repo/dictionary/AbstractDictionaryRegistry.java diff --git a/src/main/java/org/alfresco/repo/dictionary/CompiledModel.java b/data-model/src/main/java/org/alfresco/repo/dictionary/CompiledModel.java similarity index 100% rename from src/main/java/org/alfresco/repo/dictionary/CompiledModel.java rename to data-model/src/main/java/org/alfresco/repo/dictionary/CompiledModel.java diff --git a/src/main/java/org/alfresco/repo/dictionary/CompiledModelsCache.java b/data-model/src/main/java/org/alfresco/repo/dictionary/CompiledModelsCache.java similarity index 100% rename from src/main/java/org/alfresco/repo/dictionary/CompiledModelsCache.java rename to data-model/src/main/java/org/alfresco/repo/dictionary/CompiledModelsCache.java diff --git a/src/main/java/org/alfresco/repo/dictionary/CoreDictionaryRegistryImpl.java b/data-model/src/main/java/org/alfresco/repo/dictionary/CoreDictionaryRegistryImpl.java similarity index 100% rename from src/main/java/org/alfresco/repo/dictionary/CoreDictionaryRegistryImpl.java rename to data-model/src/main/java/org/alfresco/repo/dictionary/CoreDictionaryRegistryImpl.java diff --git a/src/main/java/org/alfresco/repo/dictionary/CustomModelDefinitionImpl.java b/data-model/src/main/java/org/alfresco/repo/dictionary/CustomModelDefinitionImpl.java similarity index 100% rename from src/main/java/org/alfresco/repo/dictionary/CustomModelDefinitionImpl.java rename to data-model/src/main/java/org/alfresco/repo/dictionary/CustomModelDefinitionImpl.java diff --git a/src/main/java/org/alfresco/repo/dictionary/CustomModelsInfo.java b/data-model/src/main/java/org/alfresco/repo/dictionary/CustomModelsInfo.java similarity index 100% rename from src/main/java/org/alfresco/repo/dictionary/CustomModelsInfo.java rename to data-model/src/main/java/org/alfresco/repo/dictionary/CustomModelsInfo.java diff --git a/src/main/java/org/alfresco/repo/dictionary/DelegateModelQuery.java b/data-model/src/main/java/org/alfresco/repo/dictionary/DelegateModelQuery.java similarity index 100% rename from src/main/java/org/alfresco/repo/dictionary/DelegateModelQuery.java rename to data-model/src/main/java/org/alfresco/repo/dictionary/DelegateModelQuery.java diff --git a/src/main/java/org/alfresco/repo/dictionary/DictionaryBootstrap.java b/data-model/src/main/java/org/alfresco/repo/dictionary/DictionaryBootstrap.java similarity index 100% rename from src/main/java/org/alfresco/repo/dictionary/DictionaryBootstrap.java rename to data-model/src/main/java/org/alfresco/repo/dictionary/DictionaryBootstrap.java diff --git a/src/main/java/org/alfresco/repo/dictionary/DictionaryComponent.java b/data-model/src/main/java/org/alfresco/repo/dictionary/DictionaryComponent.java similarity index 100% rename from src/main/java/org/alfresco/repo/dictionary/DictionaryComponent.java rename to data-model/src/main/java/org/alfresco/repo/dictionary/DictionaryComponent.java diff --git a/src/main/java/org/alfresco/repo/dictionary/DictionaryDAO.java b/data-model/src/main/java/org/alfresco/repo/dictionary/DictionaryDAO.java similarity index 100% rename from src/main/java/org/alfresco/repo/dictionary/DictionaryDAO.java rename to data-model/src/main/java/org/alfresco/repo/dictionary/DictionaryDAO.java diff --git a/src/main/java/org/alfresco/repo/dictionary/DictionaryDAOImpl.java b/data-model/src/main/java/org/alfresco/repo/dictionary/DictionaryDAOImpl.java similarity index 100% rename from src/main/java/org/alfresco/repo/dictionary/DictionaryDAOImpl.java rename to data-model/src/main/java/org/alfresco/repo/dictionary/DictionaryDAOImpl.java diff --git a/src/main/java/org/alfresco/repo/dictionary/DictionaryListener.java b/data-model/src/main/java/org/alfresco/repo/dictionary/DictionaryListener.java similarity index 100% rename from src/main/java/org/alfresco/repo/dictionary/DictionaryListener.java rename to data-model/src/main/java/org/alfresco/repo/dictionary/DictionaryListener.java diff --git a/src/main/java/org/alfresco/repo/dictionary/DictionaryNamespaceComponent.java b/data-model/src/main/java/org/alfresco/repo/dictionary/DictionaryNamespaceComponent.java similarity index 100% rename from src/main/java/org/alfresco/repo/dictionary/DictionaryNamespaceComponent.java rename to data-model/src/main/java/org/alfresco/repo/dictionary/DictionaryNamespaceComponent.java diff --git a/src/main/java/org/alfresco/repo/dictionary/DictionaryRegistry.java b/data-model/src/main/java/org/alfresco/repo/dictionary/DictionaryRegistry.java similarity index 100% rename from src/main/java/org/alfresco/repo/dictionary/DictionaryRegistry.java rename to data-model/src/main/java/org/alfresco/repo/dictionary/DictionaryRegistry.java diff --git a/src/main/java/org/alfresco/repo/dictionary/ExtendedDictionaryListener.java b/data-model/src/main/java/org/alfresco/repo/dictionary/ExtendedDictionaryListener.java similarity index 100% rename from src/main/java/org/alfresco/repo/dictionary/ExtendedDictionaryListener.java rename to data-model/src/main/java/org/alfresco/repo/dictionary/ExtendedDictionaryListener.java diff --git a/src/main/java/org/alfresco/repo/dictionary/Facetable.java b/data-model/src/main/java/org/alfresco/repo/dictionary/Facetable.java similarity index 100% rename from src/main/java/org/alfresco/repo/dictionary/Facetable.java rename to data-model/src/main/java/org/alfresco/repo/dictionary/Facetable.java diff --git a/src/main/java/org/alfresco/repo/dictionary/IndexTokenisationMode.java b/data-model/src/main/java/org/alfresco/repo/dictionary/IndexTokenisationMode.java similarity index 100% rename from src/main/java/org/alfresco/repo/dictionary/IndexTokenisationMode.java rename to data-model/src/main/java/org/alfresco/repo/dictionary/IndexTokenisationMode.java diff --git a/src/main/java/org/alfresco/repo/dictionary/M2AnonymousTypeDefinition.java b/data-model/src/main/java/org/alfresco/repo/dictionary/M2AnonymousTypeDefinition.java similarity index 100% rename from src/main/java/org/alfresco/repo/dictionary/M2AnonymousTypeDefinition.java rename to data-model/src/main/java/org/alfresco/repo/dictionary/M2AnonymousTypeDefinition.java diff --git a/src/main/java/org/alfresco/repo/dictionary/M2Aspect.java b/data-model/src/main/java/org/alfresco/repo/dictionary/M2Aspect.java similarity index 100% rename from src/main/java/org/alfresco/repo/dictionary/M2Aspect.java rename to data-model/src/main/java/org/alfresco/repo/dictionary/M2Aspect.java diff --git a/src/main/java/org/alfresco/repo/dictionary/M2AspectDefinition.java b/data-model/src/main/java/org/alfresco/repo/dictionary/M2AspectDefinition.java similarity index 100% rename from src/main/java/org/alfresco/repo/dictionary/M2AspectDefinition.java rename to data-model/src/main/java/org/alfresco/repo/dictionary/M2AspectDefinition.java diff --git a/src/main/java/org/alfresco/repo/dictionary/M2Association.java b/data-model/src/main/java/org/alfresco/repo/dictionary/M2Association.java similarity index 100% rename from src/main/java/org/alfresco/repo/dictionary/M2Association.java rename to data-model/src/main/java/org/alfresco/repo/dictionary/M2Association.java diff --git a/src/main/java/org/alfresco/repo/dictionary/M2AssociationDefinition.java b/data-model/src/main/java/org/alfresco/repo/dictionary/M2AssociationDefinition.java similarity index 100% rename from src/main/java/org/alfresco/repo/dictionary/M2AssociationDefinition.java rename to data-model/src/main/java/org/alfresco/repo/dictionary/M2AssociationDefinition.java diff --git a/src/main/java/org/alfresco/repo/dictionary/M2ChildAssociation.java b/data-model/src/main/java/org/alfresco/repo/dictionary/M2ChildAssociation.java similarity index 100% rename from src/main/java/org/alfresco/repo/dictionary/M2ChildAssociation.java rename to data-model/src/main/java/org/alfresco/repo/dictionary/M2ChildAssociation.java diff --git a/src/main/java/org/alfresco/repo/dictionary/M2ChildAssociationDefinition.java b/data-model/src/main/java/org/alfresco/repo/dictionary/M2ChildAssociationDefinition.java similarity index 100% rename from src/main/java/org/alfresco/repo/dictionary/M2ChildAssociationDefinition.java rename to data-model/src/main/java/org/alfresco/repo/dictionary/M2ChildAssociationDefinition.java diff --git a/src/main/java/org/alfresco/repo/dictionary/M2Class.java b/data-model/src/main/java/org/alfresco/repo/dictionary/M2Class.java similarity index 100% rename from src/main/java/org/alfresco/repo/dictionary/M2Class.java rename to data-model/src/main/java/org/alfresco/repo/dictionary/M2Class.java diff --git a/src/main/java/org/alfresco/repo/dictionary/M2ClassAssociation.java b/data-model/src/main/java/org/alfresco/repo/dictionary/M2ClassAssociation.java similarity index 100% rename from src/main/java/org/alfresco/repo/dictionary/M2ClassAssociation.java rename to data-model/src/main/java/org/alfresco/repo/dictionary/M2ClassAssociation.java diff --git a/src/main/java/org/alfresco/repo/dictionary/M2ClassDefinition.java b/data-model/src/main/java/org/alfresco/repo/dictionary/M2ClassDefinition.java similarity index 100% rename from src/main/java/org/alfresco/repo/dictionary/M2ClassDefinition.java rename to data-model/src/main/java/org/alfresco/repo/dictionary/M2ClassDefinition.java diff --git a/src/main/java/org/alfresco/repo/dictionary/M2Constraint.java b/data-model/src/main/java/org/alfresco/repo/dictionary/M2Constraint.java similarity index 100% rename from src/main/java/org/alfresco/repo/dictionary/M2Constraint.java rename to data-model/src/main/java/org/alfresco/repo/dictionary/M2Constraint.java diff --git a/src/main/java/org/alfresco/repo/dictionary/M2ConstraintDefinition.java b/data-model/src/main/java/org/alfresco/repo/dictionary/M2ConstraintDefinition.java similarity index 100% rename from src/main/java/org/alfresco/repo/dictionary/M2ConstraintDefinition.java rename to data-model/src/main/java/org/alfresco/repo/dictionary/M2ConstraintDefinition.java diff --git a/src/main/java/org/alfresco/repo/dictionary/M2DataType.java b/data-model/src/main/java/org/alfresco/repo/dictionary/M2DataType.java similarity index 100% rename from src/main/java/org/alfresco/repo/dictionary/M2DataType.java rename to data-model/src/main/java/org/alfresco/repo/dictionary/M2DataType.java diff --git a/src/main/java/org/alfresco/repo/dictionary/M2DataTypeDefinition.java b/data-model/src/main/java/org/alfresco/repo/dictionary/M2DataTypeDefinition.java similarity index 100% rename from src/main/java/org/alfresco/repo/dictionary/M2DataTypeDefinition.java rename to data-model/src/main/java/org/alfresco/repo/dictionary/M2DataTypeDefinition.java diff --git a/src/main/java/org/alfresco/repo/dictionary/M2Label.java b/data-model/src/main/java/org/alfresco/repo/dictionary/M2Label.java similarity index 100% rename from src/main/java/org/alfresco/repo/dictionary/M2Label.java rename to data-model/src/main/java/org/alfresco/repo/dictionary/M2Label.java diff --git a/src/main/java/org/alfresco/repo/dictionary/M2Model.java b/data-model/src/main/java/org/alfresco/repo/dictionary/M2Model.java similarity index 100% rename from src/main/java/org/alfresco/repo/dictionary/M2Model.java rename to data-model/src/main/java/org/alfresco/repo/dictionary/M2Model.java diff --git a/src/main/java/org/alfresco/repo/dictionary/M2ModelDefinition.java b/data-model/src/main/java/org/alfresco/repo/dictionary/M2ModelDefinition.java similarity index 100% rename from src/main/java/org/alfresco/repo/dictionary/M2ModelDefinition.java rename to data-model/src/main/java/org/alfresco/repo/dictionary/M2ModelDefinition.java diff --git a/src/main/java/org/alfresco/repo/dictionary/M2ModelDiff.java b/data-model/src/main/java/org/alfresco/repo/dictionary/M2ModelDiff.java similarity index 100% rename from src/main/java/org/alfresco/repo/dictionary/M2ModelDiff.java rename to data-model/src/main/java/org/alfresco/repo/dictionary/M2ModelDiff.java diff --git a/src/main/java/org/alfresco/repo/dictionary/M2NamedValue.java b/data-model/src/main/java/org/alfresco/repo/dictionary/M2NamedValue.java similarity index 100% rename from src/main/java/org/alfresco/repo/dictionary/M2NamedValue.java rename to data-model/src/main/java/org/alfresco/repo/dictionary/M2NamedValue.java diff --git a/src/main/java/org/alfresco/repo/dictionary/M2Namespace.java b/data-model/src/main/java/org/alfresco/repo/dictionary/M2Namespace.java similarity index 100% rename from src/main/java/org/alfresco/repo/dictionary/M2Namespace.java rename to data-model/src/main/java/org/alfresco/repo/dictionary/M2Namespace.java diff --git a/src/main/java/org/alfresco/repo/dictionary/M2NamespaceDefinition.java b/data-model/src/main/java/org/alfresco/repo/dictionary/M2NamespaceDefinition.java similarity index 100% rename from src/main/java/org/alfresco/repo/dictionary/M2NamespaceDefinition.java rename to data-model/src/main/java/org/alfresco/repo/dictionary/M2NamespaceDefinition.java diff --git a/src/main/java/org/alfresco/repo/dictionary/M2Property.java b/data-model/src/main/java/org/alfresco/repo/dictionary/M2Property.java similarity index 100% rename from src/main/java/org/alfresco/repo/dictionary/M2Property.java rename to data-model/src/main/java/org/alfresco/repo/dictionary/M2Property.java diff --git a/src/main/java/org/alfresco/repo/dictionary/M2PropertyDefinition.java b/data-model/src/main/java/org/alfresco/repo/dictionary/M2PropertyDefinition.java similarity index 100% rename from src/main/java/org/alfresco/repo/dictionary/M2PropertyDefinition.java rename to data-model/src/main/java/org/alfresco/repo/dictionary/M2PropertyDefinition.java diff --git a/src/main/java/org/alfresco/repo/dictionary/M2PropertyOverride.java b/data-model/src/main/java/org/alfresco/repo/dictionary/M2PropertyOverride.java similarity index 100% rename from src/main/java/org/alfresco/repo/dictionary/M2PropertyOverride.java rename to data-model/src/main/java/org/alfresco/repo/dictionary/M2PropertyOverride.java diff --git a/src/main/java/org/alfresco/repo/dictionary/M2Type.java b/data-model/src/main/java/org/alfresco/repo/dictionary/M2Type.java similarity index 100% rename from src/main/java/org/alfresco/repo/dictionary/M2Type.java rename to data-model/src/main/java/org/alfresco/repo/dictionary/M2Type.java diff --git a/src/main/java/org/alfresco/repo/dictionary/M2TypeDefinition.java b/data-model/src/main/java/org/alfresco/repo/dictionary/M2TypeDefinition.java similarity index 100% rename from src/main/java/org/alfresco/repo/dictionary/M2TypeDefinition.java rename to data-model/src/main/java/org/alfresco/repo/dictionary/M2TypeDefinition.java diff --git a/src/main/java/org/alfresco/repo/dictionary/M2XML.java b/data-model/src/main/java/org/alfresco/repo/dictionary/M2XML.java similarity index 100% rename from src/main/java/org/alfresco/repo/dictionary/M2XML.java rename to data-model/src/main/java/org/alfresco/repo/dictionary/M2XML.java diff --git a/src/main/java/org/alfresco/repo/dictionary/ModelQuery.java b/data-model/src/main/java/org/alfresco/repo/dictionary/ModelQuery.java similarity index 100% rename from src/main/java/org/alfresco/repo/dictionary/ModelQuery.java rename to data-model/src/main/java/org/alfresco/repo/dictionary/ModelQuery.java diff --git a/src/main/java/org/alfresco/repo/dictionary/NamespaceDAO.java b/data-model/src/main/java/org/alfresco/repo/dictionary/NamespaceDAO.java similarity index 100% rename from src/main/java/org/alfresco/repo/dictionary/NamespaceDAO.java rename to data-model/src/main/java/org/alfresco/repo/dictionary/NamespaceDAO.java diff --git a/src/main/java/org/alfresco/repo/dictionary/TenantDictionaryRegistryImpl.java b/data-model/src/main/java/org/alfresco/repo/dictionary/TenantDictionaryRegistryImpl.java similarity index 100% rename from src/main/java/org/alfresco/repo/dictionary/TenantDictionaryRegistryImpl.java rename to data-model/src/main/java/org/alfresco/repo/dictionary/TenantDictionaryRegistryImpl.java diff --git a/src/main/java/org/alfresco/repo/dictionary/constraint/AbstractConstraint.java b/data-model/src/main/java/org/alfresco/repo/dictionary/constraint/AbstractConstraint.java similarity index 100% rename from src/main/java/org/alfresco/repo/dictionary/constraint/AbstractConstraint.java rename to data-model/src/main/java/org/alfresco/repo/dictionary/constraint/AbstractConstraint.java diff --git a/src/main/java/org/alfresco/repo/dictionary/constraint/ConstraintRegistry.java b/data-model/src/main/java/org/alfresco/repo/dictionary/constraint/ConstraintRegistry.java similarity index 100% rename from src/main/java/org/alfresco/repo/dictionary/constraint/ConstraintRegistry.java rename to data-model/src/main/java/org/alfresco/repo/dictionary/constraint/ConstraintRegistry.java diff --git a/src/main/java/org/alfresco/repo/dictionary/constraint/ListOfValuesConstraint.java b/data-model/src/main/java/org/alfresco/repo/dictionary/constraint/ListOfValuesConstraint.java similarity index 100% rename from src/main/java/org/alfresco/repo/dictionary/constraint/ListOfValuesConstraint.java rename to data-model/src/main/java/org/alfresco/repo/dictionary/constraint/ListOfValuesConstraint.java diff --git a/src/main/java/org/alfresco/repo/dictionary/constraint/NameChecker.java b/data-model/src/main/java/org/alfresco/repo/dictionary/constraint/NameChecker.java similarity index 100% rename from src/main/java/org/alfresco/repo/dictionary/constraint/NameChecker.java rename to data-model/src/main/java/org/alfresco/repo/dictionary/constraint/NameChecker.java diff --git a/src/main/java/org/alfresco/repo/dictionary/constraint/NoOpConstraint.java b/data-model/src/main/java/org/alfresco/repo/dictionary/constraint/NoOpConstraint.java similarity index 100% rename from src/main/java/org/alfresco/repo/dictionary/constraint/NoOpConstraint.java rename to data-model/src/main/java/org/alfresco/repo/dictionary/constraint/NoOpConstraint.java diff --git a/src/main/java/org/alfresco/repo/dictionary/constraint/NumericRangeConstraint.java b/data-model/src/main/java/org/alfresco/repo/dictionary/constraint/NumericRangeConstraint.java similarity index 100% rename from src/main/java/org/alfresco/repo/dictionary/constraint/NumericRangeConstraint.java rename to data-model/src/main/java/org/alfresco/repo/dictionary/constraint/NumericRangeConstraint.java diff --git a/src/main/java/org/alfresco/repo/dictionary/constraint/RegexConstraint.java b/data-model/src/main/java/org/alfresco/repo/dictionary/constraint/RegexConstraint.java similarity index 100% rename from src/main/java/org/alfresco/repo/dictionary/constraint/RegexConstraint.java rename to data-model/src/main/java/org/alfresco/repo/dictionary/constraint/RegexConstraint.java diff --git a/src/main/java/org/alfresco/repo/dictionary/constraint/RegisteredConstraint.java b/data-model/src/main/java/org/alfresco/repo/dictionary/constraint/RegisteredConstraint.java similarity index 100% rename from src/main/java/org/alfresco/repo/dictionary/constraint/RegisteredConstraint.java rename to data-model/src/main/java/org/alfresco/repo/dictionary/constraint/RegisteredConstraint.java diff --git a/src/main/java/org/alfresco/repo/dictionary/constraint/StringLengthConstraint.java b/data-model/src/main/java/org/alfresco/repo/dictionary/constraint/StringLengthConstraint.java similarity index 100% rename from src/main/java/org/alfresco/repo/dictionary/constraint/StringLengthConstraint.java rename to data-model/src/main/java/org/alfresco/repo/dictionary/constraint/StringLengthConstraint.java diff --git a/src/main/java/org/alfresco/repo/dictionary/m2binding.xml b/data-model/src/main/java/org/alfresco/repo/dictionary/m2binding.xml similarity index 100% rename from src/main/java/org/alfresco/repo/dictionary/m2binding.xml rename to data-model/src/main/java/org/alfresco/repo/dictionary/m2binding.xml diff --git a/src/main/java/org/alfresco/repo/i18n/StaticMessageLookup.java b/data-model/src/main/java/org/alfresco/repo/i18n/StaticMessageLookup.java similarity index 100% rename from src/main/java/org/alfresco/repo/i18n/StaticMessageLookup.java rename to data-model/src/main/java/org/alfresco/repo/i18n/StaticMessageLookup.java diff --git a/src/main/java/org/alfresco/repo/index/shard/Floc.java b/data-model/src/main/java/org/alfresco/repo/index/shard/Floc.java similarity index 100% rename from src/main/java/org/alfresco/repo/index/shard/Floc.java rename to data-model/src/main/java/org/alfresco/repo/index/shard/Floc.java diff --git a/src/main/java/org/alfresco/repo/index/shard/Shard.java b/data-model/src/main/java/org/alfresco/repo/index/shard/Shard.java similarity index 100% rename from src/main/java/org/alfresco/repo/index/shard/Shard.java rename to data-model/src/main/java/org/alfresco/repo/index/shard/Shard.java diff --git a/src/main/java/org/alfresco/repo/index/shard/ShardInstance.java b/data-model/src/main/java/org/alfresco/repo/index/shard/ShardInstance.java similarity index 100% rename from src/main/java/org/alfresco/repo/index/shard/ShardInstance.java rename to data-model/src/main/java/org/alfresco/repo/index/shard/ShardInstance.java diff --git a/src/main/java/org/alfresco/repo/index/shard/ShardMethodEnum.java b/data-model/src/main/java/org/alfresco/repo/index/shard/ShardMethodEnum.java similarity index 100% rename from src/main/java/org/alfresco/repo/index/shard/ShardMethodEnum.java rename to data-model/src/main/java/org/alfresco/repo/index/shard/ShardMethodEnum.java diff --git a/src/main/java/org/alfresco/repo/index/shard/ShardState.java b/data-model/src/main/java/org/alfresco/repo/index/shard/ShardState.java similarity index 100% rename from src/main/java/org/alfresco/repo/index/shard/ShardState.java rename to data-model/src/main/java/org/alfresco/repo/index/shard/ShardState.java diff --git a/src/main/java/org/alfresco/repo/index/shard/ShardStateBuilder.java b/data-model/src/main/java/org/alfresco/repo/index/shard/ShardStateBuilder.java similarity index 100% rename from src/main/java/org/alfresco/repo/index/shard/ShardStateBuilder.java rename to data-model/src/main/java/org/alfresco/repo/index/shard/ShardStateBuilder.java diff --git a/src/main/java/org/alfresco/repo/search/MLAnalysisMode.java b/data-model/src/main/java/org/alfresco/repo/search/MLAnalysisMode.java similarity index 100% rename from src/main/java/org/alfresco/repo/search/MLAnalysisMode.java rename to data-model/src/main/java/org/alfresco/repo/search/MLAnalysisMode.java diff --git a/src/main/java/org/alfresco/repo/search/adaptor/lucene/AnalysisMode.java b/data-model/src/main/java/org/alfresco/repo/search/adaptor/lucene/AnalysisMode.java similarity index 100% rename from src/main/java/org/alfresco/repo/search/adaptor/lucene/AnalysisMode.java rename to data-model/src/main/java/org/alfresco/repo/search/adaptor/lucene/AnalysisMode.java diff --git a/src/main/java/org/alfresco/repo/search/adaptor/lucene/LuceneFunction.java b/data-model/src/main/java/org/alfresco/repo/search/adaptor/lucene/LuceneFunction.java similarity index 100% rename from src/main/java/org/alfresco/repo/search/adaptor/lucene/LuceneFunction.java rename to data-model/src/main/java/org/alfresco/repo/search/adaptor/lucene/LuceneFunction.java diff --git a/src/main/java/org/alfresco/repo/search/adaptor/lucene/LuceneQueryParserAdaptor.java b/data-model/src/main/java/org/alfresco/repo/search/adaptor/lucene/LuceneQueryParserAdaptor.java similarity index 100% rename from src/main/java/org/alfresco/repo/search/adaptor/lucene/LuceneQueryParserAdaptor.java rename to data-model/src/main/java/org/alfresco/repo/search/adaptor/lucene/LuceneQueryParserAdaptor.java diff --git a/src/main/java/org/alfresco/repo/search/adaptor/lucene/LuceneQueryParserExpressionAdaptor.java b/data-model/src/main/java/org/alfresco/repo/search/adaptor/lucene/LuceneQueryParserExpressionAdaptor.java similarity index 100% rename from src/main/java/org/alfresco/repo/search/adaptor/lucene/LuceneQueryParserExpressionAdaptor.java rename to data-model/src/main/java/org/alfresco/repo/search/adaptor/lucene/LuceneQueryParserExpressionAdaptor.java diff --git a/src/main/java/org/alfresco/repo/search/adaptor/lucene/QueryConstants.java b/data-model/src/main/java/org/alfresco/repo/search/adaptor/lucene/QueryConstants.java similarity index 100% rename from src/main/java/org/alfresco/repo/search/adaptor/lucene/QueryConstants.java rename to data-model/src/main/java/org/alfresco/repo/search/adaptor/lucene/QueryConstants.java diff --git a/src/main/java/org/alfresco/repo/search/impl/QueryParserUtils.java b/data-model/src/main/java/org/alfresco/repo/search/impl/QueryParserUtils.java similarity index 100% rename from src/main/java/org/alfresco/repo/search/impl/QueryParserUtils.java rename to data-model/src/main/java/org/alfresco/repo/search/impl/QueryParserUtils.java diff --git a/src/main/java/org/alfresco/repo/search/impl/parsers/AlfrescoFunctionEvaluationContext.java b/data-model/src/main/java/org/alfresco/repo/search/impl/parsers/AlfrescoFunctionEvaluationContext.java similarity index 100% rename from src/main/java/org/alfresco/repo/search/impl/parsers/AlfrescoFunctionEvaluationContext.java rename to data-model/src/main/java/org/alfresco/repo/search/impl/parsers/AlfrescoFunctionEvaluationContext.java diff --git a/src/main/java/org/alfresco/repo/search/impl/parsers/CMIS.g b/data-model/src/main/java/org/alfresco/repo/search/impl/parsers/CMIS.g similarity index 100% rename from src/main/java/org/alfresco/repo/search/impl/parsers/CMIS.g rename to data-model/src/main/java/org/alfresco/repo/search/impl/parsers/CMIS.g diff --git a/src/main/java/org/alfresco/repo/search/impl/parsers/CMIS.tokens b/data-model/src/main/java/org/alfresco/repo/search/impl/parsers/CMIS.tokens similarity index 100% rename from src/main/java/org/alfresco/repo/search/impl/parsers/CMIS.tokens rename to data-model/src/main/java/org/alfresco/repo/search/impl/parsers/CMIS.tokens diff --git a/src/main/java/org/alfresco/repo/search/impl/parsers/CMISLexer.java b/data-model/src/main/java/org/alfresco/repo/search/impl/parsers/CMISLexer.java similarity index 100% rename from src/main/java/org/alfresco/repo/search/impl/parsers/CMISLexer.java rename to data-model/src/main/java/org/alfresco/repo/search/impl/parsers/CMISLexer.java diff --git a/src/main/java/org/alfresco/repo/search/impl/parsers/CMISParser.java b/data-model/src/main/java/org/alfresco/repo/search/impl/parsers/CMISParser.java similarity index 100% rename from src/main/java/org/alfresco/repo/search/impl/parsers/CMISParser.java rename to data-model/src/main/java/org/alfresco/repo/search/impl/parsers/CMISParser.java diff --git a/src/main/java/org/alfresco/repo/search/impl/parsers/CMIS_FTS.g b/data-model/src/main/java/org/alfresco/repo/search/impl/parsers/CMIS_FTS.g similarity index 100% rename from src/main/java/org/alfresco/repo/search/impl/parsers/CMIS_FTS.g rename to data-model/src/main/java/org/alfresco/repo/search/impl/parsers/CMIS_FTS.g diff --git a/src/main/java/org/alfresco/repo/search/impl/parsers/CMIS_FTS.tokens b/data-model/src/main/java/org/alfresco/repo/search/impl/parsers/CMIS_FTS.tokens similarity index 100% rename from src/main/java/org/alfresco/repo/search/impl/parsers/CMIS_FTS.tokens rename to data-model/src/main/java/org/alfresco/repo/search/impl/parsers/CMIS_FTS.tokens diff --git a/src/main/java/org/alfresco/repo/search/impl/parsers/CMIS_FTSLexer.java b/data-model/src/main/java/org/alfresco/repo/search/impl/parsers/CMIS_FTSLexer.java similarity index 100% rename from src/main/java/org/alfresco/repo/search/impl/parsers/CMIS_FTSLexer.java rename to data-model/src/main/java/org/alfresco/repo/search/impl/parsers/CMIS_FTSLexer.java diff --git a/src/main/java/org/alfresco/repo/search/impl/parsers/CMIS_FTSParser.java b/data-model/src/main/java/org/alfresco/repo/search/impl/parsers/CMIS_FTSParser.java similarity index 100% rename from src/main/java/org/alfresco/repo/search/impl/parsers/CMIS_FTSParser.java rename to data-model/src/main/java/org/alfresco/repo/search/impl/parsers/CMIS_FTSParser.java diff --git a/src/main/java/org/alfresco/repo/search/impl/parsers/FTS.g b/data-model/src/main/java/org/alfresco/repo/search/impl/parsers/FTS.g similarity index 100% rename from src/main/java/org/alfresco/repo/search/impl/parsers/FTS.g rename to data-model/src/main/java/org/alfresco/repo/search/impl/parsers/FTS.g diff --git a/src/main/java/org/alfresco/repo/search/impl/parsers/FTS.tokens b/data-model/src/main/java/org/alfresco/repo/search/impl/parsers/FTS.tokens similarity index 100% rename from src/main/java/org/alfresco/repo/search/impl/parsers/FTS.tokens rename to data-model/src/main/java/org/alfresco/repo/search/impl/parsers/FTS.tokens diff --git a/src/main/java/org/alfresco/repo/search/impl/parsers/FTSLexer.java b/data-model/src/main/java/org/alfresco/repo/search/impl/parsers/FTSLexer.java similarity index 100% rename from src/main/java/org/alfresco/repo/search/impl/parsers/FTSLexer.java rename to data-model/src/main/java/org/alfresco/repo/search/impl/parsers/FTSLexer.java diff --git a/src/main/java/org/alfresco/repo/search/impl/parsers/FTSParser.java b/data-model/src/main/java/org/alfresco/repo/search/impl/parsers/FTSParser.java similarity index 100% rename from src/main/java/org/alfresco/repo/search/impl/parsers/FTSParser.java rename to data-model/src/main/java/org/alfresco/repo/search/impl/parsers/FTSParser.java diff --git a/src/main/java/org/alfresco/repo/search/impl/parsers/FTSQueryException.java b/data-model/src/main/java/org/alfresco/repo/search/impl/parsers/FTSQueryException.java similarity index 100% rename from src/main/java/org/alfresco/repo/search/impl/parsers/FTSQueryException.java rename to data-model/src/main/java/org/alfresco/repo/search/impl/parsers/FTSQueryException.java diff --git a/src/main/java/org/alfresco/repo/search/impl/parsers/FTSQueryParser.java b/data-model/src/main/java/org/alfresco/repo/search/impl/parsers/FTSQueryParser.java similarity index 100% rename from src/main/java/org/alfresco/repo/search/impl/parsers/FTSQueryParser.java rename to data-model/src/main/java/org/alfresco/repo/search/impl/parsers/FTSQueryParser.java diff --git a/src/main/java/org/alfresco/repo/search/impl/parsers/GenerateUnicodeRanges.java b/data-model/src/main/java/org/alfresco/repo/search/impl/parsers/GenerateUnicodeRanges.java similarity index 100% rename from src/main/java/org/alfresco/repo/search/impl/parsers/GenerateUnicodeRanges.java rename to data-model/src/main/java/org/alfresco/repo/search/impl/parsers/GenerateUnicodeRanges.java diff --git a/src/main/java/org/alfresco/repo/search/impl/parsers/README.md b/data-model/src/main/java/org/alfresco/repo/search/impl/parsers/README.md similarity index 100% rename from src/main/java/org/alfresco/repo/search/impl/parsers/README.md rename to data-model/src/main/java/org/alfresco/repo/search/impl/parsers/README.md diff --git a/src/main/java/org/alfresco/repo/search/impl/querymodel/Argument.java b/data-model/src/main/java/org/alfresco/repo/search/impl/querymodel/Argument.java similarity index 100% rename from src/main/java/org/alfresco/repo/search/impl/querymodel/Argument.java rename to data-model/src/main/java/org/alfresco/repo/search/impl/querymodel/Argument.java diff --git a/src/main/java/org/alfresco/repo/search/impl/querymodel/ArgumentDefinition.java b/data-model/src/main/java/org/alfresco/repo/search/impl/querymodel/ArgumentDefinition.java similarity index 100% rename from src/main/java/org/alfresco/repo/search/impl/querymodel/ArgumentDefinition.java rename to data-model/src/main/java/org/alfresco/repo/search/impl/querymodel/ArgumentDefinition.java diff --git a/src/main/java/org/alfresco/repo/search/impl/querymodel/Column.java b/data-model/src/main/java/org/alfresco/repo/search/impl/querymodel/Column.java similarity index 100% rename from src/main/java/org/alfresco/repo/search/impl/querymodel/Column.java rename to data-model/src/main/java/org/alfresco/repo/search/impl/querymodel/Column.java diff --git a/src/main/java/org/alfresco/repo/search/impl/querymodel/Conjunction.java b/data-model/src/main/java/org/alfresco/repo/search/impl/querymodel/Conjunction.java similarity index 100% rename from src/main/java/org/alfresco/repo/search/impl/querymodel/Conjunction.java rename to data-model/src/main/java/org/alfresco/repo/search/impl/querymodel/Conjunction.java diff --git a/src/main/java/org/alfresco/repo/search/impl/querymodel/Constraint.java b/data-model/src/main/java/org/alfresco/repo/search/impl/querymodel/Constraint.java similarity index 100% rename from src/main/java/org/alfresco/repo/search/impl/querymodel/Constraint.java rename to data-model/src/main/java/org/alfresco/repo/search/impl/querymodel/Constraint.java diff --git a/src/main/java/org/alfresco/repo/search/impl/querymodel/Disjunction.java b/data-model/src/main/java/org/alfresco/repo/search/impl/querymodel/Disjunction.java similarity index 100% rename from src/main/java/org/alfresco/repo/search/impl/querymodel/Disjunction.java rename to data-model/src/main/java/org/alfresco/repo/search/impl/querymodel/Disjunction.java diff --git a/src/main/java/org/alfresco/repo/search/impl/querymodel/DynamicArgument.java b/data-model/src/main/java/org/alfresco/repo/search/impl/querymodel/DynamicArgument.java similarity index 100% rename from src/main/java/org/alfresco/repo/search/impl/querymodel/DynamicArgument.java rename to data-model/src/main/java/org/alfresco/repo/search/impl/querymodel/DynamicArgument.java diff --git a/src/main/java/org/alfresco/repo/search/impl/querymodel/Function.java b/data-model/src/main/java/org/alfresco/repo/search/impl/querymodel/Function.java similarity index 100% rename from src/main/java/org/alfresco/repo/search/impl/querymodel/Function.java rename to data-model/src/main/java/org/alfresco/repo/search/impl/querymodel/Function.java diff --git a/src/main/java/org/alfresco/repo/search/impl/querymodel/FunctionArgument.java b/data-model/src/main/java/org/alfresco/repo/search/impl/querymodel/FunctionArgument.java similarity index 100% rename from src/main/java/org/alfresco/repo/search/impl/querymodel/FunctionArgument.java rename to data-model/src/main/java/org/alfresco/repo/search/impl/querymodel/FunctionArgument.java diff --git a/src/main/java/org/alfresco/repo/search/impl/querymodel/FunctionEvaluationContext.java b/data-model/src/main/java/org/alfresco/repo/search/impl/querymodel/FunctionEvaluationContext.java similarity index 100% rename from src/main/java/org/alfresco/repo/search/impl/querymodel/FunctionEvaluationContext.java rename to data-model/src/main/java/org/alfresco/repo/search/impl/querymodel/FunctionEvaluationContext.java diff --git a/src/main/java/org/alfresco/repo/search/impl/querymodel/FunctionInvokation.java b/data-model/src/main/java/org/alfresco/repo/search/impl/querymodel/FunctionInvokation.java similarity index 100% rename from src/main/java/org/alfresco/repo/search/impl/querymodel/FunctionInvokation.java rename to data-model/src/main/java/org/alfresco/repo/search/impl/querymodel/FunctionInvokation.java diff --git a/src/main/java/org/alfresco/repo/search/impl/querymodel/FunctionalConstraint.java b/data-model/src/main/java/org/alfresco/repo/search/impl/querymodel/FunctionalConstraint.java similarity index 100% rename from src/main/java/org/alfresco/repo/search/impl/querymodel/FunctionalConstraint.java rename to data-model/src/main/java/org/alfresco/repo/search/impl/querymodel/FunctionalConstraint.java diff --git a/src/main/java/org/alfresco/repo/search/impl/querymodel/Join.java b/data-model/src/main/java/org/alfresco/repo/search/impl/querymodel/Join.java similarity index 100% rename from src/main/java/org/alfresco/repo/search/impl/querymodel/Join.java rename to data-model/src/main/java/org/alfresco/repo/search/impl/querymodel/Join.java diff --git a/src/main/java/org/alfresco/repo/search/impl/querymodel/JoinType.java b/data-model/src/main/java/org/alfresco/repo/search/impl/querymodel/JoinType.java similarity index 100% rename from src/main/java/org/alfresco/repo/search/impl/querymodel/JoinType.java rename to data-model/src/main/java/org/alfresco/repo/search/impl/querymodel/JoinType.java diff --git a/src/main/java/org/alfresco/repo/search/impl/querymodel/ListArgument.java b/data-model/src/main/java/org/alfresco/repo/search/impl/querymodel/ListArgument.java similarity index 100% rename from src/main/java/org/alfresco/repo/search/impl/querymodel/ListArgument.java rename to data-model/src/main/java/org/alfresco/repo/search/impl/querymodel/ListArgument.java diff --git a/src/main/java/org/alfresco/repo/search/impl/querymodel/LiteralArgument.java b/data-model/src/main/java/org/alfresco/repo/search/impl/querymodel/LiteralArgument.java similarity index 100% rename from src/main/java/org/alfresco/repo/search/impl/querymodel/LiteralArgument.java rename to data-model/src/main/java/org/alfresco/repo/search/impl/querymodel/LiteralArgument.java diff --git a/src/main/java/org/alfresco/repo/search/impl/querymodel/Multiplicity.java b/data-model/src/main/java/org/alfresco/repo/search/impl/querymodel/Multiplicity.java similarity index 100% rename from src/main/java/org/alfresco/repo/search/impl/querymodel/Multiplicity.java rename to data-model/src/main/java/org/alfresco/repo/search/impl/querymodel/Multiplicity.java diff --git a/src/main/java/org/alfresco/repo/search/impl/querymodel/Order.java b/data-model/src/main/java/org/alfresco/repo/search/impl/querymodel/Order.java similarity index 100% rename from src/main/java/org/alfresco/repo/search/impl/querymodel/Order.java rename to data-model/src/main/java/org/alfresco/repo/search/impl/querymodel/Order.java diff --git a/src/main/java/org/alfresco/repo/search/impl/querymodel/Ordering.java b/data-model/src/main/java/org/alfresco/repo/search/impl/querymodel/Ordering.java similarity index 100% rename from src/main/java/org/alfresco/repo/search/impl/querymodel/Ordering.java rename to data-model/src/main/java/org/alfresco/repo/search/impl/querymodel/Ordering.java diff --git a/src/main/java/org/alfresco/repo/search/impl/querymodel/ParameterArgument.java b/data-model/src/main/java/org/alfresco/repo/search/impl/querymodel/ParameterArgument.java similarity index 100% rename from src/main/java/org/alfresco/repo/search/impl/querymodel/ParameterArgument.java rename to data-model/src/main/java/org/alfresco/repo/search/impl/querymodel/ParameterArgument.java diff --git a/src/main/java/org/alfresco/repo/search/impl/querymodel/PredicateMode.java b/data-model/src/main/java/org/alfresco/repo/search/impl/querymodel/PredicateMode.java similarity index 100% rename from src/main/java/org/alfresco/repo/search/impl/querymodel/PredicateMode.java rename to data-model/src/main/java/org/alfresco/repo/search/impl/querymodel/PredicateMode.java diff --git a/src/main/java/org/alfresco/repo/search/impl/querymodel/PropertyArgument.java b/data-model/src/main/java/org/alfresco/repo/search/impl/querymodel/PropertyArgument.java similarity index 100% rename from src/main/java/org/alfresco/repo/search/impl/querymodel/PropertyArgument.java rename to data-model/src/main/java/org/alfresco/repo/search/impl/querymodel/PropertyArgument.java diff --git a/src/main/java/org/alfresco/repo/search/impl/querymodel/Query.java b/data-model/src/main/java/org/alfresco/repo/search/impl/querymodel/Query.java similarity index 100% rename from src/main/java/org/alfresco/repo/search/impl/querymodel/Query.java rename to data-model/src/main/java/org/alfresco/repo/search/impl/querymodel/Query.java diff --git a/src/main/java/org/alfresco/repo/search/impl/querymodel/QueryEngine.java b/data-model/src/main/java/org/alfresco/repo/search/impl/querymodel/QueryEngine.java similarity index 100% rename from src/main/java/org/alfresco/repo/search/impl/querymodel/QueryEngine.java rename to data-model/src/main/java/org/alfresco/repo/search/impl/querymodel/QueryEngine.java diff --git a/src/main/java/org/alfresco/repo/search/impl/querymodel/QueryEngineResults.java b/data-model/src/main/java/org/alfresco/repo/search/impl/querymodel/QueryEngineResults.java similarity index 100% rename from src/main/java/org/alfresco/repo/search/impl/querymodel/QueryEngineResults.java rename to data-model/src/main/java/org/alfresco/repo/search/impl/querymodel/QueryEngineResults.java diff --git a/src/main/java/org/alfresco/repo/search/impl/querymodel/QueryModelException.java b/data-model/src/main/java/org/alfresco/repo/search/impl/querymodel/QueryModelException.java similarity index 100% rename from src/main/java/org/alfresco/repo/search/impl/querymodel/QueryModelException.java rename to data-model/src/main/java/org/alfresco/repo/search/impl/querymodel/QueryModelException.java diff --git a/src/main/java/org/alfresco/repo/search/impl/querymodel/QueryModelFactory.java b/data-model/src/main/java/org/alfresco/repo/search/impl/querymodel/QueryModelFactory.java similarity index 100% rename from src/main/java/org/alfresco/repo/search/impl/querymodel/QueryModelFactory.java rename to data-model/src/main/java/org/alfresco/repo/search/impl/querymodel/QueryModelFactory.java diff --git a/src/main/java/org/alfresco/repo/search/impl/querymodel/QueryOptions.java b/data-model/src/main/java/org/alfresco/repo/search/impl/querymodel/QueryOptions.java similarity index 100% rename from src/main/java/org/alfresco/repo/search/impl/querymodel/QueryOptions.java rename to data-model/src/main/java/org/alfresco/repo/search/impl/querymodel/QueryOptions.java diff --git a/src/main/java/org/alfresco/repo/search/impl/querymodel/Selector.java b/data-model/src/main/java/org/alfresco/repo/search/impl/querymodel/Selector.java similarity index 100% rename from src/main/java/org/alfresco/repo/search/impl/querymodel/Selector.java rename to data-model/src/main/java/org/alfresco/repo/search/impl/querymodel/Selector.java diff --git a/src/main/java/org/alfresco/repo/search/impl/querymodel/SelectorArgument.java b/data-model/src/main/java/org/alfresco/repo/search/impl/querymodel/SelectorArgument.java similarity index 100% rename from src/main/java/org/alfresco/repo/search/impl/querymodel/SelectorArgument.java rename to data-model/src/main/java/org/alfresco/repo/search/impl/querymodel/SelectorArgument.java diff --git a/src/main/java/org/alfresco/repo/search/impl/querymodel/Source.java b/data-model/src/main/java/org/alfresco/repo/search/impl/querymodel/Source.java similarity index 100% rename from src/main/java/org/alfresco/repo/search/impl/querymodel/Source.java rename to data-model/src/main/java/org/alfresco/repo/search/impl/querymodel/Source.java diff --git a/src/main/java/org/alfresco/repo/search/impl/querymodel/StaticArgument.java b/data-model/src/main/java/org/alfresco/repo/search/impl/querymodel/StaticArgument.java similarity index 100% rename from src/main/java/org/alfresco/repo/search/impl/querymodel/StaticArgument.java rename to data-model/src/main/java/org/alfresco/repo/search/impl/querymodel/StaticArgument.java diff --git a/src/main/java/org/alfresco/repo/search/impl/querymodel/impl/BaseArgument.java b/data-model/src/main/java/org/alfresco/repo/search/impl/querymodel/impl/BaseArgument.java similarity index 100% rename from src/main/java/org/alfresco/repo/search/impl/querymodel/impl/BaseArgument.java rename to data-model/src/main/java/org/alfresco/repo/search/impl/querymodel/impl/BaseArgument.java diff --git a/src/main/java/org/alfresco/repo/search/impl/querymodel/impl/BaseArgumentDefinition.java b/data-model/src/main/java/org/alfresco/repo/search/impl/querymodel/impl/BaseArgumentDefinition.java similarity index 100% rename from src/main/java/org/alfresco/repo/search/impl/querymodel/impl/BaseArgumentDefinition.java rename to data-model/src/main/java/org/alfresco/repo/search/impl/querymodel/impl/BaseArgumentDefinition.java diff --git a/src/main/java/org/alfresco/repo/search/impl/querymodel/impl/BaseColumn.java b/data-model/src/main/java/org/alfresco/repo/search/impl/querymodel/impl/BaseColumn.java similarity index 100% rename from src/main/java/org/alfresco/repo/search/impl/querymodel/impl/BaseColumn.java rename to data-model/src/main/java/org/alfresco/repo/search/impl/querymodel/impl/BaseColumn.java diff --git a/src/main/java/org/alfresco/repo/search/impl/querymodel/impl/BaseComparison.java b/data-model/src/main/java/org/alfresco/repo/search/impl/querymodel/impl/BaseComparison.java similarity index 100% rename from src/main/java/org/alfresco/repo/search/impl/querymodel/impl/BaseComparison.java rename to data-model/src/main/java/org/alfresco/repo/search/impl/querymodel/impl/BaseComparison.java diff --git a/src/main/java/org/alfresco/repo/search/impl/querymodel/impl/BaseConjunction.java b/data-model/src/main/java/org/alfresco/repo/search/impl/querymodel/impl/BaseConjunction.java similarity index 100% rename from src/main/java/org/alfresco/repo/search/impl/querymodel/impl/BaseConjunction.java rename to data-model/src/main/java/org/alfresco/repo/search/impl/querymodel/impl/BaseConjunction.java diff --git a/src/main/java/org/alfresco/repo/search/impl/querymodel/impl/BaseConstraint.java b/data-model/src/main/java/org/alfresco/repo/search/impl/querymodel/impl/BaseConstraint.java similarity index 100% rename from src/main/java/org/alfresco/repo/search/impl/querymodel/impl/BaseConstraint.java rename to data-model/src/main/java/org/alfresco/repo/search/impl/querymodel/impl/BaseConstraint.java diff --git a/src/main/java/org/alfresco/repo/search/impl/querymodel/impl/BaseDisjunction.java b/data-model/src/main/java/org/alfresco/repo/search/impl/querymodel/impl/BaseDisjunction.java similarity index 100% rename from src/main/java/org/alfresco/repo/search/impl/querymodel/impl/BaseDisjunction.java rename to data-model/src/main/java/org/alfresco/repo/search/impl/querymodel/impl/BaseDisjunction.java diff --git a/src/main/java/org/alfresco/repo/search/impl/querymodel/impl/BaseDynamicArgument.java b/data-model/src/main/java/org/alfresco/repo/search/impl/querymodel/impl/BaseDynamicArgument.java similarity index 100% rename from src/main/java/org/alfresco/repo/search/impl/querymodel/impl/BaseDynamicArgument.java rename to data-model/src/main/java/org/alfresco/repo/search/impl/querymodel/impl/BaseDynamicArgument.java diff --git a/src/main/java/org/alfresco/repo/search/impl/querymodel/impl/BaseFunction.java b/data-model/src/main/java/org/alfresco/repo/search/impl/querymodel/impl/BaseFunction.java similarity index 100% rename from src/main/java/org/alfresco/repo/search/impl/querymodel/impl/BaseFunction.java rename to data-model/src/main/java/org/alfresco/repo/search/impl/querymodel/impl/BaseFunction.java diff --git a/src/main/java/org/alfresco/repo/search/impl/querymodel/impl/BaseFunctionArgument.java b/data-model/src/main/java/org/alfresco/repo/search/impl/querymodel/impl/BaseFunctionArgument.java similarity index 100% rename from src/main/java/org/alfresco/repo/search/impl/querymodel/impl/BaseFunctionArgument.java rename to data-model/src/main/java/org/alfresco/repo/search/impl/querymodel/impl/BaseFunctionArgument.java diff --git a/src/main/java/org/alfresco/repo/search/impl/querymodel/impl/BaseFunctionalConstraint.java b/data-model/src/main/java/org/alfresco/repo/search/impl/querymodel/impl/BaseFunctionalConstraint.java similarity index 100% rename from src/main/java/org/alfresco/repo/search/impl/querymodel/impl/BaseFunctionalConstraint.java rename to data-model/src/main/java/org/alfresco/repo/search/impl/querymodel/impl/BaseFunctionalConstraint.java diff --git a/src/main/java/org/alfresco/repo/search/impl/querymodel/impl/BaseJoin.java b/data-model/src/main/java/org/alfresco/repo/search/impl/querymodel/impl/BaseJoin.java similarity index 100% rename from src/main/java/org/alfresco/repo/search/impl/querymodel/impl/BaseJoin.java rename to data-model/src/main/java/org/alfresco/repo/search/impl/querymodel/impl/BaseJoin.java diff --git a/src/main/java/org/alfresco/repo/search/impl/querymodel/impl/BaseListArgument.java b/data-model/src/main/java/org/alfresco/repo/search/impl/querymodel/impl/BaseListArgument.java similarity index 100% rename from src/main/java/org/alfresco/repo/search/impl/querymodel/impl/BaseListArgument.java rename to data-model/src/main/java/org/alfresco/repo/search/impl/querymodel/impl/BaseListArgument.java diff --git a/src/main/java/org/alfresco/repo/search/impl/querymodel/impl/BaseLiteralArgument.java b/data-model/src/main/java/org/alfresco/repo/search/impl/querymodel/impl/BaseLiteralArgument.java similarity index 100% rename from src/main/java/org/alfresco/repo/search/impl/querymodel/impl/BaseLiteralArgument.java rename to data-model/src/main/java/org/alfresco/repo/search/impl/querymodel/impl/BaseLiteralArgument.java diff --git a/src/main/java/org/alfresco/repo/search/impl/querymodel/impl/BaseOrdering.java b/data-model/src/main/java/org/alfresco/repo/search/impl/querymodel/impl/BaseOrdering.java similarity index 100% rename from src/main/java/org/alfresco/repo/search/impl/querymodel/impl/BaseOrdering.java rename to data-model/src/main/java/org/alfresco/repo/search/impl/querymodel/impl/BaseOrdering.java diff --git a/src/main/java/org/alfresco/repo/search/impl/querymodel/impl/BaseParameterArgument.java b/data-model/src/main/java/org/alfresco/repo/search/impl/querymodel/impl/BaseParameterArgument.java similarity index 100% rename from src/main/java/org/alfresco/repo/search/impl/querymodel/impl/BaseParameterArgument.java rename to data-model/src/main/java/org/alfresco/repo/search/impl/querymodel/impl/BaseParameterArgument.java diff --git a/src/main/java/org/alfresco/repo/search/impl/querymodel/impl/BasePropertyArgument.java b/data-model/src/main/java/org/alfresco/repo/search/impl/querymodel/impl/BasePropertyArgument.java similarity index 100% rename from src/main/java/org/alfresco/repo/search/impl/querymodel/impl/BasePropertyArgument.java rename to data-model/src/main/java/org/alfresco/repo/search/impl/querymodel/impl/BasePropertyArgument.java diff --git a/src/main/java/org/alfresco/repo/search/impl/querymodel/impl/BaseQuery.java b/data-model/src/main/java/org/alfresco/repo/search/impl/querymodel/impl/BaseQuery.java similarity index 100% rename from src/main/java/org/alfresco/repo/search/impl/querymodel/impl/BaseQuery.java rename to data-model/src/main/java/org/alfresco/repo/search/impl/querymodel/impl/BaseQuery.java diff --git a/src/main/java/org/alfresco/repo/search/impl/querymodel/impl/BaseSelector.java b/data-model/src/main/java/org/alfresco/repo/search/impl/querymodel/impl/BaseSelector.java similarity index 100% rename from src/main/java/org/alfresco/repo/search/impl/querymodel/impl/BaseSelector.java rename to data-model/src/main/java/org/alfresco/repo/search/impl/querymodel/impl/BaseSelector.java diff --git a/src/main/java/org/alfresco/repo/search/impl/querymodel/impl/BaseSelectorArgument.java b/data-model/src/main/java/org/alfresco/repo/search/impl/querymodel/impl/BaseSelectorArgument.java similarity index 100% rename from src/main/java/org/alfresco/repo/search/impl/querymodel/impl/BaseSelectorArgument.java rename to data-model/src/main/java/org/alfresco/repo/search/impl/querymodel/impl/BaseSelectorArgument.java diff --git a/src/main/java/org/alfresco/repo/search/impl/querymodel/impl/BaseStaticArgument.java b/data-model/src/main/java/org/alfresco/repo/search/impl/querymodel/impl/BaseStaticArgument.java similarity index 100% rename from src/main/java/org/alfresco/repo/search/impl/querymodel/impl/BaseStaticArgument.java rename to data-model/src/main/java/org/alfresco/repo/search/impl/querymodel/impl/BaseStaticArgument.java diff --git a/src/main/java/org/alfresco/repo/search/impl/querymodel/impl/DuplicateSelectorNameException.java b/data-model/src/main/java/org/alfresco/repo/search/impl/querymodel/impl/DuplicateSelectorNameException.java similarity index 100% rename from src/main/java/org/alfresco/repo/search/impl/querymodel/impl/DuplicateSelectorNameException.java rename to data-model/src/main/java/org/alfresco/repo/search/impl/querymodel/impl/DuplicateSelectorNameException.java diff --git a/src/main/java/org/alfresco/repo/search/impl/querymodel/impl/SimpleConstraint.java b/data-model/src/main/java/org/alfresco/repo/search/impl/querymodel/impl/SimpleConstraint.java similarity index 100% rename from src/main/java/org/alfresco/repo/search/impl/querymodel/impl/SimpleConstraint.java rename to data-model/src/main/java/org/alfresco/repo/search/impl/querymodel/impl/SimpleConstraint.java diff --git a/src/main/java/org/alfresco/repo/search/impl/querymodel/impl/functions/Child.java b/data-model/src/main/java/org/alfresco/repo/search/impl/querymodel/impl/functions/Child.java similarity index 100% rename from src/main/java/org/alfresco/repo/search/impl/querymodel/impl/functions/Child.java rename to data-model/src/main/java/org/alfresco/repo/search/impl/querymodel/impl/functions/Child.java diff --git a/src/main/java/org/alfresco/repo/search/impl/querymodel/impl/functions/Descendant.java b/data-model/src/main/java/org/alfresco/repo/search/impl/querymodel/impl/functions/Descendant.java similarity index 100% rename from src/main/java/org/alfresco/repo/search/impl/querymodel/impl/functions/Descendant.java rename to data-model/src/main/java/org/alfresco/repo/search/impl/querymodel/impl/functions/Descendant.java diff --git a/src/main/java/org/alfresco/repo/search/impl/querymodel/impl/functions/Equals.java b/data-model/src/main/java/org/alfresco/repo/search/impl/querymodel/impl/functions/Equals.java similarity index 100% rename from src/main/java/org/alfresco/repo/search/impl/querymodel/impl/functions/Equals.java rename to data-model/src/main/java/org/alfresco/repo/search/impl/querymodel/impl/functions/Equals.java diff --git a/src/main/java/org/alfresco/repo/search/impl/querymodel/impl/functions/Exists.java b/data-model/src/main/java/org/alfresco/repo/search/impl/querymodel/impl/functions/Exists.java similarity index 100% rename from src/main/java/org/alfresco/repo/search/impl/querymodel/impl/functions/Exists.java rename to data-model/src/main/java/org/alfresco/repo/search/impl/querymodel/impl/functions/Exists.java diff --git a/src/main/java/org/alfresco/repo/search/impl/querymodel/impl/functions/FTSFuzzyTerm.java b/data-model/src/main/java/org/alfresco/repo/search/impl/querymodel/impl/functions/FTSFuzzyTerm.java similarity index 100% rename from src/main/java/org/alfresco/repo/search/impl/querymodel/impl/functions/FTSFuzzyTerm.java rename to data-model/src/main/java/org/alfresco/repo/search/impl/querymodel/impl/functions/FTSFuzzyTerm.java diff --git a/src/main/java/org/alfresco/repo/search/impl/querymodel/impl/functions/FTSPhrase.java b/data-model/src/main/java/org/alfresco/repo/search/impl/querymodel/impl/functions/FTSPhrase.java similarity index 100% rename from src/main/java/org/alfresco/repo/search/impl/querymodel/impl/functions/FTSPhrase.java rename to data-model/src/main/java/org/alfresco/repo/search/impl/querymodel/impl/functions/FTSPhrase.java diff --git a/src/main/java/org/alfresco/repo/search/impl/querymodel/impl/functions/FTSPrefixTerm.java b/data-model/src/main/java/org/alfresco/repo/search/impl/querymodel/impl/functions/FTSPrefixTerm.java similarity index 100% rename from src/main/java/org/alfresco/repo/search/impl/querymodel/impl/functions/FTSPrefixTerm.java rename to data-model/src/main/java/org/alfresco/repo/search/impl/querymodel/impl/functions/FTSPrefixTerm.java diff --git a/src/main/java/org/alfresco/repo/search/impl/querymodel/impl/functions/FTSProximity.java b/data-model/src/main/java/org/alfresco/repo/search/impl/querymodel/impl/functions/FTSProximity.java similarity index 100% rename from src/main/java/org/alfresco/repo/search/impl/querymodel/impl/functions/FTSProximity.java rename to data-model/src/main/java/org/alfresco/repo/search/impl/querymodel/impl/functions/FTSProximity.java diff --git a/src/main/java/org/alfresco/repo/search/impl/querymodel/impl/functions/FTSRange.java b/data-model/src/main/java/org/alfresco/repo/search/impl/querymodel/impl/functions/FTSRange.java similarity index 100% rename from src/main/java/org/alfresco/repo/search/impl/querymodel/impl/functions/FTSRange.java rename to data-model/src/main/java/org/alfresco/repo/search/impl/querymodel/impl/functions/FTSRange.java diff --git a/src/main/java/org/alfresco/repo/search/impl/querymodel/impl/functions/FTSTerm.java b/data-model/src/main/java/org/alfresco/repo/search/impl/querymodel/impl/functions/FTSTerm.java similarity index 100% rename from src/main/java/org/alfresco/repo/search/impl/querymodel/impl/functions/FTSTerm.java rename to data-model/src/main/java/org/alfresco/repo/search/impl/querymodel/impl/functions/FTSTerm.java diff --git a/src/main/java/org/alfresco/repo/search/impl/querymodel/impl/functions/FTSWildTerm.java b/data-model/src/main/java/org/alfresco/repo/search/impl/querymodel/impl/functions/FTSWildTerm.java similarity index 100% rename from src/main/java/org/alfresco/repo/search/impl/querymodel/impl/functions/FTSWildTerm.java rename to data-model/src/main/java/org/alfresco/repo/search/impl/querymodel/impl/functions/FTSWildTerm.java diff --git a/src/main/java/org/alfresco/repo/search/impl/querymodel/impl/functions/GreaterThan.java b/data-model/src/main/java/org/alfresco/repo/search/impl/querymodel/impl/functions/GreaterThan.java similarity index 100% rename from src/main/java/org/alfresco/repo/search/impl/querymodel/impl/functions/GreaterThan.java rename to data-model/src/main/java/org/alfresco/repo/search/impl/querymodel/impl/functions/GreaterThan.java diff --git a/src/main/java/org/alfresco/repo/search/impl/querymodel/impl/functions/GreaterThanOrEquals.java b/data-model/src/main/java/org/alfresco/repo/search/impl/querymodel/impl/functions/GreaterThanOrEquals.java similarity index 100% rename from src/main/java/org/alfresco/repo/search/impl/querymodel/impl/functions/GreaterThanOrEquals.java rename to data-model/src/main/java/org/alfresco/repo/search/impl/querymodel/impl/functions/GreaterThanOrEquals.java diff --git a/src/main/java/org/alfresco/repo/search/impl/querymodel/impl/functions/In.java b/data-model/src/main/java/org/alfresco/repo/search/impl/querymodel/impl/functions/In.java similarity index 100% rename from src/main/java/org/alfresco/repo/search/impl/querymodel/impl/functions/In.java rename to data-model/src/main/java/org/alfresco/repo/search/impl/querymodel/impl/functions/In.java diff --git a/src/main/java/org/alfresco/repo/search/impl/querymodel/impl/functions/LessThan.java b/data-model/src/main/java/org/alfresco/repo/search/impl/querymodel/impl/functions/LessThan.java similarity index 100% rename from src/main/java/org/alfresco/repo/search/impl/querymodel/impl/functions/LessThan.java rename to data-model/src/main/java/org/alfresco/repo/search/impl/querymodel/impl/functions/LessThan.java diff --git a/src/main/java/org/alfresco/repo/search/impl/querymodel/impl/functions/LessThanOrEquals.java b/data-model/src/main/java/org/alfresco/repo/search/impl/querymodel/impl/functions/LessThanOrEquals.java similarity index 100% rename from src/main/java/org/alfresco/repo/search/impl/querymodel/impl/functions/LessThanOrEquals.java rename to data-model/src/main/java/org/alfresco/repo/search/impl/querymodel/impl/functions/LessThanOrEquals.java diff --git a/src/main/java/org/alfresco/repo/search/impl/querymodel/impl/functions/Like.java b/data-model/src/main/java/org/alfresco/repo/search/impl/querymodel/impl/functions/Like.java similarity index 100% rename from src/main/java/org/alfresco/repo/search/impl/querymodel/impl/functions/Like.java rename to data-model/src/main/java/org/alfresco/repo/search/impl/querymodel/impl/functions/Like.java diff --git a/src/main/java/org/alfresco/repo/search/impl/querymodel/impl/functions/Lower.java b/data-model/src/main/java/org/alfresco/repo/search/impl/querymodel/impl/functions/Lower.java similarity index 100% rename from src/main/java/org/alfresco/repo/search/impl/querymodel/impl/functions/Lower.java rename to data-model/src/main/java/org/alfresco/repo/search/impl/querymodel/impl/functions/Lower.java diff --git a/src/main/java/org/alfresco/repo/search/impl/querymodel/impl/functions/NotEquals.java b/data-model/src/main/java/org/alfresco/repo/search/impl/querymodel/impl/functions/NotEquals.java similarity index 100% rename from src/main/java/org/alfresco/repo/search/impl/querymodel/impl/functions/NotEquals.java rename to data-model/src/main/java/org/alfresco/repo/search/impl/querymodel/impl/functions/NotEquals.java diff --git a/src/main/java/org/alfresco/repo/search/impl/querymodel/impl/functions/PropertyAccessor.java b/data-model/src/main/java/org/alfresco/repo/search/impl/querymodel/impl/functions/PropertyAccessor.java similarity index 100% rename from src/main/java/org/alfresco/repo/search/impl/querymodel/impl/functions/PropertyAccessor.java rename to data-model/src/main/java/org/alfresco/repo/search/impl/querymodel/impl/functions/PropertyAccessor.java diff --git a/src/main/java/org/alfresco/repo/search/impl/querymodel/impl/functions/Score.java b/data-model/src/main/java/org/alfresco/repo/search/impl/querymodel/impl/functions/Score.java similarity index 100% rename from src/main/java/org/alfresco/repo/search/impl/querymodel/impl/functions/Score.java rename to data-model/src/main/java/org/alfresco/repo/search/impl/querymodel/impl/functions/Score.java diff --git a/src/main/java/org/alfresco/repo/search/impl/querymodel/impl/functions/Upper.java b/data-model/src/main/java/org/alfresco/repo/search/impl/querymodel/impl/functions/Upper.java similarity index 100% rename from src/main/java/org/alfresco/repo/search/impl/querymodel/impl/functions/Upper.java rename to data-model/src/main/java/org/alfresco/repo/search/impl/querymodel/impl/functions/Upper.java diff --git a/src/main/java/org/alfresco/repo/search/impl/querymodel/impl/lucene/LuceneColumn.java b/data-model/src/main/java/org/alfresco/repo/search/impl/querymodel/impl/lucene/LuceneColumn.java similarity index 100% rename from src/main/java/org/alfresco/repo/search/impl/querymodel/impl/lucene/LuceneColumn.java rename to data-model/src/main/java/org/alfresco/repo/search/impl/querymodel/impl/lucene/LuceneColumn.java diff --git a/src/main/java/org/alfresco/repo/search/impl/querymodel/impl/lucene/LuceneConjunction.java b/data-model/src/main/java/org/alfresco/repo/search/impl/querymodel/impl/lucene/LuceneConjunction.java similarity index 100% rename from src/main/java/org/alfresco/repo/search/impl/querymodel/impl/lucene/LuceneConjunction.java rename to data-model/src/main/java/org/alfresco/repo/search/impl/querymodel/impl/lucene/LuceneConjunction.java diff --git a/src/main/java/org/alfresco/repo/search/impl/querymodel/impl/lucene/LuceneDisjunction.java b/data-model/src/main/java/org/alfresco/repo/search/impl/querymodel/impl/lucene/LuceneDisjunction.java similarity index 100% rename from src/main/java/org/alfresco/repo/search/impl/querymodel/impl/lucene/LuceneDisjunction.java rename to data-model/src/main/java/org/alfresco/repo/search/impl/querymodel/impl/lucene/LuceneDisjunction.java diff --git a/src/main/java/org/alfresco/repo/search/impl/querymodel/impl/lucene/LuceneFunctionArgument.java b/data-model/src/main/java/org/alfresco/repo/search/impl/querymodel/impl/lucene/LuceneFunctionArgument.java similarity index 100% rename from src/main/java/org/alfresco/repo/search/impl/querymodel/impl/lucene/LuceneFunctionArgument.java rename to data-model/src/main/java/org/alfresco/repo/search/impl/querymodel/impl/lucene/LuceneFunctionArgument.java diff --git a/src/main/java/org/alfresco/repo/search/impl/querymodel/impl/lucene/LuceneFunctionalConstraint.java b/data-model/src/main/java/org/alfresco/repo/search/impl/querymodel/impl/lucene/LuceneFunctionalConstraint.java similarity index 100% rename from src/main/java/org/alfresco/repo/search/impl/querymodel/impl/lucene/LuceneFunctionalConstraint.java rename to data-model/src/main/java/org/alfresco/repo/search/impl/querymodel/impl/lucene/LuceneFunctionalConstraint.java diff --git a/src/main/java/org/alfresco/repo/search/impl/querymodel/impl/lucene/LuceneJoin.java b/data-model/src/main/java/org/alfresco/repo/search/impl/querymodel/impl/lucene/LuceneJoin.java similarity index 100% rename from src/main/java/org/alfresco/repo/search/impl/querymodel/impl/lucene/LuceneJoin.java rename to data-model/src/main/java/org/alfresco/repo/search/impl/querymodel/impl/lucene/LuceneJoin.java diff --git a/src/main/java/org/alfresco/repo/search/impl/querymodel/impl/lucene/LuceneListArgument.java b/data-model/src/main/java/org/alfresco/repo/search/impl/querymodel/impl/lucene/LuceneListArgument.java similarity index 100% rename from src/main/java/org/alfresco/repo/search/impl/querymodel/impl/lucene/LuceneListArgument.java rename to data-model/src/main/java/org/alfresco/repo/search/impl/querymodel/impl/lucene/LuceneListArgument.java diff --git a/src/main/java/org/alfresco/repo/search/impl/querymodel/impl/lucene/LuceneLiteralArgument.java b/data-model/src/main/java/org/alfresco/repo/search/impl/querymodel/impl/lucene/LuceneLiteralArgument.java similarity index 100% rename from src/main/java/org/alfresco/repo/search/impl/querymodel/impl/lucene/LuceneLiteralArgument.java rename to data-model/src/main/java/org/alfresco/repo/search/impl/querymodel/impl/lucene/LuceneLiteralArgument.java diff --git a/src/main/java/org/alfresco/repo/search/impl/querymodel/impl/lucene/LuceneOrdering.java b/data-model/src/main/java/org/alfresco/repo/search/impl/querymodel/impl/lucene/LuceneOrdering.java similarity index 100% rename from src/main/java/org/alfresco/repo/search/impl/querymodel/impl/lucene/LuceneOrdering.java rename to data-model/src/main/java/org/alfresco/repo/search/impl/querymodel/impl/lucene/LuceneOrdering.java diff --git a/src/main/java/org/alfresco/repo/search/impl/querymodel/impl/lucene/LuceneParameterArgument.java b/data-model/src/main/java/org/alfresco/repo/search/impl/querymodel/impl/lucene/LuceneParameterArgument.java similarity index 100% rename from src/main/java/org/alfresco/repo/search/impl/querymodel/impl/lucene/LuceneParameterArgument.java rename to data-model/src/main/java/org/alfresco/repo/search/impl/querymodel/impl/lucene/LuceneParameterArgument.java diff --git a/src/main/java/org/alfresco/repo/search/impl/querymodel/impl/lucene/LucenePropertyArgument.java b/data-model/src/main/java/org/alfresco/repo/search/impl/querymodel/impl/lucene/LucenePropertyArgument.java similarity index 100% rename from src/main/java/org/alfresco/repo/search/impl/querymodel/impl/lucene/LucenePropertyArgument.java rename to data-model/src/main/java/org/alfresco/repo/search/impl/querymodel/impl/lucene/LucenePropertyArgument.java diff --git a/src/main/java/org/alfresco/repo/search/impl/querymodel/impl/lucene/LuceneQuery.java b/data-model/src/main/java/org/alfresco/repo/search/impl/querymodel/impl/lucene/LuceneQuery.java similarity index 100% rename from src/main/java/org/alfresco/repo/search/impl/querymodel/impl/lucene/LuceneQuery.java rename to data-model/src/main/java/org/alfresco/repo/search/impl/querymodel/impl/lucene/LuceneQuery.java diff --git a/src/main/java/org/alfresco/repo/search/impl/querymodel/impl/lucene/LuceneQueryBuilder.java b/data-model/src/main/java/org/alfresco/repo/search/impl/querymodel/impl/lucene/LuceneQueryBuilder.java similarity index 100% rename from src/main/java/org/alfresco/repo/search/impl/querymodel/impl/lucene/LuceneQueryBuilder.java rename to data-model/src/main/java/org/alfresco/repo/search/impl/querymodel/impl/lucene/LuceneQueryBuilder.java diff --git a/src/main/java/org/alfresco/repo/search/impl/querymodel/impl/lucene/LuceneQueryBuilderComponent.java b/data-model/src/main/java/org/alfresco/repo/search/impl/querymodel/impl/lucene/LuceneQueryBuilderComponent.java similarity index 100% rename from src/main/java/org/alfresco/repo/search/impl/querymodel/impl/lucene/LuceneQueryBuilderComponent.java rename to data-model/src/main/java/org/alfresco/repo/search/impl/querymodel/impl/lucene/LuceneQueryBuilderComponent.java diff --git a/src/main/java/org/alfresco/repo/search/impl/querymodel/impl/lucene/LuceneQueryBuilderContext.java b/data-model/src/main/java/org/alfresco/repo/search/impl/querymodel/impl/lucene/LuceneQueryBuilderContext.java similarity index 100% rename from src/main/java/org/alfresco/repo/search/impl/querymodel/impl/lucene/LuceneQueryBuilderContext.java rename to data-model/src/main/java/org/alfresco/repo/search/impl/querymodel/impl/lucene/LuceneQueryBuilderContext.java diff --git a/src/main/java/org/alfresco/repo/search/impl/querymodel/impl/lucene/LuceneQueryModelFactory.java b/data-model/src/main/java/org/alfresco/repo/search/impl/querymodel/impl/lucene/LuceneQueryModelFactory.java similarity index 100% rename from src/main/java/org/alfresco/repo/search/impl/querymodel/impl/lucene/LuceneQueryModelFactory.java rename to data-model/src/main/java/org/alfresco/repo/search/impl/querymodel/impl/lucene/LuceneQueryModelFactory.java diff --git a/src/main/java/org/alfresco/repo/search/impl/querymodel/impl/lucene/LuceneSelector.java b/data-model/src/main/java/org/alfresco/repo/search/impl/querymodel/impl/lucene/LuceneSelector.java similarity index 100% rename from src/main/java/org/alfresco/repo/search/impl/querymodel/impl/lucene/LuceneSelector.java rename to data-model/src/main/java/org/alfresco/repo/search/impl/querymodel/impl/lucene/LuceneSelector.java diff --git a/src/main/java/org/alfresco/repo/search/impl/querymodel/impl/lucene/LuceneSelectorArgument.java b/data-model/src/main/java/org/alfresco/repo/search/impl/querymodel/impl/lucene/LuceneSelectorArgument.java similarity index 100% rename from src/main/java/org/alfresco/repo/search/impl/querymodel/impl/lucene/LuceneSelectorArgument.java rename to data-model/src/main/java/org/alfresco/repo/search/impl/querymodel/impl/lucene/LuceneSelectorArgument.java diff --git a/src/main/java/org/alfresco/repo/search/impl/querymodel/impl/lucene/functions/LuceneChild.java b/data-model/src/main/java/org/alfresco/repo/search/impl/querymodel/impl/lucene/functions/LuceneChild.java similarity index 100% rename from src/main/java/org/alfresco/repo/search/impl/querymodel/impl/lucene/functions/LuceneChild.java rename to data-model/src/main/java/org/alfresco/repo/search/impl/querymodel/impl/lucene/functions/LuceneChild.java diff --git a/src/main/java/org/alfresco/repo/search/impl/querymodel/impl/lucene/functions/LuceneDescendant.java b/data-model/src/main/java/org/alfresco/repo/search/impl/querymodel/impl/lucene/functions/LuceneDescendant.java similarity index 100% rename from src/main/java/org/alfresco/repo/search/impl/querymodel/impl/lucene/functions/LuceneDescendant.java rename to data-model/src/main/java/org/alfresco/repo/search/impl/querymodel/impl/lucene/functions/LuceneDescendant.java diff --git a/src/main/java/org/alfresco/repo/search/impl/querymodel/impl/lucene/functions/LuceneEquals.java b/data-model/src/main/java/org/alfresco/repo/search/impl/querymodel/impl/lucene/functions/LuceneEquals.java similarity index 100% rename from src/main/java/org/alfresco/repo/search/impl/querymodel/impl/lucene/functions/LuceneEquals.java rename to data-model/src/main/java/org/alfresco/repo/search/impl/querymodel/impl/lucene/functions/LuceneEquals.java diff --git a/src/main/java/org/alfresco/repo/search/impl/querymodel/impl/lucene/functions/LuceneExists.java b/data-model/src/main/java/org/alfresco/repo/search/impl/querymodel/impl/lucene/functions/LuceneExists.java similarity index 100% rename from src/main/java/org/alfresco/repo/search/impl/querymodel/impl/lucene/functions/LuceneExists.java rename to data-model/src/main/java/org/alfresco/repo/search/impl/querymodel/impl/lucene/functions/LuceneExists.java diff --git a/src/main/java/org/alfresco/repo/search/impl/querymodel/impl/lucene/functions/LuceneFTSFuzzyTerm.java b/data-model/src/main/java/org/alfresco/repo/search/impl/querymodel/impl/lucene/functions/LuceneFTSFuzzyTerm.java similarity index 100% rename from src/main/java/org/alfresco/repo/search/impl/querymodel/impl/lucene/functions/LuceneFTSFuzzyTerm.java rename to data-model/src/main/java/org/alfresco/repo/search/impl/querymodel/impl/lucene/functions/LuceneFTSFuzzyTerm.java diff --git a/src/main/java/org/alfresco/repo/search/impl/querymodel/impl/lucene/functions/LuceneFTSPhrase.java b/data-model/src/main/java/org/alfresco/repo/search/impl/querymodel/impl/lucene/functions/LuceneFTSPhrase.java similarity index 100% rename from src/main/java/org/alfresco/repo/search/impl/querymodel/impl/lucene/functions/LuceneFTSPhrase.java rename to data-model/src/main/java/org/alfresco/repo/search/impl/querymodel/impl/lucene/functions/LuceneFTSPhrase.java diff --git a/src/main/java/org/alfresco/repo/search/impl/querymodel/impl/lucene/functions/LuceneFTSPrefixTerm.java b/data-model/src/main/java/org/alfresco/repo/search/impl/querymodel/impl/lucene/functions/LuceneFTSPrefixTerm.java similarity index 100% rename from src/main/java/org/alfresco/repo/search/impl/querymodel/impl/lucene/functions/LuceneFTSPrefixTerm.java rename to data-model/src/main/java/org/alfresco/repo/search/impl/querymodel/impl/lucene/functions/LuceneFTSPrefixTerm.java diff --git a/src/main/java/org/alfresco/repo/search/impl/querymodel/impl/lucene/functions/LuceneFTSProximity.java b/data-model/src/main/java/org/alfresco/repo/search/impl/querymodel/impl/lucene/functions/LuceneFTSProximity.java similarity index 100% rename from src/main/java/org/alfresco/repo/search/impl/querymodel/impl/lucene/functions/LuceneFTSProximity.java rename to data-model/src/main/java/org/alfresco/repo/search/impl/querymodel/impl/lucene/functions/LuceneFTSProximity.java diff --git a/src/main/java/org/alfresco/repo/search/impl/querymodel/impl/lucene/functions/LuceneFTSRange.java b/data-model/src/main/java/org/alfresco/repo/search/impl/querymodel/impl/lucene/functions/LuceneFTSRange.java similarity index 100% rename from src/main/java/org/alfresco/repo/search/impl/querymodel/impl/lucene/functions/LuceneFTSRange.java rename to data-model/src/main/java/org/alfresco/repo/search/impl/querymodel/impl/lucene/functions/LuceneFTSRange.java diff --git a/src/main/java/org/alfresco/repo/search/impl/querymodel/impl/lucene/functions/LuceneFTSTerm.java b/data-model/src/main/java/org/alfresco/repo/search/impl/querymodel/impl/lucene/functions/LuceneFTSTerm.java similarity index 100% rename from src/main/java/org/alfresco/repo/search/impl/querymodel/impl/lucene/functions/LuceneFTSTerm.java rename to data-model/src/main/java/org/alfresco/repo/search/impl/querymodel/impl/lucene/functions/LuceneFTSTerm.java diff --git a/src/main/java/org/alfresco/repo/search/impl/querymodel/impl/lucene/functions/LuceneFTSWildTerm.java b/data-model/src/main/java/org/alfresco/repo/search/impl/querymodel/impl/lucene/functions/LuceneFTSWildTerm.java similarity index 100% rename from src/main/java/org/alfresco/repo/search/impl/querymodel/impl/lucene/functions/LuceneFTSWildTerm.java rename to data-model/src/main/java/org/alfresco/repo/search/impl/querymodel/impl/lucene/functions/LuceneFTSWildTerm.java diff --git a/src/main/java/org/alfresco/repo/search/impl/querymodel/impl/lucene/functions/LuceneGreaterThan.java b/data-model/src/main/java/org/alfresco/repo/search/impl/querymodel/impl/lucene/functions/LuceneGreaterThan.java similarity index 100% rename from src/main/java/org/alfresco/repo/search/impl/querymodel/impl/lucene/functions/LuceneGreaterThan.java rename to data-model/src/main/java/org/alfresco/repo/search/impl/querymodel/impl/lucene/functions/LuceneGreaterThan.java diff --git a/src/main/java/org/alfresco/repo/search/impl/querymodel/impl/lucene/functions/LuceneGreaterThanOrEquals.java b/data-model/src/main/java/org/alfresco/repo/search/impl/querymodel/impl/lucene/functions/LuceneGreaterThanOrEquals.java similarity index 100% rename from src/main/java/org/alfresco/repo/search/impl/querymodel/impl/lucene/functions/LuceneGreaterThanOrEquals.java rename to data-model/src/main/java/org/alfresco/repo/search/impl/querymodel/impl/lucene/functions/LuceneGreaterThanOrEquals.java diff --git a/src/main/java/org/alfresco/repo/search/impl/querymodel/impl/lucene/functions/LuceneIn.java b/data-model/src/main/java/org/alfresco/repo/search/impl/querymodel/impl/lucene/functions/LuceneIn.java similarity index 100% rename from src/main/java/org/alfresco/repo/search/impl/querymodel/impl/lucene/functions/LuceneIn.java rename to data-model/src/main/java/org/alfresco/repo/search/impl/querymodel/impl/lucene/functions/LuceneIn.java diff --git a/src/main/java/org/alfresco/repo/search/impl/querymodel/impl/lucene/functions/LuceneLessThan.java b/data-model/src/main/java/org/alfresco/repo/search/impl/querymodel/impl/lucene/functions/LuceneLessThan.java similarity index 100% rename from src/main/java/org/alfresco/repo/search/impl/querymodel/impl/lucene/functions/LuceneLessThan.java rename to data-model/src/main/java/org/alfresco/repo/search/impl/querymodel/impl/lucene/functions/LuceneLessThan.java diff --git a/src/main/java/org/alfresco/repo/search/impl/querymodel/impl/lucene/functions/LuceneLessThanOrEquals.java b/data-model/src/main/java/org/alfresco/repo/search/impl/querymodel/impl/lucene/functions/LuceneLessThanOrEquals.java similarity index 100% rename from src/main/java/org/alfresco/repo/search/impl/querymodel/impl/lucene/functions/LuceneLessThanOrEquals.java rename to data-model/src/main/java/org/alfresco/repo/search/impl/querymodel/impl/lucene/functions/LuceneLessThanOrEquals.java diff --git a/src/main/java/org/alfresco/repo/search/impl/querymodel/impl/lucene/functions/LuceneLike.java b/data-model/src/main/java/org/alfresco/repo/search/impl/querymodel/impl/lucene/functions/LuceneLike.java similarity index 100% rename from src/main/java/org/alfresco/repo/search/impl/querymodel/impl/lucene/functions/LuceneLike.java rename to data-model/src/main/java/org/alfresco/repo/search/impl/querymodel/impl/lucene/functions/LuceneLike.java diff --git a/src/main/java/org/alfresco/repo/search/impl/querymodel/impl/lucene/functions/LuceneLower.java b/data-model/src/main/java/org/alfresco/repo/search/impl/querymodel/impl/lucene/functions/LuceneLower.java similarity index 100% rename from src/main/java/org/alfresco/repo/search/impl/querymodel/impl/lucene/functions/LuceneLower.java rename to data-model/src/main/java/org/alfresco/repo/search/impl/querymodel/impl/lucene/functions/LuceneLower.java diff --git a/src/main/java/org/alfresco/repo/search/impl/querymodel/impl/lucene/functions/LuceneNotEquals.java b/data-model/src/main/java/org/alfresco/repo/search/impl/querymodel/impl/lucene/functions/LuceneNotEquals.java similarity index 100% rename from src/main/java/org/alfresco/repo/search/impl/querymodel/impl/lucene/functions/LuceneNotEquals.java rename to data-model/src/main/java/org/alfresco/repo/search/impl/querymodel/impl/lucene/functions/LuceneNotEquals.java diff --git a/src/main/java/org/alfresco/repo/search/impl/querymodel/impl/lucene/functions/LucenePropertyAccessor.java b/data-model/src/main/java/org/alfresco/repo/search/impl/querymodel/impl/lucene/functions/LucenePropertyAccessor.java similarity index 100% rename from src/main/java/org/alfresco/repo/search/impl/querymodel/impl/lucene/functions/LucenePropertyAccessor.java rename to data-model/src/main/java/org/alfresco/repo/search/impl/querymodel/impl/lucene/functions/LucenePropertyAccessor.java diff --git a/src/main/java/org/alfresco/repo/search/impl/querymodel/impl/lucene/functions/LuceneScore.java b/data-model/src/main/java/org/alfresco/repo/search/impl/querymodel/impl/lucene/functions/LuceneScore.java similarity index 100% rename from src/main/java/org/alfresco/repo/search/impl/querymodel/impl/lucene/functions/LuceneScore.java rename to data-model/src/main/java/org/alfresco/repo/search/impl/querymodel/impl/lucene/functions/LuceneScore.java diff --git a/src/main/java/org/alfresco/repo/search/impl/querymodel/impl/lucene/functions/LuceneUpper.java b/data-model/src/main/java/org/alfresco/repo/search/impl/querymodel/impl/lucene/functions/LuceneUpper.java similarity index 100% rename from src/main/java/org/alfresco/repo/search/impl/querymodel/impl/lucene/functions/LuceneUpper.java rename to data-model/src/main/java/org/alfresco/repo/search/impl/querymodel/impl/lucene/functions/LuceneUpper.java diff --git a/src/main/java/org/alfresco/repo/security/authentication/AlfrescoSecureContext.java b/data-model/src/main/java/org/alfresco/repo/security/authentication/AlfrescoSecureContext.java similarity index 100% rename from src/main/java/org/alfresco/repo/security/authentication/AlfrescoSecureContext.java rename to data-model/src/main/java/org/alfresco/repo/security/authentication/AlfrescoSecureContext.java diff --git a/src/main/java/org/alfresco/repo/security/authentication/AlfrescoSecureContextImpl.java b/data-model/src/main/java/org/alfresco/repo/security/authentication/AlfrescoSecureContextImpl.java similarity index 100% rename from src/main/java/org/alfresco/repo/security/authentication/AlfrescoSecureContextImpl.java rename to data-model/src/main/java/org/alfresco/repo/security/authentication/AlfrescoSecureContextImpl.java diff --git a/src/main/java/org/alfresco/repo/security/authentication/AuthenticationDiagnostic.java b/data-model/src/main/java/org/alfresco/repo/security/authentication/AuthenticationDiagnostic.java similarity index 100% rename from src/main/java/org/alfresco/repo/security/authentication/AuthenticationDiagnostic.java rename to data-model/src/main/java/org/alfresco/repo/security/authentication/AuthenticationDiagnostic.java diff --git a/src/main/java/org/alfresco/repo/security/authentication/AuthenticationException.java b/data-model/src/main/java/org/alfresco/repo/security/authentication/AuthenticationException.java similarity index 100% rename from src/main/java/org/alfresco/repo/security/authentication/AuthenticationException.java rename to data-model/src/main/java/org/alfresco/repo/security/authentication/AuthenticationException.java diff --git a/src/main/java/org/alfresco/repo/security/authentication/AuthenticationStep.java b/data-model/src/main/java/org/alfresco/repo/security/authentication/AuthenticationStep.java similarity index 100% rename from src/main/java/org/alfresco/repo/security/authentication/AuthenticationStep.java rename to data-model/src/main/java/org/alfresco/repo/security/authentication/AuthenticationStep.java diff --git a/src/main/java/org/alfresco/repo/security/authentication/AuthenticationUtil.java b/data-model/src/main/java/org/alfresco/repo/security/authentication/AuthenticationUtil.java similarity index 100% rename from src/main/java/org/alfresco/repo/security/authentication/AuthenticationUtil.java rename to data-model/src/main/java/org/alfresco/repo/security/authentication/AuthenticationUtil.java diff --git a/src/main/java/org/alfresco/repo/security/authentication/InMemoryTicketComponentImpl.java b/data-model/src/main/java/org/alfresco/repo/security/authentication/InMemoryTicketComponentImpl.java similarity index 100% rename from src/main/java/org/alfresco/repo/security/authentication/InMemoryTicketComponentImpl.java rename to data-model/src/main/java/org/alfresco/repo/security/authentication/InMemoryTicketComponentImpl.java diff --git a/src/main/java/org/alfresco/repo/security/authentication/TicketComponent.java b/data-model/src/main/java/org/alfresco/repo/security/authentication/TicketComponent.java similarity index 100% rename from src/main/java/org/alfresco/repo/security/authentication/TicketComponent.java rename to data-model/src/main/java/org/alfresco/repo/security/authentication/TicketComponent.java diff --git a/src/main/java/org/alfresco/repo/security/authentication/TicketExpiredException.java b/data-model/src/main/java/org/alfresco/repo/security/authentication/TicketExpiredException.java similarity index 100% rename from src/main/java/org/alfresco/repo/security/authentication/TicketExpiredException.java rename to data-model/src/main/java/org/alfresco/repo/security/authentication/TicketExpiredException.java diff --git a/src/main/java/org/alfresco/repo/tenant/SingleTServiceImpl.java b/data-model/src/main/java/org/alfresco/repo/tenant/SingleTServiceImpl.java similarity index 100% rename from src/main/java/org/alfresco/repo/tenant/SingleTServiceImpl.java rename to data-model/src/main/java/org/alfresco/repo/tenant/SingleTServiceImpl.java diff --git a/src/main/java/org/alfresco/repo/tenant/Tenant.java b/data-model/src/main/java/org/alfresco/repo/tenant/Tenant.java similarity index 100% rename from src/main/java/org/alfresco/repo/tenant/Tenant.java rename to data-model/src/main/java/org/alfresco/repo/tenant/Tenant.java diff --git a/src/main/java/org/alfresco/repo/tenant/TenantContextHolder.java b/data-model/src/main/java/org/alfresco/repo/tenant/TenantContextHolder.java similarity index 100% rename from src/main/java/org/alfresco/repo/tenant/TenantContextHolder.java rename to data-model/src/main/java/org/alfresco/repo/tenant/TenantContextHolder.java diff --git a/src/main/java/org/alfresco/repo/tenant/TenantDeployer.java b/data-model/src/main/java/org/alfresco/repo/tenant/TenantDeployer.java similarity index 100% rename from src/main/java/org/alfresco/repo/tenant/TenantDeployer.java rename to data-model/src/main/java/org/alfresco/repo/tenant/TenantDeployer.java diff --git a/src/main/java/org/alfresco/repo/tenant/TenantService.java b/data-model/src/main/java/org/alfresco/repo/tenant/TenantService.java similarity index 100% rename from src/main/java/org/alfresco/repo/tenant/TenantService.java rename to data-model/src/main/java/org/alfresco/repo/tenant/TenantService.java diff --git a/src/main/java/org/alfresco/repo/tenant/TenantUserService.java b/data-model/src/main/java/org/alfresco/repo/tenant/TenantUserService.java similarity index 100% rename from src/main/java/org/alfresco/repo/tenant/TenantUserService.java rename to data-model/src/main/java/org/alfresco/repo/tenant/TenantUserService.java diff --git a/src/main/java/org/alfresco/repo/tenant/TenantUtil.java b/data-model/src/main/java/org/alfresco/repo/tenant/TenantUtil.java similarity index 100% rename from src/main/java/org/alfresco/repo/tenant/TenantUtil.java rename to data-model/src/main/java/org/alfresco/repo/tenant/TenantUtil.java diff --git a/src/main/java/org/alfresco/service/Auditable.java b/data-model/src/main/java/org/alfresco/service/Auditable.java similarity index 100% rename from src/main/java/org/alfresco/service/Auditable.java rename to data-model/src/main/java/org/alfresco/service/Auditable.java diff --git a/src/main/java/org/alfresco/service/NotAuditable.java b/data-model/src/main/java/org/alfresco/service/NotAuditable.java similarity index 100% rename from src/main/java/org/alfresco/service/NotAuditable.java rename to data-model/src/main/java/org/alfresco/service/NotAuditable.java diff --git a/src/main/java/org/alfresco/service/PublicService.java b/data-model/src/main/java/org/alfresco/service/PublicService.java similarity index 100% rename from src/main/java/org/alfresco/service/PublicService.java rename to data-model/src/main/java/org/alfresco/service/PublicService.java diff --git a/src/main/java/org/alfresco/service/cmr/dictionary/AspectDefinition.java b/data-model/src/main/java/org/alfresco/service/cmr/dictionary/AspectDefinition.java similarity index 100% rename from src/main/java/org/alfresco/service/cmr/dictionary/AspectDefinition.java rename to data-model/src/main/java/org/alfresco/service/cmr/dictionary/AspectDefinition.java diff --git a/src/main/java/org/alfresco/service/cmr/dictionary/AssociationDefinition.java b/data-model/src/main/java/org/alfresco/service/cmr/dictionary/AssociationDefinition.java similarity index 100% rename from src/main/java/org/alfresco/service/cmr/dictionary/AssociationDefinition.java rename to data-model/src/main/java/org/alfresco/service/cmr/dictionary/AssociationDefinition.java diff --git a/src/main/java/org/alfresco/service/cmr/dictionary/ChildAssociationDefinition.java b/data-model/src/main/java/org/alfresco/service/cmr/dictionary/ChildAssociationDefinition.java similarity index 100% rename from src/main/java/org/alfresco/service/cmr/dictionary/ChildAssociationDefinition.java rename to data-model/src/main/java/org/alfresco/service/cmr/dictionary/ChildAssociationDefinition.java diff --git a/src/main/java/org/alfresco/service/cmr/dictionary/ClassAttributeDefinition.java b/data-model/src/main/java/org/alfresco/service/cmr/dictionary/ClassAttributeDefinition.java similarity index 100% rename from src/main/java/org/alfresco/service/cmr/dictionary/ClassAttributeDefinition.java rename to data-model/src/main/java/org/alfresco/service/cmr/dictionary/ClassAttributeDefinition.java diff --git a/src/main/java/org/alfresco/service/cmr/dictionary/ClassDefinition.java b/data-model/src/main/java/org/alfresco/service/cmr/dictionary/ClassDefinition.java similarity index 100% rename from src/main/java/org/alfresco/service/cmr/dictionary/ClassDefinition.java rename to data-model/src/main/java/org/alfresco/service/cmr/dictionary/ClassDefinition.java diff --git a/src/main/java/org/alfresco/service/cmr/dictionary/Constraint.java b/data-model/src/main/java/org/alfresco/service/cmr/dictionary/Constraint.java similarity index 100% rename from src/main/java/org/alfresco/service/cmr/dictionary/Constraint.java rename to data-model/src/main/java/org/alfresco/service/cmr/dictionary/Constraint.java diff --git a/src/main/java/org/alfresco/service/cmr/dictionary/ConstraintDefinition.java b/data-model/src/main/java/org/alfresco/service/cmr/dictionary/ConstraintDefinition.java similarity index 100% rename from src/main/java/org/alfresco/service/cmr/dictionary/ConstraintDefinition.java rename to data-model/src/main/java/org/alfresco/service/cmr/dictionary/ConstraintDefinition.java diff --git a/src/main/java/org/alfresco/service/cmr/dictionary/ConstraintException.java b/data-model/src/main/java/org/alfresco/service/cmr/dictionary/ConstraintException.java similarity index 100% rename from src/main/java/org/alfresco/service/cmr/dictionary/ConstraintException.java rename to data-model/src/main/java/org/alfresco/service/cmr/dictionary/ConstraintException.java diff --git a/src/main/java/org/alfresco/service/cmr/dictionary/CustomModelDefinition.java b/data-model/src/main/java/org/alfresco/service/cmr/dictionary/CustomModelDefinition.java similarity index 100% rename from src/main/java/org/alfresco/service/cmr/dictionary/CustomModelDefinition.java rename to data-model/src/main/java/org/alfresco/service/cmr/dictionary/CustomModelDefinition.java diff --git a/src/main/java/org/alfresco/service/cmr/dictionary/CustomModelException.java b/data-model/src/main/java/org/alfresco/service/cmr/dictionary/CustomModelException.java similarity index 100% rename from src/main/java/org/alfresco/service/cmr/dictionary/CustomModelException.java rename to data-model/src/main/java/org/alfresco/service/cmr/dictionary/CustomModelException.java diff --git a/src/main/java/org/alfresco/service/cmr/dictionary/CustomModelService.java b/data-model/src/main/java/org/alfresco/service/cmr/dictionary/CustomModelService.java similarity index 100% rename from src/main/java/org/alfresco/service/cmr/dictionary/CustomModelService.java rename to data-model/src/main/java/org/alfresco/service/cmr/dictionary/CustomModelService.java diff --git a/src/main/java/org/alfresco/service/cmr/dictionary/DataTypeDefinition.java b/data-model/src/main/java/org/alfresco/service/cmr/dictionary/DataTypeDefinition.java similarity index 100% rename from src/main/java/org/alfresco/service/cmr/dictionary/DataTypeDefinition.java rename to data-model/src/main/java/org/alfresco/service/cmr/dictionary/DataTypeDefinition.java diff --git a/src/main/java/org/alfresco/service/cmr/dictionary/DictionaryException.java b/data-model/src/main/java/org/alfresco/service/cmr/dictionary/DictionaryException.java similarity index 100% rename from src/main/java/org/alfresco/service/cmr/dictionary/DictionaryException.java rename to data-model/src/main/java/org/alfresco/service/cmr/dictionary/DictionaryException.java diff --git a/src/main/java/org/alfresco/service/cmr/dictionary/DictionaryService.java b/data-model/src/main/java/org/alfresco/service/cmr/dictionary/DictionaryService.java similarity index 100% rename from src/main/java/org/alfresco/service/cmr/dictionary/DictionaryService.java rename to data-model/src/main/java/org/alfresco/service/cmr/dictionary/DictionaryService.java diff --git a/src/main/java/org/alfresco/service/cmr/dictionary/InvalidAspectException.java b/data-model/src/main/java/org/alfresco/service/cmr/dictionary/InvalidAspectException.java similarity index 100% rename from src/main/java/org/alfresco/service/cmr/dictionary/InvalidAspectException.java rename to data-model/src/main/java/org/alfresco/service/cmr/dictionary/InvalidAspectException.java diff --git a/src/main/java/org/alfresco/service/cmr/dictionary/InvalidClassException.java b/data-model/src/main/java/org/alfresco/service/cmr/dictionary/InvalidClassException.java similarity index 100% rename from src/main/java/org/alfresco/service/cmr/dictionary/InvalidClassException.java rename to data-model/src/main/java/org/alfresco/service/cmr/dictionary/InvalidClassException.java diff --git a/src/main/java/org/alfresco/service/cmr/dictionary/InvalidTypeException.java b/data-model/src/main/java/org/alfresco/service/cmr/dictionary/InvalidTypeException.java similarity index 100% rename from src/main/java/org/alfresco/service/cmr/dictionary/InvalidTypeException.java rename to data-model/src/main/java/org/alfresco/service/cmr/dictionary/InvalidTypeException.java diff --git a/src/main/java/org/alfresco/service/cmr/dictionary/ModelDefinition.java b/data-model/src/main/java/org/alfresco/service/cmr/dictionary/ModelDefinition.java similarity index 100% rename from src/main/java/org/alfresco/service/cmr/dictionary/ModelDefinition.java rename to data-model/src/main/java/org/alfresco/service/cmr/dictionary/ModelDefinition.java diff --git a/src/main/java/org/alfresco/service/cmr/dictionary/NamespaceDefinition.java b/data-model/src/main/java/org/alfresco/service/cmr/dictionary/NamespaceDefinition.java similarity index 100% rename from src/main/java/org/alfresco/service/cmr/dictionary/NamespaceDefinition.java rename to data-model/src/main/java/org/alfresco/service/cmr/dictionary/NamespaceDefinition.java diff --git a/src/main/java/org/alfresco/service/cmr/dictionary/PropertyDefinition.java b/data-model/src/main/java/org/alfresco/service/cmr/dictionary/PropertyDefinition.java similarity index 100% rename from src/main/java/org/alfresco/service/cmr/dictionary/PropertyDefinition.java rename to data-model/src/main/java/org/alfresco/service/cmr/dictionary/PropertyDefinition.java diff --git a/src/main/java/org/alfresco/service/cmr/dictionary/TypeDefinition.java b/data-model/src/main/java/org/alfresco/service/cmr/dictionary/TypeDefinition.java similarity index 100% rename from src/main/java/org/alfresco/service/cmr/dictionary/TypeDefinition.java rename to data-model/src/main/java/org/alfresco/service/cmr/dictionary/TypeDefinition.java diff --git a/src/main/java/org/alfresco/service/cmr/i18n/MessageLookup.java b/data-model/src/main/java/org/alfresco/service/cmr/i18n/MessageLookup.java similarity index 100% rename from src/main/java/org/alfresco/service/cmr/i18n/MessageLookup.java rename to data-model/src/main/java/org/alfresco/service/cmr/i18n/MessageLookup.java diff --git a/src/main/java/org/alfresco/service/cmr/repository/AbstractStoreException.java b/data-model/src/main/java/org/alfresco/service/cmr/repository/AbstractStoreException.java similarity index 100% rename from src/main/java/org/alfresco/service/cmr/repository/AbstractStoreException.java rename to data-model/src/main/java/org/alfresco/service/cmr/repository/AbstractStoreException.java diff --git a/src/main/java/org/alfresco/service/cmr/repository/AssociationExistsException.java b/data-model/src/main/java/org/alfresco/service/cmr/repository/AssociationExistsException.java similarity index 100% rename from src/main/java/org/alfresco/service/cmr/repository/AssociationExistsException.java rename to data-model/src/main/java/org/alfresco/service/cmr/repository/AssociationExistsException.java diff --git a/src/main/java/org/alfresco/service/cmr/repository/AssociationRef.java b/data-model/src/main/java/org/alfresco/service/cmr/repository/AssociationRef.java similarity index 100% rename from src/main/java/org/alfresco/service/cmr/repository/AssociationRef.java rename to data-model/src/main/java/org/alfresco/service/cmr/repository/AssociationRef.java diff --git a/src/main/java/org/alfresco/service/cmr/repository/ChildAssociationRef.java b/data-model/src/main/java/org/alfresco/service/cmr/repository/ChildAssociationRef.java similarity index 100% rename from src/main/java/org/alfresco/service/cmr/repository/ChildAssociationRef.java rename to data-model/src/main/java/org/alfresco/service/cmr/repository/ChildAssociationRef.java diff --git a/src/main/java/org/alfresco/service/cmr/repository/ContentAccessor.java b/data-model/src/main/java/org/alfresco/service/cmr/repository/ContentAccessor.java similarity index 100% rename from src/main/java/org/alfresco/service/cmr/repository/ContentAccessor.java rename to data-model/src/main/java/org/alfresco/service/cmr/repository/ContentAccessor.java diff --git a/src/main/java/org/alfresco/service/cmr/repository/ContentData.java b/data-model/src/main/java/org/alfresco/service/cmr/repository/ContentData.java similarity index 100% rename from src/main/java/org/alfresco/service/cmr/repository/ContentData.java rename to data-model/src/main/java/org/alfresco/service/cmr/repository/ContentData.java diff --git a/src/main/java/org/alfresco/service/cmr/repository/ContentIOException.java b/data-model/src/main/java/org/alfresco/service/cmr/repository/ContentIOException.java similarity index 100% rename from src/main/java/org/alfresco/service/cmr/repository/ContentIOException.java rename to data-model/src/main/java/org/alfresco/service/cmr/repository/ContentIOException.java diff --git a/src/main/java/org/alfresco/service/cmr/repository/ContentReader.java b/data-model/src/main/java/org/alfresco/service/cmr/repository/ContentReader.java similarity index 100% rename from src/main/java/org/alfresco/service/cmr/repository/ContentReader.java rename to data-model/src/main/java/org/alfresco/service/cmr/repository/ContentReader.java diff --git a/src/main/java/org/alfresco/service/cmr/repository/ContentServiceTransientException.java b/data-model/src/main/java/org/alfresco/service/cmr/repository/ContentServiceTransientException.java similarity index 100% rename from src/main/java/org/alfresco/service/cmr/repository/ContentServiceTransientException.java rename to data-model/src/main/java/org/alfresco/service/cmr/repository/ContentServiceTransientException.java diff --git a/src/main/java/org/alfresco/service/cmr/repository/ContentStreamListener.java b/data-model/src/main/java/org/alfresco/service/cmr/repository/ContentStreamListener.java similarity index 100% rename from src/main/java/org/alfresco/service/cmr/repository/ContentStreamListener.java rename to data-model/src/main/java/org/alfresco/service/cmr/repository/ContentStreamListener.java diff --git a/src/main/java/org/alfresco/service/cmr/repository/ContentUrlKey.java b/data-model/src/main/java/org/alfresco/service/cmr/repository/ContentUrlKey.java similarity index 100% rename from src/main/java/org/alfresco/service/cmr/repository/ContentUrlKey.java rename to data-model/src/main/java/org/alfresco/service/cmr/repository/ContentUrlKey.java diff --git a/src/main/java/org/alfresco/service/cmr/repository/ContentWriter.java b/data-model/src/main/java/org/alfresco/service/cmr/repository/ContentWriter.java similarity index 100% rename from src/main/java/org/alfresco/service/cmr/repository/ContentWriter.java rename to data-model/src/main/java/org/alfresco/service/cmr/repository/ContentWriter.java diff --git a/src/main/java/org/alfresco/service/cmr/repository/DirectAccessUrl.java b/data-model/src/main/java/org/alfresco/service/cmr/repository/DirectAccessUrl.java similarity index 100% rename from src/main/java/org/alfresco/service/cmr/repository/DirectAccessUrl.java rename to data-model/src/main/java/org/alfresco/service/cmr/repository/DirectAccessUrl.java diff --git a/src/main/java/org/alfresco/service/cmr/repository/EntityRef.java b/data-model/src/main/java/org/alfresco/service/cmr/repository/EntityRef.java similarity index 100% rename from src/main/java/org/alfresco/service/cmr/repository/EntityRef.java rename to data-model/src/main/java/org/alfresco/service/cmr/repository/EntityRef.java diff --git a/src/main/java/org/alfresco/service/cmr/repository/FileContentReader.java b/data-model/src/main/java/org/alfresco/service/cmr/repository/FileContentReader.java similarity index 100% rename from src/main/java/org/alfresco/service/cmr/repository/FileContentReader.java rename to data-model/src/main/java/org/alfresco/service/cmr/repository/FileContentReader.java diff --git a/src/main/java/org/alfresco/service/cmr/repository/InvalidChildAssociationRefException.java b/data-model/src/main/java/org/alfresco/service/cmr/repository/InvalidChildAssociationRefException.java similarity index 100% rename from src/main/java/org/alfresco/service/cmr/repository/InvalidChildAssociationRefException.java rename to data-model/src/main/java/org/alfresco/service/cmr/repository/InvalidChildAssociationRefException.java diff --git a/src/main/java/org/alfresco/service/cmr/repository/InvalidNodeRefException.java b/data-model/src/main/java/org/alfresco/service/cmr/repository/InvalidNodeRefException.java similarity index 100% rename from src/main/java/org/alfresco/service/cmr/repository/InvalidNodeRefException.java rename to data-model/src/main/java/org/alfresco/service/cmr/repository/InvalidNodeRefException.java diff --git a/src/main/java/org/alfresco/service/cmr/repository/InvalidStoreRefException.java b/data-model/src/main/java/org/alfresco/service/cmr/repository/InvalidStoreRefException.java similarity index 100% rename from src/main/java/org/alfresco/service/cmr/repository/InvalidStoreRefException.java rename to data-model/src/main/java/org/alfresco/service/cmr/repository/InvalidStoreRefException.java diff --git a/src/main/java/org/alfresco/service/cmr/repository/MLText.java b/data-model/src/main/java/org/alfresco/service/cmr/repository/MLText.java similarity index 100% rename from src/main/java/org/alfresco/service/cmr/repository/MLText.java rename to data-model/src/main/java/org/alfresco/service/cmr/repository/MLText.java diff --git a/src/main/java/org/alfresco/service/cmr/repository/MalformedNodeRefException.java b/data-model/src/main/java/org/alfresco/service/cmr/repository/MalformedNodeRefException.java similarity index 100% rename from src/main/java/org/alfresco/service/cmr/repository/MalformedNodeRefException.java rename to data-model/src/main/java/org/alfresco/service/cmr/repository/MalformedNodeRefException.java diff --git a/src/main/java/org/alfresco/service/cmr/repository/MimetypeService.java b/data-model/src/main/java/org/alfresco/service/cmr/repository/MimetypeService.java similarity index 100% rename from src/main/java/org/alfresco/service/cmr/repository/MimetypeService.java rename to data-model/src/main/java/org/alfresco/service/cmr/repository/MimetypeService.java diff --git a/src/main/java/org/alfresco/service/cmr/repository/MimetypeServiceAware.java b/data-model/src/main/java/org/alfresco/service/cmr/repository/MimetypeServiceAware.java similarity index 100% rename from src/main/java/org/alfresco/service/cmr/repository/MimetypeServiceAware.java rename to data-model/src/main/java/org/alfresco/service/cmr/repository/MimetypeServiceAware.java diff --git a/src/main/java/org/alfresco/service/cmr/repository/NodeRef.java b/data-model/src/main/java/org/alfresco/service/cmr/repository/NodeRef.java similarity index 100% rename from src/main/java/org/alfresco/service/cmr/repository/NodeRef.java rename to data-model/src/main/java/org/alfresco/service/cmr/repository/NodeRef.java diff --git a/src/main/java/org/alfresco/service/cmr/repository/NodeService.java b/data-model/src/main/java/org/alfresco/service/cmr/repository/NodeService.java similarity index 100% rename from src/main/java/org/alfresco/service/cmr/repository/NodeService.java rename to data-model/src/main/java/org/alfresco/service/cmr/repository/NodeService.java diff --git a/src/main/java/org/alfresco/service/cmr/repository/Path.java b/data-model/src/main/java/org/alfresco/service/cmr/repository/Path.java similarity index 100% rename from src/main/java/org/alfresco/service/cmr/repository/Path.java rename to data-model/src/main/java/org/alfresco/service/cmr/repository/Path.java diff --git a/src/main/java/org/alfresco/service/cmr/repository/Period.java b/data-model/src/main/java/org/alfresco/service/cmr/repository/Period.java similarity index 100% rename from src/main/java/org/alfresco/service/cmr/repository/Period.java rename to data-model/src/main/java/org/alfresco/service/cmr/repository/Period.java diff --git a/src/main/java/org/alfresco/service/cmr/repository/PeriodProvider.java b/data-model/src/main/java/org/alfresco/service/cmr/repository/PeriodProvider.java similarity index 100% rename from src/main/java/org/alfresco/service/cmr/repository/PeriodProvider.java rename to data-model/src/main/java/org/alfresco/service/cmr/repository/PeriodProvider.java diff --git a/src/main/java/org/alfresco/service/cmr/repository/StoreExistsException.java b/data-model/src/main/java/org/alfresco/service/cmr/repository/StoreExistsException.java similarity index 100% rename from src/main/java/org/alfresco/service/cmr/repository/StoreExistsException.java rename to data-model/src/main/java/org/alfresco/service/cmr/repository/StoreExistsException.java diff --git a/src/main/java/org/alfresco/service/cmr/repository/StoreRef.java b/data-model/src/main/java/org/alfresco/service/cmr/repository/StoreRef.java similarity index 100% rename from src/main/java/org/alfresco/service/cmr/repository/StoreRef.java rename to data-model/src/main/java/org/alfresco/service/cmr/repository/StoreRef.java diff --git a/src/main/java/org/alfresco/service/cmr/repository/XPathException.java b/data-model/src/main/java/org/alfresco/service/cmr/repository/XPathException.java similarity index 100% rename from src/main/java/org/alfresco/service/cmr/repository/XPathException.java rename to data-model/src/main/java/org/alfresco/service/cmr/repository/XPathException.java diff --git a/src/main/java/org/alfresco/service/cmr/repository/datatype/DefaultTypeConverter.java b/data-model/src/main/java/org/alfresco/service/cmr/repository/datatype/DefaultTypeConverter.java similarity index 100% rename from src/main/java/org/alfresco/service/cmr/repository/datatype/DefaultTypeConverter.java rename to data-model/src/main/java/org/alfresco/service/cmr/repository/datatype/DefaultTypeConverter.java diff --git a/src/main/java/org/alfresco/service/cmr/repository/datatype/Duration.java b/data-model/src/main/java/org/alfresco/service/cmr/repository/datatype/Duration.java similarity index 100% rename from src/main/java/org/alfresco/service/cmr/repository/datatype/Duration.java rename to data-model/src/main/java/org/alfresco/service/cmr/repository/datatype/Duration.java diff --git a/src/main/java/org/alfresco/service/cmr/repository/datatype/TypeConversionException.java b/data-model/src/main/java/org/alfresco/service/cmr/repository/datatype/TypeConversionException.java similarity index 100% rename from src/main/java/org/alfresco/service/cmr/repository/datatype/TypeConversionException.java rename to data-model/src/main/java/org/alfresco/service/cmr/repository/datatype/TypeConversionException.java diff --git a/src/main/java/org/alfresco/service/cmr/repository/datatype/TypeConverter.java b/data-model/src/main/java/org/alfresco/service/cmr/repository/datatype/TypeConverter.java similarity index 100% rename from src/main/java/org/alfresco/service/cmr/repository/datatype/TypeConverter.java rename to data-model/src/main/java/org/alfresco/service/cmr/repository/datatype/TypeConverter.java diff --git a/src/main/java/org/alfresco/service/cmr/search/BasicSearchParameters.java b/data-model/src/main/java/org/alfresco/service/cmr/search/BasicSearchParameters.java similarity index 100% rename from src/main/java/org/alfresco/service/cmr/search/BasicSearchParameters.java rename to data-model/src/main/java/org/alfresco/service/cmr/search/BasicSearchParameters.java diff --git a/src/main/java/org/alfresco/service/cmr/search/FacetFormat.java b/data-model/src/main/java/org/alfresco/service/cmr/search/FacetFormat.java similarity index 100% rename from src/main/java/org/alfresco/service/cmr/search/FacetFormat.java rename to data-model/src/main/java/org/alfresco/service/cmr/search/FacetFormat.java diff --git a/src/main/java/org/alfresco/service/cmr/search/FieldHighlightParameters.java b/data-model/src/main/java/org/alfresco/service/cmr/search/FieldHighlightParameters.java similarity index 100% rename from src/main/java/org/alfresco/service/cmr/search/FieldHighlightParameters.java rename to data-model/src/main/java/org/alfresco/service/cmr/search/FieldHighlightParameters.java diff --git a/src/main/java/org/alfresco/service/cmr/search/GeneralHighlightParameters.java b/data-model/src/main/java/org/alfresco/service/cmr/search/GeneralHighlightParameters.java similarity index 100% rename from src/main/java/org/alfresco/service/cmr/search/GeneralHighlightParameters.java rename to data-model/src/main/java/org/alfresco/service/cmr/search/GeneralHighlightParameters.java diff --git a/src/main/java/org/alfresco/service/cmr/search/HighlightParameters.java b/data-model/src/main/java/org/alfresco/service/cmr/search/HighlightParameters.java similarity index 100% rename from src/main/java/org/alfresco/service/cmr/search/HighlightParameters.java rename to data-model/src/main/java/org/alfresco/service/cmr/search/HighlightParameters.java diff --git a/src/main/java/org/alfresco/service/cmr/search/Interval.java b/data-model/src/main/java/org/alfresco/service/cmr/search/Interval.java similarity index 100% rename from src/main/java/org/alfresco/service/cmr/search/Interval.java rename to data-model/src/main/java/org/alfresco/service/cmr/search/Interval.java diff --git a/src/main/java/org/alfresco/service/cmr/search/IntervalParameters.java b/data-model/src/main/java/org/alfresco/service/cmr/search/IntervalParameters.java similarity index 100% rename from src/main/java/org/alfresco/service/cmr/search/IntervalParameters.java rename to data-model/src/main/java/org/alfresco/service/cmr/search/IntervalParameters.java diff --git a/src/main/java/org/alfresco/service/cmr/search/IntervalSet.java b/data-model/src/main/java/org/alfresco/service/cmr/search/IntervalSet.java similarity index 100% rename from src/main/java/org/alfresco/service/cmr/search/IntervalSet.java rename to data-model/src/main/java/org/alfresco/service/cmr/search/IntervalSet.java diff --git a/src/main/java/org/alfresco/service/cmr/search/LimitBy.java b/data-model/src/main/java/org/alfresco/service/cmr/search/LimitBy.java similarity index 100% rename from src/main/java/org/alfresco/service/cmr/search/LimitBy.java rename to data-model/src/main/java/org/alfresco/service/cmr/search/LimitBy.java diff --git a/src/main/java/org/alfresco/service/cmr/search/NamedQueryParameterDefinition.java b/data-model/src/main/java/org/alfresco/service/cmr/search/NamedQueryParameterDefinition.java similarity index 100% rename from src/main/java/org/alfresco/service/cmr/search/NamedQueryParameterDefinition.java rename to data-model/src/main/java/org/alfresco/service/cmr/search/NamedQueryParameterDefinition.java diff --git a/src/main/java/org/alfresco/service/cmr/search/PermissionEvaluationMode.java b/data-model/src/main/java/org/alfresco/service/cmr/search/PermissionEvaluationMode.java similarity index 100% rename from src/main/java/org/alfresco/service/cmr/search/PermissionEvaluationMode.java rename to data-model/src/main/java/org/alfresco/service/cmr/search/PermissionEvaluationMode.java diff --git a/src/main/java/org/alfresco/service/cmr/search/QueryConsistency.java b/data-model/src/main/java/org/alfresco/service/cmr/search/QueryConsistency.java similarity index 100% rename from src/main/java/org/alfresco/service/cmr/search/QueryConsistency.java rename to data-model/src/main/java/org/alfresco/service/cmr/search/QueryConsistency.java diff --git a/src/main/java/org/alfresco/service/cmr/search/QueryParameter.java b/data-model/src/main/java/org/alfresco/service/cmr/search/QueryParameter.java similarity index 100% rename from src/main/java/org/alfresco/service/cmr/search/QueryParameter.java rename to data-model/src/main/java/org/alfresco/service/cmr/search/QueryParameter.java diff --git a/src/main/java/org/alfresco/service/cmr/search/QueryParameterDefinition.java b/data-model/src/main/java/org/alfresco/service/cmr/search/QueryParameterDefinition.java similarity index 100% rename from src/main/java/org/alfresco/service/cmr/search/QueryParameterDefinition.java rename to data-model/src/main/java/org/alfresco/service/cmr/search/QueryParameterDefinition.java diff --git a/src/main/java/org/alfresco/service/cmr/search/RangeParameters.java b/data-model/src/main/java/org/alfresco/service/cmr/search/RangeParameters.java similarity index 100% rename from src/main/java/org/alfresco/service/cmr/search/RangeParameters.java rename to data-model/src/main/java/org/alfresco/service/cmr/search/RangeParameters.java diff --git a/src/main/java/org/alfresco/service/cmr/search/ResultSet.java b/data-model/src/main/java/org/alfresco/service/cmr/search/ResultSet.java similarity index 100% rename from src/main/java/org/alfresco/service/cmr/search/ResultSet.java rename to data-model/src/main/java/org/alfresco/service/cmr/search/ResultSet.java diff --git a/src/main/java/org/alfresco/service/cmr/search/ResultSetColumn.java b/data-model/src/main/java/org/alfresco/service/cmr/search/ResultSetColumn.java similarity index 100% rename from src/main/java/org/alfresco/service/cmr/search/ResultSetColumn.java rename to data-model/src/main/java/org/alfresco/service/cmr/search/ResultSetColumn.java diff --git a/src/main/java/org/alfresco/service/cmr/search/ResultSetMetaData.java b/data-model/src/main/java/org/alfresco/service/cmr/search/ResultSetMetaData.java similarity index 100% rename from src/main/java/org/alfresco/service/cmr/search/ResultSetMetaData.java rename to data-model/src/main/java/org/alfresco/service/cmr/search/ResultSetMetaData.java diff --git a/src/main/java/org/alfresco/service/cmr/search/ResultSetRow.java b/data-model/src/main/java/org/alfresco/service/cmr/search/ResultSetRow.java similarity index 100% rename from src/main/java/org/alfresco/service/cmr/search/ResultSetRow.java rename to data-model/src/main/java/org/alfresco/service/cmr/search/ResultSetRow.java diff --git a/src/main/java/org/alfresco/service/cmr/search/ResultSetSPI.java b/data-model/src/main/java/org/alfresco/service/cmr/search/ResultSetSPI.java similarity index 100% rename from src/main/java/org/alfresco/service/cmr/search/ResultSetSPI.java rename to data-model/src/main/java/org/alfresco/service/cmr/search/ResultSetSPI.java diff --git a/src/main/java/org/alfresco/service/cmr/search/ResultSetSelector.java b/data-model/src/main/java/org/alfresco/service/cmr/search/ResultSetSelector.java similarity index 100% rename from src/main/java/org/alfresco/service/cmr/search/ResultSetSelector.java rename to data-model/src/main/java/org/alfresco/service/cmr/search/ResultSetSelector.java diff --git a/src/main/java/org/alfresco/service/cmr/search/ResultSetType.java b/data-model/src/main/java/org/alfresco/service/cmr/search/ResultSetType.java similarity index 100% rename from src/main/java/org/alfresco/service/cmr/search/ResultSetType.java rename to data-model/src/main/java/org/alfresco/service/cmr/search/ResultSetType.java diff --git a/src/main/java/org/alfresco/service/cmr/search/SearchParameters.java b/data-model/src/main/java/org/alfresco/service/cmr/search/SearchParameters.java similarity index 100% rename from src/main/java/org/alfresco/service/cmr/search/SearchParameters.java rename to data-model/src/main/java/org/alfresco/service/cmr/search/SearchParameters.java diff --git a/src/main/java/org/alfresco/service/cmr/search/SearchSQLParameters.java b/data-model/src/main/java/org/alfresco/service/cmr/search/SearchSQLParameters.java similarity index 100% rename from src/main/java/org/alfresco/service/cmr/search/SearchSQLParameters.java rename to data-model/src/main/java/org/alfresco/service/cmr/search/SearchSQLParameters.java diff --git a/src/main/java/org/alfresco/service/cmr/search/SearchService.java b/data-model/src/main/java/org/alfresco/service/cmr/search/SearchService.java similarity index 100% rename from src/main/java/org/alfresco/service/cmr/search/SearchService.java rename to data-model/src/main/java/org/alfresco/service/cmr/search/SearchService.java diff --git a/src/main/java/org/alfresco/service/cmr/search/SpellCheckResult.java b/data-model/src/main/java/org/alfresco/service/cmr/search/SpellCheckResult.java similarity index 100% rename from src/main/java/org/alfresco/service/cmr/search/SpellCheckResult.java rename to data-model/src/main/java/org/alfresco/service/cmr/search/SpellCheckResult.java diff --git a/src/main/java/org/alfresco/service/cmr/search/StatsParameters.java b/data-model/src/main/java/org/alfresco/service/cmr/search/StatsParameters.java similarity index 100% rename from src/main/java/org/alfresco/service/cmr/search/StatsParameters.java rename to data-model/src/main/java/org/alfresco/service/cmr/search/StatsParameters.java diff --git a/src/main/java/org/alfresco/service/cmr/search/StatsProcessor.java b/data-model/src/main/java/org/alfresco/service/cmr/search/StatsProcessor.java similarity index 100% rename from src/main/java/org/alfresco/service/cmr/search/StatsProcessor.java rename to data-model/src/main/java/org/alfresco/service/cmr/search/StatsProcessor.java diff --git a/src/main/java/org/alfresco/service/cmr/search/StatsProcessorUsingMap.java b/data-model/src/main/java/org/alfresco/service/cmr/search/StatsProcessorUsingMap.java similarity index 100% rename from src/main/java/org/alfresco/service/cmr/search/StatsProcessorUsingMap.java rename to data-model/src/main/java/org/alfresco/service/cmr/search/StatsProcessorUsingMap.java diff --git a/src/main/java/org/alfresco/service/cmr/search/StatsRequestParameters.java b/data-model/src/main/java/org/alfresco/service/cmr/search/StatsRequestParameters.java similarity index 100% rename from src/main/java/org/alfresco/service/cmr/search/StatsRequestParameters.java rename to data-model/src/main/java/org/alfresco/service/cmr/search/StatsRequestParameters.java diff --git a/src/main/java/org/alfresco/service/cmr/search/StatsResultSet.java b/data-model/src/main/java/org/alfresco/service/cmr/search/StatsResultSet.java similarity index 100% rename from src/main/java/org/alfresco/service/cmr/search/StatsResultSet.java rename to data-model/src/main/java/org/alfresco/service/cmr/search/StatsResultSet.java diff --git a/src/main/java/org/alfresco/service/cmr/search/StatsResultStat.java b/data-model/src/main/java/org/alfresco/service/cmr/search/StatsResultStat.java similarity index 100% rename from src/main/java/org/alfresco/service/cmr/search/StatsResultStat.java rename to data-model/src/main/java/org/alfresco/service/cmr/search/StatsResultStat.java diff --git a/src/main/java/org/alfresco/service/cmr/search/StatsService.java b/data-model/src/main/java/org/alfresco/service/cmr/search/StatsService.java similarity index 100% rename from src/main/java/org/alfresco/service/cmr/search/StatsService.java rename to data-model/src/main/java/org/alfresco/service/cmr/search/StatsService.java diff --git a/src/main/java/org/alfresco/service/cmr/security/AccessPermission.java b/data-model/src/main/java/org/alfresco/service/cmr/security/AccessPermission.java similarity index 100% rename from src/main/java/org/alfresco/service/cmr/security/AccessPermission.java rename to data-model/src/main/java/org/alfresco/service/cmr/security/AccessPermission.java diff --git a/src/main/java/org/alfresco/service/cmr/security/AccessStatus.java b/data-model/src/main/java/org/alfresco/service/cmr/security/AccessStatus.java similarity index 100% rename from src/main/java/org/alfresco/service/cmr/security/AccessStatus.java rename to data-model/src/main/java/org/alfresco/service/cmr/security/AccessStatus.java diff --git a/src/main/java/org/alfresco/service/cmr/security/AuthorityType.java b/data-model/src/main/java/org/alfresco/service/cmr/security/AuthorityType.java similarity index 100% rename from src/main/java/org/alfresco/service/cmr/security/AuthorityType.java rename to data-model/src/main/java/org/alfresco/service/cmr/security/AuthorityType.java diff --git a/src/main/java/org/alfresco/service/cmr/security/PermissionContext.java b/data-model/src/main/java/org/alfresco/service/cmr/security/PermissionContext.java similarity index 100% rename from src/main/java/org/alfresco/service/cmr/security/PermissionContext.java rename to data-model/src/main/java/org/alfresco/service/cmr/security/PermissionContext.java diff --git a/src/main/java/org/alfresco/service/cmr/security/PermissionService.java b/data-model/src/main/java/org/alfresco/service/cmr/security/PermissionService.java similarity index 100% rename from src/main/java/org/alfresco/service/cmr/security/PermissionService.java rename to data-model/src/main/java/org/alfresco/service/cmr/security/PermissionService.java diff --git a/src/main/java/org/alfresco/service/namespace/DynamicNamespacePrefixResolver.java b/data-model/src/main/java/org/alfresco/service/namespace/DynamicNamespacePrefixResolver.java similarity index 100% rename from src/main/java/org/alfresco/service/namespace/DynamicNamespacePrefixResolver.java rename to data-model/src/main/java/org/alfresco/service/namespace/DynamicNamespacePrefixResolver.java diff --git a/src/main/java/org/alfresco/service/namespace/InvalidQNameException.java b/data-model/src/main/java/org/alfresco/service/namespace/InvalidQNameException.java similarity index 100% rename from src/main/java/org/alfresco/service/namespace/InvalidQNameException.java rename to data-model/src/main/java/org/alfresco/service/namespace/InvalidQNameException.java diff --git a/src/main/java/org/alfresco/service/namespace/NamespaceException.java b/data-model/src/main/java/org/alfresco/service/namespace/NamespaceException.java similarity index 100% rename from src/main/java/org/alfresco/service/namespace/NamespaceException.java rename to data-model/src/main/java/org/alfresco/service/namespace/NamespaceException.java diff --git a/src/main/java/org/alfresco/service/namespace/NamespacePrefixResolver.java b/data-model/src/main/java/org/alfresco/service/namespace/NamespacePrefixResolver.java similarity index 100% rename from src/main/java/org/alfresco/service/namespace/NamespacePrefixResolver.java rename to data-model/src/main/java/org/alfresco/service/namespace/NamespacePrefixResolver.java diff --git a/src/main/java/org/alfresco/service/namespace/NamespacePrefixResolverProvider.java b/data-model/src/main/java/org/alfresco/service/namespace/NamespacePrefixResolverProvider.java similarity index 100% rename from src/main/java/org/alfresco/service/namespace/NamespacePrefixResolverProvider.java rename to data-model/src/main/java/org/alfresco/service/namespace/NamespacePrefixResolverProvider.java diff --git a/src/main/java/org/alfresco/service/namespace/NamespaceService.java b/data-model/src/main/java/org/alfresco/service/namespace/NamespaceService.java similarity index 100% rename from src/main/java/org/alfresco/service/namespace/NamespaceService.java rename to data-model/src/main/java/org/alfresco/service/namespace/NamespaceService.java diff --git a/src/main/java/org/alfresco/service/namespace/NamespaceServiceMemoryImpl.java b/data-model/src/main/java/org/alfresco/service/namespace/NamespaceServiceMemoryImpl.java similarity index 100% rename from src/main/java/org/alfresco/service/namespace/NamespaceServiceMemoryImpl.java rename to data-model/src/main/java/org/alfresco/service/namespace/NamespaceServiceMemoryImpl.java diff --git a/src/main/java/org/alfresco/service/namespace/QName.java b/data-model/src/main/java/org/alfresco/service/namespace/QName.java similarity index 100% rename from src/main/java/org/alfresco/service/namespace/QName.java rename to data-model/src/main/java/org/alfresco/service/namespace/QName.java diff --git a/src/main/java/org/alfresco/service/namespace/QNameCache.java b/data-model/src/main/java/org/alfresco/service/namespace/QNameCache.java similarity index 100% rename from src/main/java/org/alfresco/service/namespace/QNameCache.java rename to data-model/src/main/java/org/alfresco/service/namespace/QNameCache.java diff --git a/src/main/java/org/alfresco/service/namespace/QNameMap.java b/data-model/src/main/java/org/alfresco/service/namespace/QNameMap.java similarity index 100% rename from src/main/java/org/alfresco/service/namespace/QNameMap.java rename to data-model/src/main/java/org/alfresco/service/namespace/QNameMap.java diff --git a/src/main/java/org/alfresco/service/namespace/QNamePattern.java b/data-model/src/main/java/org/alfresco/service/namespace/QNamePattern.java similarity index 100% rename from src/main/java/org/alfresco/service/namespace/QNamePattern.java rename to data-model/src/main/java/org/alfresco/service/namespace/QNamePattern.java diff --git a/src/main/java/org/alfresco/service/namespace/RegexQNamePattern.java b/data-model/src/main/java/org/alfresco/service/namespace/RegexQNamePattern.java similarity index 100% rename from src/main/java/org/alfresco/service/namespace/RegexQNamePattern.java rename to data-model/src/main/java/org/alfresco/service/namespace/RegexQNamePattern.java diff --git a/src/main/java/org/alfresco/util/BaseApplicationContextHelper.java b/data-model/src/main/java/org/alfresco/util/BaseApplicationContextHelper.java similarity index 100% rename from src/main/java/org/alfresco/util/BaseApplicationContextHelper.java rename to data-model/src/main/java/org/alfresco/util/BaseApplicationContextHelper.java diff --git a/src/main/java/org/alfresco/util/ConfigFileFinder.java b/data-model/src/main/java/org/alfresco/util/ConfigFileFinder.java similarity index 100% rename from src/main/java/org/alfresco/util/ConfigFileFinder.java rename to data-model/src/main/java/org/alfresco/util/ConfigFileFinder.java diff --git a/src/main/java/org/alfresco/util/ConfigScheduler.java b/data-model/src/main/java/org/alfresco/util/ConfigScheduler.java similarity index 100% rename from src/main/java/org/alfresco/util/ConfigScheduler.java rename to data-model/src/main/java/org/alfresco/util/ConfigScheduler.java diff --git a/src/main/java/org/alfresco/util/DataModelTestApplicationContextHelper.java b/data-model/src/main/java/org/alfresco/util/DataModelTestApplicationContextHelper.java similarity index 100% rename from src/main/java/org/alfresco/util/DataModelTestApplicationContextHelper.java rename to data-model/src/main/java/org/alfresco/util/DataModelTestApplicationContextHelper.java diff --git a/src/main/java/org/alfresco/util/ISO9075.java b/data-model/src/main/java/org/alfresco/util/ISO9075.java similarity index 100% rename from src/main/java/org/alfresco/util/ISO9075.java rename to data-model/src/main/java/org/alfresco/util/ISO9075.java diff --git a/src/main/java/org/alfresco/util/LazyClassPathXmlApplicationContext.java b/data-model/src/main/java/org/alfresco/util/LazyClassPathXmlApplicationContext.java similarity index 100% rename from src/main/java/org/alfresco/util/LazyClassPathXmlApplicationContext.java rename to data-model/src/main/java/org/alfresco/util/LazyClassPathXmlApplicationContext.java diff --git a/src/main/java/org/alfresco/util/NoAutoStartClassPathXmlApplicationContext.java b/data-model/src/main/java/org/alfresco/util/NoAutoStartClassPathXmlApplicationContext.java similarity index 100% rename from src/main/java/org/alfresco/util/NoAutoStartClassPathXmlApplicationContext.java rename to data-model/src/main/java/org/alfresco/util/NoAutoStartClassPathXmlApplicationContext.java diff --git a/src/main/java/org/alfresco/util/NumericEncoder.java b/data-model/src/main/java/org/alfresco/util/NumericEncoder.java similarity index 100% rename from src/main/java/org/alfresco/util/NumericEncoder.java rename to data-model/src/main/java/org/alfresco/util/NumericEncoder.java diff --git a/src/main/java/org/alfresco/util/SearchDateConversion.java b/data-model/src/main/java/org/alfresco/util/SearchDateConversion.java similarity index 100% rename from src/main/java/org/alfresco/util/SearchDateConversion.java rename to data-model/src/main/java/org/alfresco/util/SearchDateConversion.java diff --git a/src/main/java/org/alfresco/util/SearchLanguageConversion.java b/data-model/src/main/java/org/alfresco/util/SearchLanguageConversion.java similarity index 100% rename from src/main/java/org/alfresco/util/SearchLanguageConversion.java rename to data-model/src/main/java/org/alfresco/util/SearchLanguageConversion.java diff --git a/src/main/java/org/alfresco/util/ShutdownIndicator.java b/data-model/src/main/java/org/alfresco/util/ShutdownIndicator.java similarity index 100% rename from src/main/java/org/alfresco/util/ShutdownIndicator.java rename to data-model/src/main/java/org/alfresco/util/ShutdownIndicator.java diff --git a/src/main/java/org/alfresco/util/WebApplicationContextLoader.java b/data-model/src/main/java/org/alfresco/util/WebApplicationContextLoader.java similarity index 100% rename from src/main/java/org/alfresco/util/WebApplicationContextLoader.java rename to data-model/src/main/java/org/alfresco/util/WebApplicationContextLoader.java diff --git a/src/main/java/org/apache/tika/mime/custom-mimetypes.xml b/data-model/src/main/java/org/apache/tika/mime/custom-mimetypes.xml similarity index 100% rename from src/main/java/org/apache/tika/mime/custom-mimetypes.xml rename to data-model/src/main/java/org/apache/tika/mime/custom-mimetypes.xml diff --git a/src/main/resources/alfresco/data-model-stand-alone-context.xml b/data-model/src/main/resources/alfresco/data-model-stand-alone-context.xml similarity index 100% rename from src/main/resources/alfresco/data-model-stand-alone-context.xml rename to data-model/src/main/resources/alfresco/data-model-stand-alone-context.xml diff --git a/src/main/resources/alfresco/messages/dictionary-messages.properties b/data-model/src/main/resources/alfresco/messages/dictionary-messages.properties similarity index 100% rename from src/main/resources/alfresco/messages/dictionary-messages.properties rename to data-model/src/main/resources/alfresco/messages/dictionary-messages.properties diff --git a/src/main/resources/alfresco/messages/dictionary-model.properties b/data-model/src/main/resources/alfresco/messages/dictionary-model.properties similarity index 100% rename from src/main/resources/alfresco/messages/dictionary-model.properties rename to data-model/src/main/resources/alfresco/messages/dictionary-model.properties diff --git a/src/main/resources/alfresco/messages/dictionary-model_de.properties b/data-model/src/main/resources/alfresco/messages/dictionary-model_de.properties similarity index 100% rename from src/main/resources/alfresco/messages/dictionary-model_de.properties rename to data-model/src/main/resources/alfresco/messages/dictionary-model_de.properties diff --git a/src/main/resources/alfresco/messages/dictionary-model_es.properties b/data-model/src/main/resources/alfresco/messages/dictionary-model_es.properties similarity index 100% rename from src/main/resources/alfresco/messages/dictionary-model_es.properties rename to data-model/src/main/resources/alfresco/messages/dictionary-model_es.properties diff --git a/src/main/resources/alfresco/messages/dictionary-model_fr.properties b/data-model/src/main/resources/alfresco/messages/dictionary-model_fr.properties similarity index 100% rename from src/main/resources/alfresco/messages/dictionary-model_fr.properties rename to data-model/src/main/resources/alfresco/messages/dictionary-model_fr.properties diff --git a/src/main/resources/alfresco/messages/dictionary-model_it.properties b/data-model/src/main/resources/alfresco/messages/dictionary-model_it.properties similarity index 100% rename from src/main/resources/alfresco/messages/dictionary-model_it.properties rename to data-model/src/main/resources/alfresco/messages/dictionary-model_it.properties diff --git a/src/main/resources/alfresco/messages/dictionary-model_ja.properties b/data-model/src/main/resources/alfresco/messages/dictionary-model_ja.properties similarity index 100% rename from src/main/resources/alfresco/messages/dictionary-model_ja.properties rename to data-model/src/main/resources/alfresco/messages/dictionary-model_ja.properties diff --git a/src/main/resources/alfresco/messages/dictionary-model_nb.properties b/data-model/src/main/resources/alfresco/messages/dictionary-model_nb.properties similarity index 100% rename from src/main/resources/alfresco/messages/dictionary-model_nb.properties rename to data-model/src/main/resources/alfresco/messages/dictionary-model_nb.properties diff --git a/src/main/resources/alfresco/messages/dictionary-model_nl.properties b/data-model/src/main/resources/alfresco/messages/dictionary-model_nl.properties similarity index 100% rename from src/main/resources/alfresco/messages/dictionary-model_nl.properties rename to data-model/src/main/resources/alfresco/messages/dictionary-model_nl.properties diff --git a/src/main/resources/alfresco/messages/dictionary-model_pt_BR.properties b/data-model/src/main/resources/alfresco/messages/dictionary-model_pt_BR.properties similarity index 100% rename from src/main/resources/alfresco/messages/dictionary-model_pt_BR.properties rename to data-model/src/main/resources/alfresco/messages/dictionary-model_pt_BR.properties diff --git a/src/main/resources/alfresco/messages/dictionary-model_ru.properties b/data-model/src/main/resources/alfresco/messages/dictionary-model_ru.properties similarity index 100% rename from src/main/resources/alfresco/messages/dictionary-model_ru.properties rename to data-model/src/main/resources/alfresco/messages/dictionary-model_ru.properties diff --git a/src/main/resources/alfresco/messages/dictionary-model_zh_CN.properties b/data-model/src/main/resources/alfresco/messages/dictionary-model_zh_CN.properties similarity index 100% rename from src/main/resources/alfresco/messages/dictionary-model_zh_CN.properties rename to data-model/src/main/resources/alfresco/messages/dictionary-model_zh_CN.properties diff --git a/src/main/resources/alfresco/mimetype/mimetype-map-openoffice.xml b/data-model/src/main/resources/alfresco/mimetype/mimetype-map-openoffice.xml similarity index 100% rename from src/main/resources/alfresco/mimetype/mimetype-map-openoffice.xml rename to data-model/src/main/resources/alfresco/mimetype/mimetype-map-openoffice.xml diff --git a/src/main/resources/alfresco/mimetype/mimetype-map.xml b/data-model/src/main/resources/alfresco/mimetype/mimetype-map.xml similarity index 100% rename from src/main/resources/alfresco/mimetype/mimetype-map.xml rename to data-model/src/main/resources/alfresco/mimetype/mimetype-map.xml diff --git a/src/main/resources/alfresco/model/cmisModel.xml b/data-model/src/main/resources/alfresco/model/cmisModel.xml similarity index 100% rename from src/main/resources/alfresco/model/cmisModel.xml rename to data-model/src/main/resources/alfresco/model/cmisModel.xml diff --git a/src/main/resources/alfresco/model/dataTypeAnalyzers.properties b/data-model/src/main/resources/alfresco/model/dataTypeAnalyzers.properties similarity index 100% rename from src/main/resources/alfresco/model/dataTypeAnalyzers.properties rename to data-model/src/main/resources/alfresco/model/dataTypeAnalyzers.properties diff --git a/src/main/resources/alfresco/model/dataTypeAnalyzers_cs.properties b/data-model/src/main/resources/alfresco/model/dataTypeAnalyzers_cs.properties similarity index 100% rename from src/main/resources/alfresco/model/dataTypeAnalyzers_cs.properties rename to data-model/src/main/resources/alfresco/model/dataTypeAnalyzers_cs.properties diff --git a/src/main/resources/alfresco/model/dataTypeAnalyzers_da.properties b/data-model/src/main/resources/alfresco/model/dataTypeAnalyzers_da.properties similarity index 100% rename from src/main/resources/alfresco/model/dataTypeAnalyzers_da.properties rename to data-model/src/main/resources/alfresco/model/dataTypeAnalyzers_da.properties diff --git a/src/main/resources/alfresco/model/dataTypeAnalyzers_de.properties b/data-model/src/main/resources/alfresco/model/dataTypeAnalyzers_de.properties similarity index 100% rename from src/main/resources/alfresco/model/dataTypeAnalyzers_de.properties rename to data-model/src/main/resources/alfresco/model/dataTypeAnalyzers_de.properties diff --git a/src/main/resources/alfresco/model/dataTypeAnalyzers_el.properties b/data-model/src/main/resources/alfresco/model/dataTypeAnalyzers_el.properties similarity index 100% rename from src/main/resources/alfresco/model/dataTypeAnalyzers_el.properties rename to data-model/src/main/resources/alfresco/model/dataTypeAnalyzers_el.properties diff --git a/src/main/resources/alfresco/model/dataTypeAnalyzers_en.properties b/data-model/src/main/resources/alfresco/model/dataTypeAnalyzers_en.properties similarity index 100% rename from src/main/resources/alfresco/model/dataTypeAnalyzers_en.properties rename to data-model/src/main/resources/alfresco/model/dataTypeAnalyzers_en.properties diff --git a/src/main/resources/alfresco/model/dataTypeAnalyzers_es.properties b/data-model/src/main/resources/alfresco/model/dataTypeAnalyzers_es.properties similarity index 100% rename from src/main/resources/alfresco/model/dataTypeAnalyzers_es.properties rename to data-model/src/main/resources/alfresco/model/dataTypeAnalyzers_es.properties diff --git a/src/main/resources/alfresco/model/dataTypeAnalyzers_fi.properties b/data-model/src/main/resources/alfresco/model/dataTypeAnalyzers_fi.properties similarity index 100% rename from src/main/resources/alfresco/model/dataTypeAnalyzers_fi.properties rename to data-model/src/main/resources/alfresco/model/dataTypeAnalyzers_fi.properties diff --git a/src/main/resources/alfresco/model/dataTypeAnalyzers_fr.properties b/data-model/src/main/resources/alfresco/model/dataTypeAnalyzers_fr.properties similarity index 100% rename from src/main/resources/alfresco/model/dataTypeAnalyzers_fr.properties rename to data-model/src/main/resources/alfresco/model/dataTypeAnalyzers_fr.properties diff --git a/src/main/resources/alfresco/model/dataTypeAnalyzers_it.properties b/data-model/src/main/resources/alfresco/model/dataTypeAnalyzers_it.properties similarity index 100% rename from src/main/resources/alfresco/model/dataTypeAnalyzers_it.properties rename to data-model/src/main/resources/alfresco/model/dataTypeAnalyzers_it.properties diff --git a/src/main/resources/alfresco/model/dataTypeAnalyzers_ja.properties b/data-model/src/main/resources/alfresco/model/dataTypeAnalyzers_ja.properties similarity index 100% rename from src/main/resources/alfresco/model/dataTypeAnalyzers_ja.properties rename to data-model/src/main/resources/alfresco/model/dataTypeAnalyzers_ja.properties diff --git a/src/main/resources/alfresco/model/dataTypeAnalyzers_ko.properties b/data-model/src/main/resources/alfresco/model/dataTypeAnalyzers_ko.properties similarity index 100% rename from src/main/resources/alfresco/model/dataTypeAnalyzers_ko.properties rename to data-model/src/main/resources/alfresco/model/dataTypeAnalyzers_ko.properties diff --git a/src/main/resources/alfresco/model/dataTypeAnalyzers_nl.properties b/data-model/src/main/resources/alfresco/model/dataTypeAnalyzers_nl.properties similarity index 100% rename from src/main/resources/alfresco/model/dataTypeAnalyzers_nl.properties rename to data-model/src/main/resources/alfresco/model/dataTypeAnalyzers_nl.properties diff --git a/src/main/resources/alfresco/model/dataTypeAnalyzers_no.properties b/data-model/src/main/resources/alfresco/model/dataTypeAnalyzers_no.properties similarity index 100% rename from src/main/resources/alfresco/model/dataTypeAnalyzers_no.properties rename to data-model/src/main/resources/alfresco/model/dataTypeAnalyzers_no.properties diff --git a/src/main/resources/alfresco/model/dataTypeAnalyzers_pt.properties b/data-model/src/main/resources/alfresco/model/dataTypeAnalyzers_pt.properties similarity index 100% rename from src/main/resources/alfresco/model/dataTypeAnalyzers_pt.properties rename to data-model/src/main/resources/alfresco/model/dataTypeAnalyzers_pt.properties diff --git a/src/main/resources/alfresco/model/dataTypeAnalyzers_pt_BR.properties b/data-model/src/main/resources/alfresco/model/dataTypeAnalyzers_pt_BR.properties similarity index 100% rename from src/main/resources/alfresco/model/dataTypeAnalyzers_pt_BR.properties rename to data-model/src/main/resources/alfresco/model/dataTypeAnalyzers_pt_BR.properties diff --git a/src/main/resources/alfresco/model/dataTypeAnalyzers_ru.properties b/data-model/src/main/resources/alfresco/model/dataTypeAnalyzers_ru.properties similarity index 100% rename from src/main/resources/alfresco/model/dataTypeAnalyzers_ru.properties rename to data-model/src/main/resources/alfresco/model/dataTypeAnalyzers_ru.properties diff --git a/src/main/resources/alfresco/model/dataTypeAnalyzers_sv.properties b/data-model/src/main/resources/alfresco/model/dataTypeAnalyzers_sv.properties similarity index 100% rename from src/main/resources/alfresco/model/dataTypeAnalyzers_sv.properties rename to data-model/src/main/resources/alfresco/model/dataTypeAnalyzers_sv.properties diff --git a/src/main/resources/alfresco/model/dataTypeAnalyzers_th.properties b/data-model/src/main/resources/alfresco/model/dataTypeAnalyzers_th.properties similarity index 100% rename from src/main/resources/alfresco/model/dataTypeAnalyzers_th.properties rename to data-model/src/main/resources/alfresco/model/dataTypeAnalyzers_th.properties diff --git a/src/main/resources/alfresco/model/dataTypeAnalyzers_zh.properties b/data-model/src/main/resources/alfresco/model/dataTypeAnalyzers_zh.properties similarity index 100% rename from src/main/resources/alfresco/model/dataTypeAnalyzers_zh.properties rename to data-model/src/main/resources/alfresco/model/dataTypeAnalyzers_zh.properties diff --git a/src/main/resources/alfresco/model/dictionaryModel.xml b/data-model/src/main/resources/alfresco/model/dictionaryModel.xml similarity index 100% rename from src/main/resources/alfresco/model/dictionaryModel.xml rename to data-model/src/main/resources/alfresco/model/dictionaryModel.xml diff --git a/src/test/java/org/alfresco/opencmis/dictionary/CMISAbstractDictionaryServiceTest.java b/data-model/src/test/java/org/alfresco/opencmis/dictionary/CMISAbstractDictionaryServiceTest.java similarity index 100% rename from src/test/java/org/alfresco/opencmis/dictionary/CMISAbstractDictionaryServiceTest.java rename to data-model/src/test/java/org/alfresco/opencmis/dictionary/CMISAbstractDictionaryServiceTest.java diff --git a/src/test/java/org/alfresco/repo/cache/SimpleCacheTestBase.java b/data-model/src/test/java/org/alfresco/repo/cache/SimpleCacheTestBase.java similarity index 100% rename from src/test/java/org/alfresco/repo/cache/SimpleCacheTestBase.java rename to data-model/src/test/java/org/alfresco/repo/cache/SimpleCacheTestBase.java diff --git a/src/test/java/org/alfresco/repo/content/DataModelContentTestSuite.java b/data-model/src/test/java/org/alfresco/repo/content/DataModelContentTestSuite.java similarity index 100% rename from src/test/java/org/alfresco/repo/content/DataModelContentTestSuite.java rename to data-model/src/test/java/org/alfresco/repo/content/DataModelContentTestSuite.java diff --git a/src/test/java/org/alfresco/repo/content/MimetypeMapTest.java b/data-model/src/test/java/org/alfresco/repo/content/MimetypeMapTest.java similarity index 100% rename from src/test/java/org/alfresco/repo/content/MimetypeMapTest.java rename to data-model/src/test/java/org/alfresco/repo/content/MimetypeMapTest.java diff --git a/src/test/java/org/alfresco/repo/content/encoding/CharsetFinderTest.java b/data-model/src/test/java/org/alfresco/repo/content/encoding/CharsetFinderTest.java similarity index 100% rename from src/test/java/org/alfresco/repo/content/encoding/CharsetFinderTest.java rename to data-model/src/test/java/org/alfresco/repo/content/encoding/CharsetFinderTest.java diff --git a/src/test/java/org/alfresco/repo/dictionary/AbstractModelTest.java b/data-model/src/test/java/org/alfresco/repo/dictionary/AbstractModelTest.java similarity index 100% rename from src/test/java/org/alfresco/repo/dictionary/AbstractModelTest.java rename to data-model/src/test/java/org/alfresco/repo/dictionary/AbstractModelTest.java diff --git a/src/test/java/org/alfresco/repo/dictionary/DictionaryComponentTest.java b/data-model/src/test/java/org/alfresco/repo/dictionary/DictionaryComponentTest.java similarity index 100% rename from src/test/java/org/alfresco/repo/dictionary/DictionaryComponentTest.java rename to data-model/src/test/java/org/alfresco/repo/dictionary/DictionaryComponentTest.java diff --git a/src/test/java/org/alfresco/repo/dictionary/DictionaryDAOTest.java b/data-model/src/test/java/org/alfresco/repo/dictionary/DictionaryDAOTest.java similarity index 100% rename from src/test/java/org/alfresco/repo/dictionary/DictionaryDAOTest.java rename to data-model/src/test/java/org/alfresco/repo/dictionary/DictionaryDAOTest.java diff --git a/src/test/java/org/alfresco/repo/dictionary/DiffModelTest.java b/data-model/src/test/java/org/alfresco/repo/dictionary/DiffModelTest.java similarity index 100% rename from src/test/java/org/alfresco/repo/dictionary/DiffModelTest.java rename to data-model/src/test/java/org/alfresco/repo/dictionary/DiffModelTest.java diff --git a/src/test/java/org/alfresco/repo/dictionary/constraint/ConstraintsTest.java b/data-model/src/test/java/org/alfresco/repo/dictionary/constraint/ConstraintsTest.java similarity index 100% rename from src/test/java/org/alfresco/repo/dictionary/constraint/ConstraintsTest.java rename to data-model/src/test/java/org/alfresco/repo/dictionary/constraint/ConstraintsTest.java diff --git a/src/test/java/org/alfresco/repo/index/ShardMethodEnumTest.java b/data-model/src/test/java/org/alfresco/repo/index/ShardMethodEnumTest.java similarity index 100% rename from src/test/java/org/alfresco/repo/index/ShardMethodEnumTest.java rename to data-model/src/test/java/org/alfresco/repo/index/ShardMethodEnumTest.java diff --git a/src/test/java/org/alfresco/repo/search/impl/parsers/CMISTest.java b/data-model/src/test/java/org/alfresco/repo/search/impl/parsers/CMISTest.java similarity index 100% rename from src/test/java/org/alfresco/repo/search/impl/parsers/CMISTest.java rename to data-model/src/test/java/org/alfresco/repo/search/impl/parsers/CMISTest.java diff --git a/src/test/java/org/alfresco/repo/search/impl/parsers/CMIS_FTSTest.java b/data-model/src/test/java/org/alfresco/repo/search/impl/parsers/CMIS_FTSTest.java similarity index 100% rename from src/test/java/org/alfresco/repo/search/impl/parsers/CMIS_FTSTest.java rename to data-model/src/test/java/org/alfresco/repo/search/impl/parsers/CMIS_FTSTest.java diff --git a/src/test/java/org/alfresco/repo/search/impl/parsers/FTSTest.java b/data-model/src/test/java/org/alfresco/repo/search/impl/parsers/FTSTest.java similarity index 100% rename from src/test/java/org/alfresco/repo/search/impl/parsers/FTSTest.java rename to data-model/src/test/java/org/alfresco/repo/search/impl/parsers/FTSTest.java diff --git a/src/test/java/org/alfresco/repo/search/impl/parsers/gUnitExecutor.java b/data-model/src/test/java/org/alfresco/repo/search/impl/parsers/gUnitExecutor.java similarity index 100% rename from src/test/java/org/alfresco/repo/search/impl/parsers/gUnitExecutor.java rename to data-model/src/test/java/org/alfresco/repo/search/impl/parsers/gUnitExecutor.java diff --git a/src/test/java/org/alfresco/repo/security/authentication/InMemoryTicketComponentTest.java b/data-model/src/test/java/org/alfresco/repo/security/authentication/InMemoryTicketComponentTest.java similarity index 100% rename from src/test/java/org/alfresco/repo/security/authentication/InMemoryTicketComponentTest.java rename to data-model/src/test/java/org/alfresco/repo/security/authentication/InMemoryTicketComponentTest.java diff --git a/src/test/java/org/alfresco/service/cmr/repository/MLTextTest.java b/data-model/src/test/java/org/alfresco/service/cmr/repository/MLTextTest.java similarity index 100% rename from src/test/java/org/alfresco/service/cmr/repository/MLTextTest.java rename to data-model/src/test/java/org/alfresco/service/cmr/repository/MLTextTest.java diff --git a/src/test/java/org/alfresco/service/cmr/repository/NodeRefTest.java b/data-model/src/test/java/org/alfresco/service/cmr/repository/NodeRefTest.java similarity index 100% rename from src/test/java/org/alfresco/service/cmr/repository/NodeRefTest.java rename to data-model/src/test/java/org/alfresco/service/cmr/repository/NodeRefTest.java diff --git a/src/test/java/org/alfresco/service/cmr/repository/PathTest.java b/data-model/src/test/java/org/alfresco/service/cmr/repository/PathTest.java similarity index 100% rename from src/test/java/org/alfresco/service/cmr/repository/PathTest.java rename to data-model/src/test/java/org/alfresco/service/cmr/repository/PathTest.java diff --git a/src/test/java/org/alfresco/service/cmr/repository/PeriodTest.java b/data-model/src/test/java/org/alfresco/service/cmr/repository/PeriodTest.java similarity index 100% rename from src/test/java/org/alfresco/service/cmr/repository/PeriodTest.java rename to data-model/src/test/java/org/alfresco/service/cmr/repository/PeriodTest.java diff --git a/src/test/java/org/alfresco/service/cmr/repository/datatype/DefaultTypeConverterTest.java b/data-model/src/test/java/org/alfresco/service/cmr/repository/datatype/DefaultTypeConverterTest.java similarity index 100% rename from src/test/java/org/alfresco/service/cmr/repository/datatype/DefaultTypeConverterTest.java rename to data-model/src/test/java/org/alfresco/service/cmr/repository/datatype/DefaultTypeConverterTest.java diff --git a/src/test/java/org/alfresco/service/cmr/search/StatsProcessorTest.java b/data-model/src/test/java/org/alfresco/service/cmr/search/StatsProcessorTest.java similarity index 100% rename from src/test/java/org/alfresco/service/cmr/search/StatsProcessorTest.java rename to data-model/src/test/java/org/alfresco/service/cmr/search/StatsProcessorTest.java diff --git a/src/test/java/org/alfresco/service/namespace/DynamicNameSpaceResolverTest.java b/data-model/src/test/java/org/alfresco/service/namespace/DynamicNameSpaceResolverTest.java similarity index 100% rename from src/test/java/org/alfresco/service/namespace/DynamicNameSpaceResolverTest.java rename to data-model/src/test/java/org/alfresco/service/namespace/DynamicNameSpaceResolverTest.java diff --git a/src/test/java/org/alfresco/service/namespace/QNamePatternTest.java b/data-model/src/test/java/org/alfresco/service/namespace/QNamePatternTest.java similarity index 100% rename from src/test/java/org/alfresco/service/namespace/QNamePatternTest.java rename to data-model/src/test/java/org/alfresco/service/namespace/QNamePatternTest.java diff --git a/src/test/java/org/alfresco/service/namespace/QNameTest.java b/data-model/src/test/java/org/alfresco/service/namespace/QNameTest.java similarity index 100% rename from src/test/java/org/alfresco/service/namespace/QNameTest.java rename to data-model/src/test/java/org/alfresco/service/namespace/QNameTest.java diff --git a/src/test/java/org/alfresco/util/ConfigFileFinderTest.java b/data-model/src/test/java/org/alfresco/util/ConfigFileFinderTest.java similarity index 100% rename from src/test/java/org/alfresco/util/ConfigFileFinderTest.java rename to data-model/src/test/java/org/alfresco/util/ConfigFileFinderTest.java diff --git a/src/test/java/org/alfresco/util/ConfigSchedulerTest.java b/data-model/src/test/java/org/alfresco/util/ConfigSchedulerTest.java similarity index 100% rename from src/test/java/org/alfresco/util/ConfigSchedulerTest.java rename to data-model/src/test/java/org/alfresco/util/ConfigSchedulerTest.java diff --git a/src/test/java/org/alfresco/util/ISO9075Test.java b/data-model/src/test/java/org/alfresco/util/ISO9075Test.java similarity index 100% rename from src/test/java/org/alfresco/util/ISO9075Test.java rename to data-model/src/test/java/org/alfresco/util/ISO9075Test.java diff --git a/src/test/java/org/alfresco/util/NumericEncodingTest.java b/data-model/src/test/java/org/alfresco/util/NumericEncodingTest.java similarity index 100% rename from src/test/java/org/alfresco/util/NumericEncodingTest.java rename to data-model/src/test/java/org/alfresco/util/NumericEncodingTest.java diff --git a/src/test/java/org/alfresco/util/SearchDateConversionTest.java b/data-model/src/test/java/org/alfresco/util/SearchDateConversionTest.java similarity index 100% rename from src/test/java/org/alfresco/util/SearchDateConversionTest.java rename to data-model/src/test/java/org/alfresco/util/SearchDateConversionTest.java diff --git a/src/test/java/org/alfresco/util/SearchLanguageConversionTest.java b/data-model/src/test/java/org/alfresco/util/SearchLanguageConversionTest.java similarity index 100% rename from src/test/java/org/alfresco/util/SearchLanguageConversionTest.java rename to data-model/src/test/java/org/alfresco/util/SearchLanguageConversionTest.java diff --git a/src/test/resources/alfresco/test/mimetypes/testMimetype.json b/data-model/src/test/resources/alfresco/test/mimetypes/testMimetype.json similarity index 100% rename from src/test/resources/alfresco/test/mimetypes/testMimetype.json rename to data-model/src/test/resources/alfresco/test/mimetypes/testMimetype.json diff --git a/src/test/resources/org/alfresco/repo/dictionary/commonpropertynschild_model.xml b/data-model/src/test/resources/org/alfresco/repo/dictionary/commonpropertynschild_model.xml similarity index 100% rename from src/test/resources/org/alfresco/repo/dictionary/commonpropertynschild_model.xml rename to data-model/src/test/resources/org/alfresco/repo/dictionary/commonpropertynschild_model.xml diff --git a/src/test/resources/org/alfresco/repo/dictionary/commonpropertynsparent_model.xml b/data-model/src/test/resources/org/alfresco/repo/dictionary/commonpropertynsparent_model.xml similarity index 100% rename from src/test/resources/org/alfresco/repo/dictionary/commonpropertynsparent_model.xml rename to data-model/src/test/resources/org/alfresco/repo/dictionary/commonpropertynsparent_model.xml diff --git a/src/test/resources/org/alfresco/repo/dictionary/dictionarydaotest_model.properties b/data-model/src/test/resources/org/alfresco/repo/dictionary/dictionarydaotest_model.properties similarity index 100% rename from src/test/resources/org/alfresco/repo/dictionary/dictionarydaotest_model.properties rename to data-model/src/test/resources/org/alfresco/repo/dictionary/dictionarydaotest_model.properties diff --git a/src/test/resources/org/alfresco/repo/dictionary/dictionarydaotest_model.xml b/data-model/src/test/resources/org/alfresco/repo/dictionary/dictionarydaotest_model.xml similarity index 100% rename from src/test/resources/org/alfresco/repo/dictionary/dictionarydaotest_model.xml rename to data-model/src/test/resources/org/alfresco/repo/dictionary/dictionarydaotest_model.xml diff --git a/src/test/resources/org/alfresco/repo/dictionary/dictionarydaotest_model1.properties b/data-model/src/test/resources/org/alfresco/repo/dictionary/dictionarydaotest_model1.properties similarity index 100% rename from src/test/resources/org/alfresco/repo/dictionary/dictionarydaotest_model1.properties rename to data-model/src/test/resources/org/alfresco/repo/dictionary/dictionarydaotest_model1.properties diff --git a/src/test/resources/org/alfresco/repo/dictionary/dictionarydaotest_model1.xml b/data-model/src/test/resources/org/alfresco/repo/dictionary/dictionarydaotest_model1.xml similarity index 100% rename from src/test/resources/org/alfresco/repo/dictionary/dictionarydaotest_model1.xml rename to data-model/src/test/resources/org/alfresco/repo/dictionary/dictionarydaotest_model1.xml diff --git a/src/test/resources/org/alfresco/repo/dictionary/modelCircularTypes.xml b/data-model/src/test/resources/org/alfresco/repo/dictionary/modelCircularTypes.xml similarity index 100% rename from src/test/resources/org/alfresco/repo/dictionary/modelCircularTypes.xml rename to data-model/src/test/resources/org/alfresco/repo/dictionary/modelCircularTypes.xml diff --git a/src/test/resources/org/alfresco/repo/dictionary/nstest_model.xml b/data-model/src/test/resources/org/alfresco/repo/dictionary/nstest_model.xml similarity index 100% rename from src/test/resources/org/alfresco/repo/dictionary/nstest_model.xml rename to data-model/src/test/resources/org/alfresco/repo/dictionary/nstest_model.xml diff --git a/src/test/resources/org/alfresco/repo/search/impl/parsers/cmis_fts_test.gunit b/data-model/src/test/resources/org/alfresco/repo/search/impl/parsers/cmis_fts_test.gunit similarity index 100% rename from src/test/resources/org/alfresco/repo/search/impl/parsers/cmis_fts_test.gunit rename to data-model/src/test/resources/org/alfresco/repo/search/impl/parsers/cmis_fts_test.gunit diff --git a/src/test/resources/org/alfresco/repo/search/impl/parsers/cmis_test.gunit b/data-model/src/test/resources/org/alfresco/repo/search/impl/parsers/cmis_test.gunit similarity index 100% rename from src/test/resources/org/alfresco/repo/search/impl/parsers/cmis_test.gunit rename to data-model/src/test/resources/org/alfresco/repo/search/impl/parsers/cmis_test.gunit diff --git a/src/test/resources/org/alfresco/repo/search/impl/parsers/fts_test.gunit b/data-model/src/test/resources/org/alfresco/repo/search/impl/parsers/fts_test.gunit similarity index 100% rename from src/test/resources/org/alfresco/repo/search/impl/parsers/fts_test.gunit rename to data-model/src/test/resources/org/alfresco/repo/search/impl/parsers/fts_test.gunit diff --git a/src/test/resources/org/alfresco/util/configfilefinder/folder with spaces/test File.txt b/data-model/src/test/resources/org/alfresco/util/configfilefinder/folder with spaces/test File.txt similarity index 100% rename from src/test/resources/org/alfresco/util/configfilefinder/folder with spaces/test File.txt rename to data-model/src/test/resources/org/alfresco/util/configfilefinder/folder with spaces/test File.txt diff --git a/src/test/resources/org/alfresco/util/configfilefinder/folder with spaces/testFile.txt b/data-model/src/test/resources/org/alfresco/util/configfilefinder/folder with spaces/testFile.txt similarity index 100% rename from src/test/resources/org/alfresco/util/configfilefinder/folder with spaces/testFile.txt rename to data-model/src/test/resources/org/alfresco/util/configfilefinder/folder with spaces/testFile.txt diff --git a/src/test/resources/org/alfresco/util/configfilefinder/folderwithoutspaces/test File.txt b/data-model/src/test/resources/org/alfresco/util/configfilefinder/folderwithoutspaces/test File.txt similarity index 100% rename from src/test/resources/org/alfresco/util/configfilefinder/folderwithoutspaces/test File.txt rename to data-model/src/test/resources/org/alfresco/util/configfilefinder/folderwithoutspaces/test File.txt diff --git a/src/test/resources/org/alfresco/util/configfilefinder/folderwithoutspaces/testFile.txt b/data-model/src/test/resources/org/alfresco/util/configfilefinder/folderwithoutspaces/testFile.txt similarity index 100% rename from src/test/resources/org/alfresco/util/configfilefinder/folderwithoutspaces/testFile.txt rename to data-model/src/test/resources/org/alfresco/util/configfilefinder/folderwithoutspaces/testFile.txt