RM: Capability configuration refactor

* consolidate the groups capabilities are within (rename and try to simpify)
 * 'deprecate' classification related capabilities into the dod specific package .. these capabilities didn't do anything so will be removed until such a time comes when we consider classified records.
 * remove legacy unit test .. becomming too difficult to maintain and is covered by newer tests



git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/HEAD@48750 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Roy Wetherall
2013-04-03 04:34:11 +00:00
parent 5084af61e5
commit 13d4f3f576
20 changed files with 385 additions and 3862 deletions

View File

@@ -22,12 +22,6 @@
<property name="index" value="10" /> <property name="index" value="10" />
</bean> </bean>
<bean id="classifiedRecordsGroup"
parent="groupBase">
<property name="id" value="classifiedRecords"/>
<property name="index" value="20"/>
</bean>
<bean id="cutoffGroup" <bean id="cutoffGroup"
parent="groupBase"> parent="groupBase">
<property name="id" value="cutoff"/> <property name="id" value="cutoff"/>
@@ -46,9 +40,9 @@
<property name="index" value="50"/> <property name="index" value="50"/>
</bean> </bean>
<bean id="filePlanMetadataListsAndEmailGroup" <bean id="configGroup"
parent="groupBase"> parent="groupBase">
<property name="id" value="filePlanMetadataListsAndEmail"/> <property name="id" value="config"/>
<property name="index" value="60"/> <property name="index" value="60"/>
</bean> </bean>
@@ -70,15 +64,15 @@
<property name="index" value="90"/> <property name="index" value="90"/>
</bean> </bean>
<bean id="referencesAndLinksGroup" <bean id="referencesGroup"
parent="groupBase"> parent="groupBase">
<property name="id" value="referencesAndLinks"/> <property name="id" value="references"/>
<property name="index" value="110"/> <property name="index" value="110"/>
</bean> </bean>
<bean id="rolesAndAccessRightsGroup" <bean id="securityGroup"
parent="groupBase"> parent="groupBase">
<property name="id" value="rolesAndAccessRights"/> <property name="id" value="security"/>
<property name="index" value="120"/> <property name="index" value="120"/>
</bean> </bean>

View File

@@ -0,0 +1,94 @@
<?xml version='1.0' encoding='UTF-8'?>
<!DOCTYPE beans PUBLIC '-//SPRING//DTD BEAN//EN' 'http://www.springframework.org/dtd/spring-beans.dtd'>
<beans>
<!-- Assignable Capabilities -->
<bean id="rmAttachRulesToMetadataPropertiesCapability"
parent="declarativeCapability">
<property name="name" value="AttachRulesToMetadataProperties"/>
<property name="permission" value="AttachRulesToMetadataProperties"/>
<property name="group"><ref bean="configGroup"/></property>
<property name="index" value="10" />
</bean>
<bean id="rmCreateModifyDestroyRolesCapability"
parent="declarativeCapability">
<property name="name" value="CreateModifyDestroyRoles" />
<property name="permission" value="CreateModifyDestroyRoles" />
<property name="group"><ref bean="configGroup"/></property>
<property name="index" value="20" />
</bean>
<bean id="rmCreateModifyDestroyFileplanTypesCapability"
parent="declarativeCapability">
<property name="name" value="CreateModifyDestroyFileplanTypes" />
<property name="permission" value="CreateModifyDestroyFileplanTypes" />
<property name="group"><ref bean="configGroup"/></property>
<property name="index" value="40" />
</bean>
<bean id="rmCreateModifyDestroyRecordTypesCapability"
parent="declarativeCapability">
<property name="name" value="CreateModifyDestroyRecordTypes" />
<property name="permission" value="CreateModifyDestroyRecordTypes" />
<property name="group"><ref bean="configGroup"/></property>
<property name="index" value="50" />
</bean>
<bean id="rmCreateModifyDestroyReferenceTypesCapability"
parent="declarativeCapability">
<property name="name" value="CreateModifyDestroyReferenceTypes" />
<property name="permission" value="CreateModifyDestroyReferenceTypes" />
<property name="group"><ref bean="configGroup"/></property>
<property name="index" value="60" />
</bean>
<bean id="rmMakeOptionalPropertiesMandatoryCapability"
parent="declarativeCapability">
<property name="name" value="MakeOptionalParametersMandatory" />
<property name="permission" value="MakeOptionalParametersMandatory" />
<property name="group"><ref bean="configGroup"/></property>
<property name="index" value="80" />
</bean>
<bean id="rmMapEmailMetadataCapability"
parent="declarativeCapability">
<property name="name" value="MapEmailMetadata" />
<property name="permission" value="MapEmailMetadata" />
<property name="group"><ref bean="configGroup"/></property>
<property name="index" value="90" />
</bean>
<bean id="rmCreateAndAssociateSelectionListsCapability"
parent="declarativeCapability">
<property name="name" value="CreateAndAssociateSelectionLists"/>
<property name="permission" value="CreateAndAssociateSelectionLists"/>
<property name="group"><ref bean="configGroup"/></property>
<property name="index" value="20" />
</bean>
<bean id="rmEditSelectionListsCapability"
parent="declarativeCapability">
<property name="name" value="EditSelectionLists" />
<property name="permission" value="EditSelectionLists" />
<property name="group"><ref bean="configGroup"/></property>
<property name="index" value="70" />
</bean>
<!-- Non-Assignable Capabilities -->
<bean id="rmListAdmin"
parent="compositeCapability">
<property name="name" value="ListAdmin"/>
<property name="private" value="true"/>
<property name="capabilities">
<list>
<ref bean="rmCreateAndAssociateSelectionListsCapability"/>
<ref bean="rmEditSelectionListsCapability"/>
</list>
</property>
</bean>
</beans>

