Merge release/V2.3 into feature-2.3/RM2526_BlendedDispositionSchedule.

rm-server/config/alfresco/module/org_alfresco_module_rm/alfresco-global.properties

@@ -77,3 +77,10 @@ rm.patch.v22.convertToStandardFilePlan=false
 # a document will be auto-versioned when its type is changed.
 #
 version.store.enableAutoVersionOnTypeChange=false
+
+#
+# Enable auto-version to be created when there is a difference between the document and latest record state
+# to ensure that the created version record matches the current document state, 
+# otherwise create the version record from the version history
+#
+rm.enableAutoVersionOnRecordCreation=false

rm-server/config/alfresco/module/org_alfresco_module_rm/messages/records-management-service.properties

@@ -18,4 +18,5 @@ rm.service.vital-def-missing=Vital record definition aspect is not present on no
 rm.service.close-record-folder-not-folder=The record folder couldn't be closed because it's not defined as a record folder.(nodeRef={0})
 rm.service.node-has-aspect=The node {0} has already the aspect {1}.
 rm.service.final-version=Final
-rm.service.final-version-description=The final archived record version
+rm.service.final-version-description=The final archived record version
+rm.service.enable-autoversion-on-record-creation=Auto Version on Record Creation

rm-server/config/alfresco/module/org_alfresco_module_rm/rm-action-context.xml

@@ -260,6 +260,7 @@
       <property name="capabilityService" ref="CapabilityService" />
       <property name="recordableVersionService" ref="RecordableVersionService" />
       <property name="eagerContentStoreCleaner" ref="eagerContentStoreCleaner"/>
+      <property name="inplaceRecordService" ref="InplaceRecordService"/>
       <property name="ghostingEnabled">
          <value>${rm.ghosting.enabled}</value>
       </property>
@@ -761,7 +762,6 @@
       <property name="filePlanService" ref="FilePlanService" />
       <property name="publicAction" value="true"/>
       <property name="allowParameterSubstitutions" value="true"/>
-      <property name="retryingTransactionHelper" ref="retryingTransactionHelper" />
    </bean>
 
    <!--  Copy To -->

rm-server/config/alfresco/module/org_alfresco_module_rm/rm-service-context.xml

@@ -145,6 +145,7 @@
                 org.alfresco.module.org_alfresco_module_rm.disposition.DispositionService.getLastCompletedDispostionAction=RM.Read.0
                 org.alfresco.module.org_alfresco_module_rm.disposition.DispositionService.isDisposableItemCutoff=RM.Read.0
                 org.alfresco.module.org_alfresco_module_rm.disposition.DispositionService.cutoffDisposableItem=RM.Read.0
+                org.alfresco.module.org_alfresco_module_rm.disposition.DispositionService.calculateAsOfDate=RM_ALLOW
                 org.alfresco.module.org_alfresco_module_rm.disposition.DispositionService.*=RM_DENY
                 ]]>
             </value>

rm-server/config/alfresco/module/org_alfresco_module_rm/rm-version-context.xml

@@ -21,6 +21,7 @@
    <!-- extended version service bean definition -->
    <bean id="rm.versionService" abstract="true" class="org.alfresco.module.org_alfresco_module_rm.version.RecordableVersionServiceImpl">
       <property name="filePlanService" ref="FilePlanService" />
+      <property name="enableAutoVersionOnRecordCreation" value="${rm.enableAutoVersionOnRecordCreation}" /> 
       <property name="authenticationUtil" ref="rm.authenticationUtil" />
       <property name="relationshipService" ref="RelationshipService" />
       <property name="recordService" ref="RecordService" />
@@ -28,6 +29,7 @@
       <property name="cmObjectType" ref="cm.object" />
       <property name="extendedPermissionService" ref="ExtendedPermissionService" />
       <property name="extendedSecurityService" ref="ExtendedSecurityService" />
+      
    </bean>
    <bean class="org.alfresco.util.BeanExtender">
       <property name="beanName" value="versionService" />
@@ -77,6 +79,7 @@
          <value>
             <![CDATA[
             org.alfresco.module.org_alfresco_module_rm.version.RecordableVersionService.isCurrentVersionRecorded=RM_ALLOW
+            org.alfresco.module.org_alfresco_module_rm.version.RecordableVersionService.isEnableAutoVersionOnRecordCreation=RM_ALLOW
             org.alfresco.module.org_alfresco_module_rm.version.RecordableVersionService.isRecordedVersion=RM_ALLOW
             org.alfresco.module.org_alfresco_module_rm.version.RecordableVersionService.getVersionRecord=RM_ALLOW
             org.alfresco.module.org_alfresco_module_rm.version.RecordableVersionService.getRecordedVersion=RM_ALLOW

rm-server/config/alfresco/module/org_alfresco_module_rm/rm-webscript-context.xml

@@ -598,6 +598,8 @@
       <property name="permissionService" ref="permissionService"/>
       <property name="extendedSecurityService" ref="extendedSecurityService"/>
       <property name="transactionService" ref="transactionService"/>
+      <property name="contentStreamer" ref="webscript.content.streamer" />
+      <property name="fileFolderService" ref="FileFolderService"/>
    </bean>
 
    <!-- REST impl for GET Holds -->