From 61f9103752b3eb4dfd3c0ff9622cfadc4adf73e9 Mon Sep 17 00:00:00 2001
From: Tuna Aksoy <tuna.aksoy@alfresco.com>
Date: Tue, 20 May 2014 13:08:44 +0000
Subject: [PATCH] Fixed RM 2.1 to get it working with Alfresco 4.2.2

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/BRANCHES/V2.1@71381 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
---
 gradle.properties                                               | 2 +-
 .../alfresco/module/org_alfresco_module_rm/rm-model-context.xml | 2 +-
 .../module/org_alfresco_module_rm/rm-ui-evaluators-context.xml  | 1 +
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/gradle.properties b/gradle.properties
index 429e591382..2ce9c67304 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -15,7 +15,7 @@ alfrescoEnterpriseMavenPwd=
 
 # set to org.alfresco.enterprise when enterprise version required
 alfrescoGroupId=org.alfresco
-alfrescoBaseVersion=4.2.0
+alfrescoBaseVersion=4.2.2-SNAPSHOT
 
 # indicates whether this is a local build or not
 localBuild=true
diff --git a/rm-server/config/alfresco/module/org_alfresco_module_rm/rm-model-context.xml b/rm-server/config/alfresco/module/org_alfresco_module_rm/rm-model-context.xml
index db13fd4aec..c2f7b6c779 100644
--- a/rm-server/config/alfresco/module/org_alfresco_module_rm/rm-model-context.xml
+++ b/rm-server/config/alfresco/module/org_alfresco_module_rm/rm-model-context.xml
@@ -4,7 +4,7 @@
 <beans>
 
    <!-- Bootstrap Records Management Models -->
-   <bean id="org_alfresco_module_rm_dictionaryBootstrap" parent="dictionaryModelBootstrap" depends-on="siteService_dictionaryBootstrap">
+   <bean id="org_alfresco_module_rm_dictionaryBootstrap" parent="dictionaryModelBootstrap">
       <property name="models">
          <list>
             <value>alfresco/module/org_alfresco_module_rm/model/recordsModel.xml</value>
diff --git a/rm-server/config/alfresco/module/org_alfresco_module_rm/rm-ui-evaluators-context.xml b/rm-server/config/alfresco/module/org_alfresco_module_rm/rm-ui-evaluators-context.xml
index e7cf19c2dd..a62f5a1b93 100644
--- a/rm-server/config/alfresco/module/org_alfresco_module_rm/rm-ui-evaluators-context.xml
+++ b/rm-server/config/alfresco/module/org_alfresco_module_rm/rm-ui-evaluators-context.xml
@@ -10,6 +10,7 @@
          <property name="recordService" ref="RecordService"/>
          <property name="filePlanService" ref="FilePlanService"/>
         <property name="capabilityService" ref="CapabilityService"/>
+         <property name="mimetypeService" ref="MimetypeService" />
    </bean>
 
    <bean id="jsonConversionComponent.baseEvaluator"