View File

@@ -0,0 +1,42 @@
<?xml version='1.0' encoding='UTF-8'?>
<!DOCTYPE beans PUBLIC '-//SPRING//DTD BEAN//EN' 'http://www.springframework.org/dtd/spring-beans.dtd'>
<beans>
<!-- Assignable Capabilities -->
<bean id="rmAddModifyEventDatesCapability"
parent="declarativeCapability">
<property name="name" value="AddModifyEventDates"/>
<property name="permission" value="AddModifyEventDates"/>
<property name="kinds">
<list>
<value>RECORD_FOLDER</value>
<value>RECORD</value>
</list>
</property>
<property name="conditions">
<map>
<entry key="capabilityCondition.filling" value="true"/>
<entry key="capabilityCondition.frozen" value="false"/>
<entry key="capabilityCondition.hasEvents" value="true"/>
</map>
</property>
<property name="group"><ref bean="eventsGroup"/></property>
<property name="index" value="10" />
</bean>
<bean id="rmCreateModifyDestroyEventsCapability"
parent="declarativeCapability">
<property name="name" value="CreateModifyDestroyEvents" />
<property name="permission" value="CreateModifyDestroyEvents" />
<property name="group"><ref bean="eventsGroup"/></property>
<property name="index" value="20" />
</bean>
<!-- Non-Assignable Capabilities -->
</beans>

View File

@@ -16,7 +16,7 @@
<ref bean="rmCreateModifyDestroyUnfiledRecordContainerCapability"/> <ref bean="rmCreateModifyDestroyUnfiledRecordContainerCapability"/>
</list> </list>
</property> </property>
<property name="group"><ref bean="filePlanMetadataListsAndEmailGroup"/></property> <property name="group"><ref bean="configGroup"/></property>
<property name="index" value="30" /> <property name="index" value="30" />
</bean> </bean>

View File

@@ -1,38 +0,0 @@
<?xml version='1.0' encoding='UTF-8'?>
<!DOCTYPE beans PUBLIC '-//SPRING//DTD BEAN//EN' 'http://www.springframework.org/dtd/spring-beans.dtd'>
<beans>
<!-- Assignable Capabilities -->
<bean id="rmCreateAndAssociateSelectionListsCapability"
parent="declarativeCapability">
<property name="name" value="CreateAndAssociateSelectionLists"/>
<property name="permission" value="CreateAndAssociateSelectionLists"/>
<property name="group"><ref bean="filePlanMetadataListsAndEmailGroup"/></property>
<property name="index" value="20" />
</bean>
<bean id="rmEditSelectionListsCapability"
parent="declarativeCapability">
<property name="name" value="EditSelectionLists" />
<property name="permission" value="EditSelectionLists" />
<property name="group"><ref bean="filePlanMetadataListsAndEmailGroup"/></property>
<property name="index" value="70" />
</bean>
<!-- Non-Assignable Capabilities -->
<bean id="rmListAdmin"
parent="compositeCapability">
<property name="name" value="ListAdmin"/>
<property name="private" value="true"/>
<property name="capabilities">
<list>
<ref bean="rmCreateAndAssociateSelectionListsCapability"/>
<ref bean="rmEditSelectionListsCapability"/>
</list>
</property>
</bean>
</beans>

View File

@@ -250,19 +250,6 @@
<property name="index" value="40" /> <property name="index" value="40" />
</bean> </bean>
<bean id="rmUpgradeDowngradeAndDeclassifyRecordsCapability"
parent="declarativeCapability">
<property name="name" value="UpgradeDowngradeAndDeclassifyRecords"/>
<property name="permission" value="UpgradeDowngradeAndDeclassifyRecords"/>
<property name="conditions">
<map>
<entry key="capabilityCondition.frozen" value="false"/>
</map>
</property>
<property name="group"><ref bean="classifiedRecordsGroup"/></property>
<property name="index" value="60" />
</bean>
<bean id="rmRejectRecordsCapability" <bean id="rmRejectRecordsCapability"
parent="declarativeCapability"> parent="declarativeCapability">
<property name="name" value="RejectRecords"/> <property name="name" value="RejectRecords"/>

View File

