Merged BRANCHES/V2.2 to BRANCHES/V2.3:

111776: Merged BRANCHES/V2.1 to BRANCHES/V2.2:
        111636: Merged BRANCHES/V2.1.0.x to BRANCHES/V2.1:
             68559: Change base Alfresco version from 4.2.0-RC4 to 4.2.0
             68568: Merge from HEAD to BRANCHES/V2.1.0.x
             68569: Update module version to 2.1.0.1
             76475: Merge HEAD to BRANCHES/V2.1.0.x:
             76597: Merge HEAD to BRANCHES/V2.1.0.x:
                 74932: RM-1461: CLONE - RM slower then standard repo/sites when rendering document details when folder contains 15k documents
             76598: Merged HEAD to BRANCHES/V2.1.0.x:
                  75102: RM Performance testing
             76599: Update module version to 2.1.0.2
             76601: Merged HEAD to BRANCHES/V2.1.0.x:
                  75186: RM Performance Improvements
             76673: Root container cache to improve unfiled record browse performance
                 * relates to RM-1594 and RM-1595
             76850: RM performance enhancements
                 * serach improvements
                 * in-place record browse improvements
                 * saved search via file plan browse improvements
             76851: Additional unit test to check extended security with cache is working as expected.
             76852: Rollback checked in config
             77709: RM-1630: Error on manage references page
                 * regression caused by performance improvements
             84337: Update version to 2.1.0.3
             84421: Transaction level cahcing of declarative capability evaluation
             84676: Fix build
             84677: Prevent unnessary repeated creation of QName 
             84678: Improvements to extended dynamic authorities
                 * requiredFor set
                 * direct access to extended permission information, not via service
             84679: Correct requiredFor value
             88087: RM-1661 (Performance on setting permissions at a high category level)
             88092: RM-1661 (Performance on setting permissions at a high category level)
                  * Fixed failing unit tests
             88144: RM-1661 (Performance on setting permissions at a high category level)
             88182: RM-1724 (Inheritance is not off for root categories, unfiled records, holds and transfers)
             88192: RM-1661 (Performance on setting permissions at a high category level)
                  * Added unit tests
             88193: RM-1661 (Performance on setting permissions at a high category level)
                  * Fixed failing unit tests
             88358: RM-1661 (Performance on setting permissions at a high category level)
                  * Added unit tests
             88685: RM-1742 (Locally Set Permissions for moved Record duplicate parent folder Locally Set Permissions)
             88686: RM-1741 (Moved root category doesn't inherit permissions)
             88687: RM-1741 (Moved root category doesn't inherit permissions)
                  * Unit test added
             88688: RM-1742 (Locally Set Permissions for moved Record duplicate parent folder Locally Set Permissions)
                  * Unit test added
             88691: RM-1745 (RM Admin role can only be added with read permission on the manage permission page)
             88772: RM-1741 (Moved root category doesn't inherit permissions)
             88860: RM-1661 (Performance on setting permissions at a high category level)
             88864: RM-1661 (Performance on setting permissions at a high category level)
                  * Fixed failing unit tests
             88959: RM-1746 (Moved record/category always have the inheritance on)
             88960: RM-1661 (Performance on setting permissions at a high category level)
                  * Fixed failing unit tests
             88961: RM-1661 (Performance on setting permissions at a high category level)
                  * Fixed failing unit tests
             88962: RM-1661 (Performance on setting permissions at a high category level)
                  * Fixed failing unit tests
             91745: RM-1785 (RM: HF 2.1.0.3-33 causes permissions to not be displayed in Share everywhere else in the repo)
             91838: Update version to 2.1.0.4
        111641: Update Alfresco to 4.2.2.24.
   111786: Fixing unresolved merge conflicts.
   111793: Merged BRANCHES/V2.2.1.x to V2.2:
        103185: RM-2162: Records Management patch RMv22DODModelSeparationModulePatch taking too long with large amount of records



git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/BRANCHES/V2.3@111947 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Tom Page
2015-09-11 10:29:48 +00:00
parent 01f60528a0
commit 42c3b669a1
10 changed files with 210 additions and 79 deletions

View File

@@ -57,3 +57,17 @@ rm.dispositionlifecycletrigger.cronexpression=0 0/5 * * * ?
rm.record.contributors.group.enabled=false
# record contributors group, default value 'RECORD_CONTRIBUTORS'
rm.record.contributors.group.name=RECORD_CONTRIBUTORS
## Indicates whether mandatory properties are checked before completing a record
#
rm.completerecord.mandatorypropertiescheck.enabled=true
#
# Indicates whether the existing file plan is converted to a standard file plan during
# upgrade to V2.2, otherwise it will be converted to a DoD compliant file plan.
#
# Note that when converted to a standard file plan that DoD related record meta-data remains
# on the individual records and will not be visible in the UI, but can be assessed via
# deprecated model properties in the rma namespace.
#
rm.patch.v22.convertToStandardFilePlan=false

View File

@@ -735,6 +735,73 @@
<type>d:text</type>
<protected>true</protected>
</property>
<!-- DEPREACTED RECORD PROPERTIES -->
<!-- Note that these properties where deprecated in RM 2.2 and remain present to allow -->
<!-- migration to a standard compliance site without any loss of data -->
<property name="rma:publicationDate">
<type>d:date</type>
<mandatory>false</mandatory>
</property>
<property name="rma:originator">
<type>d:text</type>
<mandatory>false</mandatory>
<index enabled="true">
<atomic>true</atomic>
<stored>false</stored>
<tokenised>false</tokenised>
</index>
</property>
<property name="rma:originatingOrganization">
<type>d:text</type>
<mandatory>false</mandatory>
<index enabled="true">
<atomic>true</atomic>
<stored>false</stored>
<tokenised>false</tokenised>
</index>
</property>
<property name="rma:mediaType">
<type>d:text</type>
<mandatory>false</mandatory>
<index enabled="true">
<atomic>true</atomic>
<stored>false</stored>
<tokenised>false</tokenised>
</index>
</property>
<property name="rma:format">
<type>d:text</type>
<mandatory>false</mandatory>
<index enabled="true">
<atomic>true</atomic>
<stored>false</stored>
<tokenised>false</tokenised>
</index>
</property>
<property name="rma:dateReceived">
<type>d:date</type>
<mandatory>false</mandatory>
</property>
<property name="rma:address">
<type>d:text</type>
<mandatory>false</mandatory>
<index enabled="true">
<atomic>true</atomic>
<stored>false</stored>
<tokenised>false</tokenised>
</index>
</property>
<property name="rma:otherAddress">
<type>d:text</type>
<mandatory>false</mandatory>
<index enabled="true">
<atomic>true</atomic>
<stored>false</stored>
<tokenised>false</tokenised>
</index>
</property>
</properties>

View File

@@ -4,7 +4,6 @@
<beans>
<!-- RM v2.2 Patches -->
<bean id="org_alfresco_module_rm_RMv22ReportTemplatePatch"
parent="rm.parentModulePatch"
class="org.alfresco.module.org_alfresco_module_rm.patch.v22.RMv22ReportTemplatePatch">
@@ -32,9 +31,9 @@
<property name="description" value="DOD model separation module patch"/>
<property name="fixesToSchema" value="1002"/>
<property name="targetSchema" value="1003"/>
<property name="qnameDAO" ref="qnameDAO"/>
<property name="patchDAO" ref="patchDAO"/>
<property name="nodeDAO" ref="nodeDAO"/>
<property name="convertToStandardFilePlan" value="${rm.patch.v22.convertToStandardFilePlan}"/>
</bean>
<bean id="rm.dodCompliantSitePatch"
@@ -44,6 +43,7 @@
<property name="fixesToSchema" value="1003"/>
<property name="targetSchema" value="1004"/>
<property name="qnameDAO" ref="qnameDAO"/>
<property name="convertToStandardFilePlan" value="${rm.patch.v22.convertToStandardFilePlan}"/>
</bean>
<bean id="rm.ghostOnDestroyDispositionActionPatch"
@@ -91,7 +91,7 @@
<property name="filePlanRoleService" ref="FilePlanRoleService"/>
<property name="authorityService" ref="AuthorityService"/>
</bean>
<bean id="rm.holdCapabilityPatch"
parent="rm.parentModulePatch"
class="org.alfresco.module.org_alfresco_module_rm.patch.v22.RMv22HoldCapabilityPatch">
@@ -101,6 +101,6 @@
<property name="filePlanService" ref="FilePlanService"/>
<property name="permissionService" ref="permissionService"/>
<property name="authorityService" ref="authorityService"/>
</bean>
</bean>
</beans>

View File

@@ -94,6 +94,8 @@
<ref bean="schedulerFactory" />
</property>
<property name="cronExpression">
<!-- run at 3am -->
<!-- <value>0 30 3 * * ?</value> -->
<!-- <value>0/30 * * * * ?</value> -->
<value>${rm.dispositionlifecycletrigger.cronexpression}</value>

View File

@@ -19,6 +19,7 @@
<property name="siteService" ref="SiteService" />
<property name="policyComponent" ref="policyComponent" />
<property name="jsonConversionComponentCache" ref="jsonConversionComponentCache" />
<property name="mimetypeService" ref="MimetypeService" />
</bean>
<!-- extends core bean with RM extensions -->