@@ -46,19 +46,6 @@
<property name="index" value="20" /> <property name="index" value="20" />
</bean> </bean>
<bean id="rmMoveRecordFolderCapability"
parent="compositeCapability">
<property name="name" value="MoveRecordFolder"/>
<property name="private" value="true"/>
<property name="undetermined" value="true"/>
<property name="capabilities">
<list>
<ref bean="rmCreateModifyDestroyFoldersCapability"/>
</list>
</property>
<property name="targetCapability" ref="rmCreateModifyDestroyFoldersCapability"/>
</bean>
<bean id="rmReOpenFoldersCapability" <bean id="rmReOpenFoldersCapability"
parent="declarativeCapability"> parent="declarativeCapability">
<property name="name" value="ReOpenFolders"/> <property name="name" value="ReOpenFolders"/>
@@ -79,4 +66,19 @@
<property name="group"><ref bean="folderControlGroup"/></property> <property name="group"><ref bean="folderControlGroup"/></property>
<property name="index" value="40" /> <property name="index" value="40" />
</bean> </bean>
<!-- Unassignable -->
<bean id="rmMoveRecordFolderCapability"
parent="compositeCapability">
<property name="name" value="MoveRecordFolder"/>
<property name="private" value="true"/>
<property name="undetermined" value="true"/>
<property name="capabilities">
<list>
<ref bean="rmCreateModifyDestroyFoldersCapability"/>
</list>
</property>
<property name="targetCapability" ref="rmCreateModifyDestroyFoldersCapability"/>
</bean>
</beans> </beans>

View File

@@ -0,0 +1,45 @@
<?xml version='1.0' encoding='UTF-8'?>
<!DOCTYPE beans PUBLIC '-//SPRING//DTD BEAN//EN' 'http://www.springframework.org/dtd/spring-beans.dtd'>
<beans>
<!-- Assignable Capabilities -->
<bean id="rmChangeOrDeleteReferencesCapability"
parent="rmBaseCapability"
class="org.alfresco.module.org_alfresco_module_rm.capability.impl.ChangeOrDeleteReferencesCapability">
<property name="name" value="ChangeOrDeleteReferences"/>
<property name="permission" value="ChangeOrDeleteReferences"/>
<property name="conditions">
<map>
<entry key="capabilityCondition.filling" value="true"/>
<entry key="capabilityCondition.frozen" value="false"/>
</map>
</property>
<property name="group"><ref bean="referencesGroup"/></property>
<property name="index" value="10" />
</bean>
<!-- TODO .. is this in the right place?? Does link refer to a link to another file plan from a record? -->
<bean id="rmDeleteLinksCapability"
parent="rmBaseCapability"
class="org.alfresco.module.org_alfresco_module_rm.capability.impl.DeleteLinksCapability">
<property name="name" value="DeleteLinks"/>
<property name="permission" value="DeleteLinks"/>
<property name="conditions">
<map>
<entry key="capabilityCondition.filling" value="true"/>
<entry key="capabilityCondition.cutoff" value="false"/>
<entry key="capabilityCondition.frozen" value="false"/>
</map>
</property>
<property name="group"><ref bean="referencesGroup"/></property>
<property name="index" value="20" />
</bean>
<!-- Non-Assignable Capabilities -->
</beans>

View File

@@ -7,7 +7,7 @@
parent="declarativeCapability"> parent="declarativeCapability">
<property name="name" value="ManageRules" /> <property name="name" value="ManageRules" />
<property name="permission" value="ManageRules" /> <property name="permission" value="ManageRules" />
<property name="group"><ref bean="rulesGroup"/></property> <property name="group" ref="rulesGroup"/>
<property name="index" value="10" /> <property name="index" value="10" />
<property name="conditions"> <property name="conditions">
<map> <map>

View File

@@ -0,0 +1,59 @@
<?xml version='1.0' encoding='UTF-8'?>
<!DOCTYPE beans PUBLIC '-//SPRING//DTD BEAN//EN' 'http://www.springframework.org/dtd/spring-beans.dtd'>
<beans>
<!-- Assignable Capabilities -->
<bean id="rmCreateModifyDestroyUsersAndGroupsCapability"
parent="declarativeCapability">
<property name="name" value="CreateModifyDestroyUsersAndGroups" />
<property name="permission" value="CreateModifyDestroyUsersAndGroups" />
<property name="group"><ref bean="securityGroup"/></property>
<property name="index" value="20" />
</bean>
<bean id="rmDisplayRightsReportCapability"
parent="declarativeCapability">
<property name="name" value="DisplayRightsReport" />
<property name="permission" value="DisplayRightsReport" />
<property name="group"><ref bean="securityGroup"/></property>
<property name="index" value="30" />
</bean>
<bean id="rmManageAccessControlsCapability"
parent="declarativeCapability">
<property name="name" value="ManageAccessControls" />
<property name="permission" value="ManageAccessControls" />
<property name="group"><ref bean="securityGroup"/></property>
<property name="index" value="40" />
</bean>
<bean id="rmManageAccessRightsCapability"
parent="declarativeCapability">
<property name="name" value="ManageAccessRights"/>
<property name="permission" value="ManageAccessRights"/>
<property name="conditions">
<map>
<entry key="capabilityCondition.frozen" value="false"/>
<entry key="capabilityCondition.filling" value="true"/>
</map>
</property>
<property name="group"><ref bean="securityGroup"/></property>
<property name="index" value="50" />
</bean>
<bean id="rmPasswordControlCapability"
parent="declarativeCapability">
<property name="name" value="PasswordControl" />
<property name="permission" value="PasswordControl" />
<property name="group"><ref bean="securityGroup"/></property>
<property name="index" value="60" />
</bean>
<!-- Non-Assignable Capabilities -->
</beans>

View File

@@ -0,0 +1,82 @@
<?xml version='1.0' encoding='UTF-8'?>
<!DOCTYPE beans PUBLIC '-//SPRING//DTD BEAN//EN' 'http://www.springframework.org/dtd/spring-beans.dtd'>
<!-- This file contains DOD specific capabilities relating to classification. -->
<!-- When we support classification they can be re-included and adjusted accordingly, for now they are deprecated -->
<!-- by making them private. -->
<beans>
<bean id="classifiedRecordsGroup"
parent="groupBase">
<property name="id" value="classifiedRecords"/>
<property name="index" value="200"/>
</bean>
<!-- Assignable Capabilities -->
<bean id="rmCreateModifyDestroyClassificationGuidesCapability"
parent="declarativeCapability">
<property name="name" value="CreateModifyDestroyClassificationGuides"/>
<property name="permission" value="CreateModifyDestroyClassificationGuides"/>
<property name="group"><ref bean="classifiedRecordsGroup"/></property>
<property name="index" value="10" />
<property name="private" value="true" />
</bean>
<bean id="rmCreateModifyDestroyTimeframesCapability"
parent="declarativeCapability">
<property name="name" value="CreateModifyDestroyTimeframes" />
<property name="permission" value="CreateModifyDestroyTimeframes" />
<property name="group"><ref bean="classifiedRecordsGroup"/></property>
<property name="index" value="20" />
<property name="private" value="true" />
</bean>
<bean id="rmMapClassificationGuideMetadataCapability"
parent="declarativeCapability">
<property name="name" value="MapClassificationGuideMetadata" />
<property name="permission" value="MapClassificationGuideMetadata" />
<property name="group"><ref bean="classifiedRecordsGroup"/></property>
<property name="index" value="30" />
<property name="private" value="true" />
</bean>
<bean id="rmUpdateClassificationDatesCapability"
parent="declarativeCapability">
<property name="name" value="UpdateClassificationDates" />
<property name="permission" value="UpdateClassificationDates" />
<property name="group"><ref bean="classifiedRecordsGroup"/></property>
<property name="index" value="40" />
<property name="private" value="true" />
</bean>
<bean id="rmUpdateExemptionCategoriesCapability"
parent="declarativeCapability">
<property name="name" value="UpdateExemptionCategories" />
<property name="permission" value="UpdateExemptionCategories" />
<property name="group"><ref bean="classifiedRecordsGroup"/></property>
<property name="index" value="50" />
<property name="private" value="true" />
</bean>
<bean id="rmUpgradeDowngradeAndDeclassifyRecordsCapability"
parent="declarativeCapability">
<property name="name" value="UpgradeDowngradeAndDeclassifyRecords"/>
<property name="permission" value="UpgradeDowngradeAndDeclassifyRecords"/>
<property name="conditions">
<map>
<entry key="capabilityCondition.frozen" value="false"/>
</map>
</property>
<property name="group"><ref bean="classifiedRecordsGroup"/></property>
<property name="index" value="60" />
<property name="private" value="true" />
</bean>
<!-- Non-Assignable Capabilities -->
</beans>

View File

@@ -16,5 +16,17 @@
</list> </list>
</property> </property>
</bean> </bean>
<!-- Bootstap the message property files -->
<bean id="org_alfresco_module_rm_resourceBundles.dod5015" class="org.alfresco.i18n.ResourceBundleBootstrapComponent">
<property name="resourceBundles">
<list>
<value>alfresco.module.org_alfresco_module_rm.dod5015.dod5015</value>
</list>
</property>
</bean>
<!-- Include classification capabilities, deprecated for now -->
<import resource="classpath:alfresco/module/org_alfresco_module_rm/dod5015/dod5015-capabilities-classification-context.xml"/>
</beans> </beans>

View File

@@ -0,0 +1,8 @@
# Classified Records Capabilities
capability.group.classifiedRecords.title=Classified Records
capability.UpdateClassificationDates.title=Update Classification Dates
capability.CreateModifyDestroyClassificationGuides.title=Create Modify Destroy Classification Guides
capability.UpgradeDowngradeAndDeclassifyRecords.title=Upgrade Downgrade And Declassify Records
capability.UpdateExemptionCategories.title=Update Exemption Categories
capability.MapClassificationGuideMetadata.title=Map Classification Guide Metadata
capability.CreateModifyDestroyTimeframes.title=Create Modify Destroy Time frames

View File

@@ -27,7 +27,7 @@ capability.CycleVitalRecords.title=Cycle Vital Records
capability.PlanningReviewCycles.title=Planning Review Cycles capability.PlanningReviewCycles.title=Planning Review Cycles
# References and Links # References and Links
capability.group.referencesAndLinks.title=References and Links capability.group.references.title=References
capability.ChangeOrDeleteReferences.title=Change Or Delete References capability.ChangeOrDeleteReferences.title=Change Or Delete References
capability.DeleteLinks.title=Delete Links capability.DeleteLinks.title=Delete Links
@@ -67,8 +67,8 @@ capability.SelectAuditMetadata.title=Select Audit Metadata
capability.AccessAudit.title=Access Audit capability.AccessAudit.title=Access Audit
capability.ExportAudit.title=Export Audit capability.ExportAudit.title=Export Audit
# Roles and Access Rights # Security
capability.group.rolesAndAccessRights.title=Roles and Access Rights capability.group.security.title=Security
capability.CreateModifyDestroyRoles.title=Create Modify Destroy Roles capability.CreateModifyDestroyRoles.title=Create Modify Destroy Roles
capability.CreateModifyDestroyUsersAndGroups.title=Create Modify Destroy Users And Groups capability.CreateModifyDestroyUsersAndGroups.title=Create Modify Destroy Users And Groups
capability.PasswordControl.title=Password Control capability.PasswordControl.title=Password Control
@@ -76,8 +76,8 @@ capability.DisplayRightsReport.title=Display Rights Report
capability.ManageAccessControls.title=Manage Access Controls capability.ManageAccessControls.title=Manage Access Controls
capability.ManageAccessRights.title=Manage Access Rights capability.ManageAccessRights.title=Manage Access Rights
# File Plan Metadata, Lists and Email # Configuration
capability.group.filePlanMetadataListsAndEmail.title=File Plan Metadata, Lists and Email capability.group.config.title=Configuration
capability.CreateModifyDestroyFileplanMetadata.title=Create Modify Destroy File Plan Metadata capability.CreateModifyDestroyFileplanMetadata.title=Create Modify Destroy File Plan Metadata
capability.CreateModifyDestroyFileplanTypes.title=Create Modify Destroy File Plan Types capability.CreateModifyDestroyFileplanTypes.title=Create Modify Destroy File Plan Types
capability.CreateModifyDestroyRecordTypes.title=Create Modify Destroy Record Types capability.CreateModifyDestroyRecordTypes.title=Create Modify Destroy Record Types
@@ -88,15 +88,6 @@ capability.AttachRulesToMetadataProperties.title=Attach Rules To Metadata Proper
capability.MakeOptionalParametersMandatory.title=Make Optional Parameters Mandatory capability.MakeOptionalParametersMandatory.title=Make Optional Parameters Mandatory
capability.MapEmailMetadata.title=Map Email Metadata capability.MapEmailMetadata.title=Map Email Metadata
# Classified Records
capability.group.classifiedRecords.title=Classified Records
capability.UpdateClassificationDates.title=Update Classification Dates
capability.CreateModifyDestroyClassificationGuides.title=Create Modify Destroy Classification Guides
capability.UpgradeDowngradeAndDeclassifyRecords.title=Upgrade Downgrade And Declassify Records
capability.UpdateExemptionCategories.title=Update Exemption Categories
capability.MapClassificationGuideMetadata.title=Map Classification Guide Metadata
capability.CreateModifyDestroyTimeframes.title=Create Modify Destroy Time frames
# Rules # Rules
capability.group.rules.title=Rules capability.group.rules.title=Rules
capability.ManageRules.title=Manage Rules capability.ManageRules.title=Manage Rules

View File

@@ -28,114 +28,6 @@
parent="rmBaseCapability" parent="rmBaseCapability"
class="org.alfresco.module.org_alfresco_module_rm.capability.declarative.CompositeCapability" /> class="org.alfresco.module.org_alfresco_module_rm.capability.declarative.CompositeCapability" />
<bean id="rmAddModifyEventDatesCapability"
parent="declarativeCapability">
<property name="name" value="AddModifyEventDates"/>
<property name="permission" value="AddModifyEventDates"/>
<property name="kinds">
<list>
<value>RECORD_FOLDER</value>
<value>RECORD</value>
</list>
</property>
<property name="conditions">
<map>
<entry key="capabilityCondition.filling" value="true"/>
<entry key="capabilityCondition.frozen" value="false"/>
<entry key="capabilityCondition.hasEvents" value="true"/>
</map>
</property>
<property name="group"><ref bean="eventsGroup"/></property>
<property name="index" value="10" />
</bean>
<bean id="rmAttachRulesToMetadataPropertiesCapability"
parent="declarativeCapability">
<property name="name" value="AttachRulesToMetadataProperties"/>
<property name="permission" value="AttachRulesToMetadataProperties"/>
<property name="group"><ref bean="filePlanMetadataListsAndEmailGroup"/></property>
<property name="index" value="10" />
</bean>
<bean id="rmChangeOrDeleteReferencesCapability"
parent="rmBaseCapability"
class="org.alfresco.module.org_alfresco_module_rm.capability.impl.ChangeOrDeleteReferencesCapability">
<property name="name" value="ChangeOrDeleteReferences"/>
<property name="permission" value="ChangeOrDeleteReferences"/>
<property name="conditions">
<map>
<entry key="capabilityCondition.filling" value="true"/>
<entry key="capabilityCondition.frozen" value="false"/>
</map>
</property>
<property name="group"><ref bean="referencesAndLinksGroup"/></property>
<property name="index" value="10" />
</bean>
<bean id="rmCreateModifyDestroyClassificationGuidesCapability"
parent="declarativeCapability">
<property name="name" value="CreateModifyDestroyClassificationGuides"/>
<property name="permission" value="CreateModifyDestroyClassificationGuides"/>
<property name="group"><ref bean="classifiedRecordsGroup"/></property>
<property name="index" value="10" />
</bean>
<bean id="rmCreateModifyDestroyEventsCapability"
parent="declarativeCapability">
<property name="name" value="CreateModifyDestroyEvents" />
<property name="permission" value="CreateModifyDestroyEvents" />
<property name="group"><ref bean="eventsGroup"/></property>
<property name="index" value="20" />
</bean>
<bean id="rmCreateModifyDestroyFileplanTypesCapability"
parent="declarativeCapability">
<property name="name" value="CreateModifyDestroyFileplanTypes" />
<property name="permission" value="CreateModifyDestroyFileplanTypes" />
<property name="group"><ref bean="filePlanMetadataListsAndEmailGroup"/></property>
<property name="index" value="40" />
</bean>
<bean id="rmCreateModifyDestroyRecordTypesCapability"
parent="declarativeCapability">
<property name="name" value="CreateModifyDestroyRecordTypes" />
<property name="permission" value="CreateModifyDestroyRecordTypes" />
<property name="group"><ref bean="filePlanMetadataListsAndEmailGroup"/></property>
<property name="index" value="50" />
</bean>
<bean id="rmCreateModifyDestroyReferenceTypesCapability"
parent="declarativeCapability">
<property name="name" value="CreateModifyDestroyReferenceTypes" />
<property name="permission" value="CreateModifyDestroyReferenceTypes" />
<property name="group"><ref bean="filePlanMetadataListsAndEmailGroup"/></property>
<property name="index" value="60" />
</bean>
<bean id="rmCreateModifyDestroyRolesCapability"
parent="declarativeCapability">
<property name="name" value="CreateModifyDestroyRoles" />
<property name="permission" value="CreateModifyDestroyRoles" />
<property name="group"><ref bean="rolesAndAccessRightsGroup"/></property>
<property name="index" value="10" />
</bean>
<bean id="rmCreateModifyDestroyTimeframesCapability"
parent="declarativeCapability">
<property name="name" value="CreateModifyDestroyTimeframes" />
<property name="permission" value="CreateModifyDestroyTimeframes" />
<property name="group"><ref bean="classifiedRecordsGroup"/></property>
<property name="index" value="20" />
</bean>
<bean id="rmCreateModifyDestroyUsersAndGroupsCapability"
parent="declarativeCapability">
<property name="name" value="CreateModifyDestroyUsersAndGroups" />
<property name="permission" value="CreateModifyDestroyUsersAndGroups" />
<property name="group"><ref bean="rolesAndAccessRightsGroup"/></property>
<property name="index" value="20" />
</bean>
<bean id="rmCycleVitalRecordsCapability" <bean id="rmCycleVitalRecordsCapability"
parent="declarativeCapability"> parent="declarativeCapability">
<property name="name" value="CycleVitalRecords"/> <property name="name" value="CycleVitalRecords"/>
@@ -160,84 +52,6 @@
<property name="index" value="10" /> <property name="index" value="10" />
</bean> </bean>
<bean id="rmDeleteLinksCapability"
parent="rmBaseCapability"
class="org.alfresco.module.org_alfresco_module_rm.capability.impl.DeleteLinksCapability">
<property name="name" value="DeleteLinks"/>
<property name="permission" value="DeleteLinks"/>
<property name="conditions">
<map>
<entry key="capabilityCondition.filling" value="true"/>
<entry key="capabilityCondition.cutoff" value="false"/>
<entry key="capabilityCondition.frozen" value="false"/>
</map>
</property>
<property name="group"><ref bean="referencesAndLinksGroup"/></property>
<property name="index" value="20" />
</bean>
<bean id="rmDisplayRightsReportCapability"
parent="declarativeCapability">
<property name="name" value="DisplayRightsReport" />
<property name="permission" value="DisplayRightsReport" />
<property name="group"><ref bean="rolesAndAccessRightsGroup"/></property>
<property name="index" value="30" />
</bean>
<bean id="rmMakeOptionalPropertiesMandatoryCapability"
parent="declarativeCapability">
<property name="name" value="MakeOptionalParametersMandatory" />
<property name="permission" value="MakeOptionalParametersMandatory" />
<property name="group"><ref bean="filePlanMetadataListsAndEmailGroup"/></property>
<property name="index" value="80" />
</bean>
<bean id="rmManageAccessControlsCapability"
parent="declarativeCapability">
<property name="name" value="ManageAccessControls" />
<property name="permission" value="ManageAccessControls" />
<property name="group"><ref bean="rolesAndAccessRightsGroup"/></property>
<property name="index" value="40" />
</bean>
<bean id="rmManageAccessRightsCapability"
parent="declarativeCapability">
<property name="name" value="ManageAccessRights"/>
<property name="permission" value="ManageAccessRights"/>
<property name="conditions">
<map>
<entry key="capabilityCondition.frozen" value="false"/>
<entry key="capabilityCondition.filling" value="true"/>
</map>
</property>
<property name="group"><ref bean="rolesAndAccessRightsGroup"/></property>
<property name="index" value="50" />
</bean>
<bean id="rmMapClassificationGuideMetadataCapability"
parent="declarativeCapability">
<property name="name" value="MapClassificationGuideMetadata" />
<property name="permission" value="MapClassificationGuideMetadata" />
<property name="group"><ref bean="classifiedRecordsGroup"/></property>
<property name="index" value="30" />
</bean>
<bean id="rmMapEmailMetadataCapability"
parent="declarativeCapability">
<property name="name" value="MapEmailMetadata" />
<property name="permission" value="MapEmailMetadata" />
<property name="group"><ref bean="filePlanMetadataListsAndEmailGroup"/></property>
<property name="index" value="90" />
</bean>
<bean id="rmPasswordControlCapability"
parent="declarativeCapability">
<property name="name" value="PasswordControl" />
<property name="permission" value="PasswordControl" />
<property name="group"><ref bean="rolesAndAccessRightsGroup"/></property>
<property name="index" value="60" />
</bean>
<bean id="rmPlanningReviewCyclesCapability" <bean id="rmPlanningReviewCyclesCapability"
parent="declarativeCapability" > parent="declarativeCapability" >
<property name="name" value="PlanningReviewCycles"/> <property name="name" value="PlanningReviewCycles"/>
@@ -274,22 +88,7 @@
<property name="group"><ref bean="dispositionAndTransfersGroup"/></property> <property name="group"><ref bean="dispositionAndTransfersGroup"/></property>
<property name="index" value="70" /> <property name="index" value="70" />
</bean> </bean>
<bean id="rmUpdateClassificationDatesCapability"
parent="declarativeCapability">
<property name="name" value="UpdateClassificationDates" />
<property name="permission" value="UpdateClassificationDates" />
<property name="group"><ref bean="classifiedRecordsGroup"/></property>
<property name="index" value="40" />
</bean>
<bean id="rmUpdateExemptionCategoriesCapability"
parent="declarativeCapability">
<property name="name" value="UpdateExemptionCategories" />
<property name="permission" value="UpdateExemptionCategories" />
<property name="group"><ref bean="classifiedRecordsGroup"/></property>
<property name="index" value="50" />
</bean>
<bean id="rmUpdateTriggerDatesCapability" <bean id="rmUpdateTriggerDatesCapability"
parent="declarativeCapability"> parent="declarativeCapability">
@@ -335,13 +134,22 @@
<!-- Audit capabilities --> <!-- Audit capabilities -->
<import resource="classpath:alfresco/module/org_alfresco_module_rm/capability/rm-capabilities-audit-context.xml"/> <import resource="classpath:alfresco/module/org_alfresco_module_rm/capability/rm-capabilities-audit-context.xml"/>
<!-- List capabilities -->
<import resource="classpath:alfresco/module/org_alfresco_module_rm/capability/rm-capabilities-list-context.xml"/>
<!-- Group capabilities --> <!-- Group capabilities -->
<import resource="classpath:alfresco/module/org_alfresco_module_rm/capability/rm-capabilities-group-context.xml"/> <import resource="classpath:alfresco/module/org_alfresco_module_rm/capability/rm-capabilities-group-context.xml"/>
<!-- Rule capabilities --> <!-- Rule capabilities -->
<import resource="classpath:alfresco/module/org_alfresco_module_rm/capability/rm-capabilities-rule-context.xml"/> <import resource="classpath:alfresco/module/org_alfresco_module_rm/capability/rm-capabilities-rule-context.xml"/>
<!-- Config capabilities -->
<import resource="classpath:alfresco/module/org_alfresco_module_rm/capability/rm-capabilities-config-context.xml"/>
<!-- Event capabilities -->
<import resource="classpath:alfresco/module/org_alfresco_module_rm/capability/rm-capabilities-event-context.xml"/>
<!-- Reference capabilities -->
<import resource="classpath:alfresco/module/org_alfresco_module_rm/capability/rm-capabilities-reference-context.xml"/>
<!-- Security capabilities -->
<import resource="classpath:alfresco/module/org_alfresco_module_rm/capability/rm-capabilities-security-context.xml"/>
</beans> </beans>

View File

@@ -48,10 +48,6 @@
"ReOpenFolders", "ReOpenFolders",
"CycleVitalRecords", "CycleVitalRecords",
"PlanningReviewCycles", "PlanningReviewCycles",
"UpdateClassificationDates",
"CreateModifyDestroyClassificationGuides",
"UpgradeDowngradeAndDeclassifyRecords",
"UpdateExemptionCategories",
"RequestRecordInformation" "RequestRecordInformation"
] ]
}, },
@@ -92,7 +88,6 @@
"UndeclareRecords", "UndeclareRecords",
"DeclareAuditAsRecord", "DeclareAuditAsRecord",
"DeleteAudit", "DeleteAudit",
"CreateModifyDestroyTimeframes",
"AuthorizeNominatedTransfers", "AuthorizeNominatedTransfers",
"EditSelectionLists", "EditSelectionLists",
"AuthorizeAllTransfers", "AuthorizeAllTransfers",
@@ -114,11 +109,6 @@
"AccessAudit", "AccessAudit",
"ExportAudit", "ExportAudit",
"CreateModifyDestroyReferenceTypes", "CreateModifyDestroyReferenceTypes",
"UpdateClassificationDates",
"CreateModifyDestroyClassificationGuides",
"UpgradeDowngradeAndDeclassifyRecords",
"UpdateExemptionCategories",
"MapClassificationGuideMetadata",
"RequestRecordInformation" "RequestRecordInformation"
] ]
}, },
@@ -159,7 +149,6 @@
"UndeclareRecords", "UndeclareRecords",
"DeclareAuditAsRecord", "DeclareAuditAsRecord",
"DeleteAudit", "DeleteAudit",
"CreateModifyDestroyTimeframes",
"AuthorizeNominatedTransfers", "AuthorizeNominatedTransfers",
"EditSelectionLists", "EditSelectionLists",
"AuthorizeAllTransfers", "AuthorizeAllTransfers",
@@ -181,11 +170,6 @@
"AccessAudit", "AccessAudit",
"ExportAudit", "ExportAudit",
"CreateModifyDestroyReferenceTypes", "CreateModifyDestroyReferenceTypes",
"UpdateClassificationDates",
"CreateModifyDestroyClassificationGuides",
"UpgradeDowngradeAndDeclassifyRecords",
"UpdateExemptionCategories",
"MapClassificationGuideMetadata",
"ManageAccessControls", "ManageAccessControls",
"ManageRules", "ManageRules",
"RequestRecordInformation" "RequestRecordInformation"

View File

@@ -102,9 +102,6 @@ public class RecordsManagementTypeFormFilter extends RecordsManagementFormFilter
addCustomRMProperties(aspect, form); addCustomRMProperties(aspect, form);
} }
} }
// Group fields
// groupFields(form);
} }
/** /**
@@ -144,41 +141,4 @@ public class RecordsManagementTypeFormFilter extends RecordsManagementFormFilter
{ {
} }
/**
* Puts all fields in a group to workaround ALF-6089.
*
* @param form The form being generated
*/
// protected void groupFields(Form form)
// {
// // to control the order of the fields add the name, title and description fields to
// // a field group containing just that field, all other fields that are not already
// // in a group go into an "other" field group. The client config can then declare a
// // client side set with the same id and order them correctly.
//
// List<FieldDefinition> fieldDefs = form.getFieldDefinitions();
// for (FieldDefinition fieldDef : fieldDefs)
// {
// FieldGroup group = fieldDef.getGroup();
// if (group == null)
// {
// if (fieldDef.getName().equals(ContentModel.PROP_NAME.toPrefixString(this.namespaceService)))
// {
// fieldDef.setGroup(NAME_FIELD_GROUP);
// }
// else if (fieldDef.getName().equals(ContentModel.PROP_TITLE.toPrefixString(this.namespaceService)))
// {
// fieldDef.setGroup(TITLE_FIELD_GROUP);
// }
// else if (fieldDef.getName().equals(ContentModel.PROP_DESCRIPTION.toPrefixString(this.namespaceService)))
// {
// fieldDef.setGroup(DESC_FIELD_GROUP);
// }
// else
// {
// fieldDef.setGroup(OTHER_FIELD_GROUP);
// }
// }
// }
// }
} }

View File

@@ -167,6 +167,5 @@ public class RMv21CapabilityPatch extends AbstractModuleComponent
} }
} }
} }
} }
} }

View File

@@ -21,9 +21,8 @@ package org.alfresco.module.org_alfresco_module_rm.test;
import junit.framework.Test; import junit.framework.Test;
import junit.framework.TestSuite; import junit.framework.TestSuite;
import org.alfresco.module.org_alfresco_module_rm.test.capabilities.CapabilitiesTest;
import org.alfresco.module.org_alfresco_module_rm.test.capabilities.DeclarativeCapabilityTest;
import org.alfresco.module.org_alfresco_module_rm.test.capabilities.CompositeCapabilityTest; import org.alfresco.module.org_alfresco_module_rm.test.capabilities.CompositeCapabilityTest;
import org.alfresco.module.org_alfresco_module_rm.test.capabilities.DeclarativeCapabilityTest;
/** /**
@@ -41,7 +40,6 @@ public class CapabilitiesTestSuite extends TestSuite
public static Test suite() public static Test suite()
{ {
TestSuite suite = new TestSuite(); TestSuite suite = new TestSuite();
suite.addTestSuite(CapabilitiesTest.class);
suite.addTestSuite(DeclarativeCapabilityTest.class); suite.addTestSuite(DeclarativeCapabilityTest.class);
suite.addTestSuite(CompositeCapabilityTest.class); suite.addTestSuite(CompositeCapabilityTest.class);
return suite; return suite;