diff --git a/rm-server/config/alfresco/module/org_alfresco_module_rm/capability/groups/rm-capability-groups-context.xml b/rm-server/config/alfresco/module/org_alfresco_module_rm/capability/groups/rm-capability-groups-context.xml
index 65153f5118..5e28301e6b 100644
--- a/rm-server/config/alfresco/module/org_alfresco_module_rm/capability/groups/rm-capability-groups-context.xml
+++ b/rm-server/config/alfresco/module/org_alfresco_module_rm/capability/groups/rm-capability-groups-context.xml
@@ -22,12 +22,6 @@
-
-
-
-
-
@@ -46,9 +40,9 @@
-
-
+
@@ -70,15 +64,15 @@
-
-
+
-
-
+
diff --git a/rm-server/config/alfresco/module/org_alfresco_module_rm/capability/rm-capabilities-config-context.xml b/rm-server/config/alfresco/module/org_alfresco_module_rm/capability/rm-capabilities-config-context.xml
new file mode 100644
index 0000000000..7bd40ea259
--- /dev/null
+++ b/rm-server/config/alfresco/module/org_alfresco_module_rm/capability/rm-capabilities-config-context.xml
@@ -0,0 +1,94 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/rm-server/config/alfresco/module/org_alfresco_module_rm/capability/rm-capabilities-event-context.xml b/rm-server/config/alfresco/module/org_alfresco_module_rm/capability/rm-capabilities-event-context.xml
new file mode 100644
index 0000000000..3ed05e48aa
--- /dev/null
+++ b/rm-server/config/alfresco/module/org_alfresco_module_rm/capability/rm-capabilities-event-context.xml
@@ -0,0 +1,42 @@
+
+
+
+
+
+
+
+
+
+
+
+
+ RECORD_FOLDER
+ RECORD
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/rm-server/config/alfresco/module/org_alfresco_module_rm/capability/rm-capabilities-fileplan-context.xml b/rm-server/config/alfresco/module/org_alfresco_module_rm/capability/rm-capabilities-fileplan-context.xml
index 6c62f754ab..a94603f85b 100644
--- a/rm-server/config/alfresco/module/org_alfresco_module_rm/capability/rm-capabilities-fileplan-context.xml
+++ b/rm-server/config/alfresco/module/org_alfresco_module_rm/capability/rm-capabilities-fileplan-context.xml
@@ -16,7 +16,7 @@
-
+
diff --git a/rm-server/config/alfresco/module/org_alfresco_module_rm/capability/rm-capabilities-list-context.xml b/rm-server/config/alfresco/module/org_alfresco_module_rm/capability/rm-capabilities-list-context.xml
deleted file mode 100644
index 9c1d7c2d2c..0000000000
--- a/rm-server/config/alfresco/module/org_alfresco_module_rm/capability/rm-capabilities-list-context.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/rm-server/config/alfresco/module/org_alfresco_module_rm/capability/rm-capabilities-record-context.xml b/rm-server/config/alfresco/module/org_alfresco_module_rm/capability/rm-capabilities-record-context.xml
index 2ff7fa2548..2b1e0a57df 100644
--- a/rm-server/config/alfresco/module/org_alfresco_module_rm/capability/rm-capabilities-record-context.xml
+++ b/rm-server/config/alfresco/module/org_alfresco_module_rm/capability/rm-capabilities-record-context.xml
@@ -250,19 +250,6 @@
-
-
-
-
-
-
-
-
-
-
diff --git a/rm-server/config/alfresco/module/org_alfresco_module_rm/capability/rm-capabilities-recordfolder-context.xml b/rm-server/config/alfresco/module/org_alfresco_module_rm/capability/rm-capabilities-recordfolder-context.xml
index af88249e43..afc80e15bb 100644
--- a/rm-server/config/alfresco/module/org_alfresco_module_rm/capability/rm-capabilities-recordfolder-context.xml
+++ b/rm-server/config/alfresco/module/org_alfresco_module_rm/capability/rm-capabilities-recordfolder-context.xml
@@ -46,19 +46,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
@@ -79,4 +66,19 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/rm-server/config/alfresco/module/org_alfresco_module_rm/capability/rm-capabilities-reference-context.xml b/rm-server/config/alfresco/module/org_alfresco_module_rm/capability/rm-capabilities-reference-context.xml
new file mode 100644
index 0000000000..39ec906d7a
--- /dev/null
+++ b/rm-server/config/alfresco/module/org_alfresco_module_rm/capability/rm-capabilities-reference-context.xml
@@ -0,0 +1,45 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/rm-server/config/alfresco/module/org_alfresco_module_rm/capability/rm-capabilities-rule-context.xml b/rm-server/config/alfresco/module/org_alfresco_module_rm/capability/rm-capabilities-rule-context.xml
index bee709a5d7..518f6a42f0 100644
--- a/rm-server/config/alfresco/module/org_alfresco_module_rm/capability/rm-capabilities-rule-context.xml
+++ b/rm-server/config/alfresco/module/org_alfresco_module_rm/capability/rm-capabilities-rule-context.xml
@@ -7,7 +7,7 @@
parent="declarativeCapability">
-
+
+
+
+
+
+
+ alfresco.module.org_alfresco_module_rm.dod5015.dod5015
+
+
+
+
+
+
\ No newline at end of file
diff --git a/rm-server/config/alfresco/module/org_alfresco_module_rm/dod5015/dod5015.properties b/rm-server/config/alfresco/module/org_alfresco_module_rm/dod5015/dod5015.properties
new file mode 100644
index 0000000000..7cb876b369
--- /dev/null
+++ b/rm-server/config/alfresco/module/org_alfresco_module_rm/dod5015/dod5015.properties
@@ -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
\ No newline at end of file
diff --git a/rm-server/config/alfresco/module/org_alfresco_module_rm/messages/capability-service.properties b/rm-server/config/alfresco/module/org_alfresco_module_rm/messages/capability-service.properties
index 84da4903e2..91890828e2 100644
--- a/rm-server/config/alfresco/module/org_alfresco_module_rm/messages/capability-service.properties
+++ b/rm-server/config/alfresco/module/org_alfresco_module_rm/messages/capability-service.properties
@@ -27,7 +27,7 @@ capability.CycleVitalRecords.title=Cycle Vital Records
capability.PlanningReviewCycles.title=Planning Review Cycles
# References and Links
-capability.group.referencesAndLinks.title=References and Links
+capability.group.references.title=References
capability.ChangeOrDeleteReferences.title=Change Or Delete References
capability.DeleteLinks.title=Delete Links
@@ -67,8 +67,8 @@ capability.SelectAuditMetadata.title=Select Audit Metadata
capability.AccessAudit.title=Access Audit
capability.ExportAudit.title=Export Audit
-# Roles and Access Rights
-capability.group.rolesAndAccessRights.title=Roles and Access Rights
+# Security
+capability.group.security.title=Security
capability.CreateModifyDestroyRoles.title=Create Modify Destroy Roles
capability.CreateModifyDestroyUsersAndGroups.title=Create Modify Destroy Users And Groups
capability.PasswordControl.title=Password Control
@@ -76,8 +76,8 @@ capability.DisplayRightsReport.title=Display Rights Report
capability.ManageAccessControls.title=Manage Access Controls
capability.ManageAccessRights.title=Manage Access Rights
-# File Plan Metadata, Lists and Email
-capability.group.filePlanMetadataListsAndEmail.title=File Plan Metadata, Lists and Email
+# Configuration
+capability.group.config.title=Configuration
capability.CreateModifyDestroyFileplanMetadata.title=Create Modify Destroy File Plan Metadata
capability.CreateModifyDestroyFileplanTypes.title=Create Modify Destroy File Plan 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.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
capability.group.rules.title=Rules
capability.ManageRules.title=Manage Rules
\ No newline at end of file
diff --git a/rm-server/config/alfresco/module/org_alfresco_module_rm/rm-capabilities-context.xml b/rm-server/config/alfresco/module/org_alfresco_module_rm/rm-capabilities-context.xml
index 9050fac6d5..8392047960 100644
--- a/rm-server/config/alfresco/module/org_alfresco_module_rm/rm-capabilities-context.xml
+++ b/rm-server/config/alfresco/module/org_alfresco_module_rm/rm-capabilities-context.xml
@@ -28,114 +28,6 @@
parent="rmBaseCapability"
class="org.alfresco.module.org_alfresco_module_rm.capability.declarative.CompositeCapability" />
-
-
-
-
-
- RECORD_FOLDER
- RECORD
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -160,84 +52,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -274,22 +88,7 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
@@ -335,13 +134,22 @@
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/rm-server/config/alfresco/module/org_alfresco_module_rm/security/rm-default-roles-bootstrap.json b/rm-server/config/alfresco/module/org_alfresco_module_rm/security/rm-default-roles-bootstrap.json
index fad2e3720b..512936feb2 100644
--- a/rm-server/config/alfresco/module/org_alfresco_module_rm/security/rm-default-roles-bootstrap.json
+++ b/rm-server/config/alfresco/module/org_alfresco_module_rm/security/rm-default-roles-bootstrap.json
@@ -48,10 +48,6 @@
"ReOpenFolders",
"CycleVitalRecords",
"PlanningReviewCycles",
- "UpdateClassificationDates",
- "CreateModifyDestroyClassificationGuides",
- "UpgradeDowngradeAndDeclassifyRecords",
- "UpdateExemptionCategories",
"RequestRecordInformation"
]
},
@@ -92,7 +88,6 @@
"UndeclareRecords",
"DeclareAuditAsRecord",
"DeleteAudit",
- "CreateModifyDestroyTimeframes",
"AuthorizeNominatedTransfers",
"EditSelectionLists",
"AuthorizeAllTransfers",
@@ -114,11 +109,6 @@
"AccessAudit",
"ExportAudit",
"CreateModifyDestroyReferenceTypes",
- "UpdateClassificationDates",
- "CreateModifyDestroyClassificationGuides",
- "UpgradeDowngradeAndDeclassifyRecords",
- "UpdateExemptionCategories",
- "MapClassificationGuideMetadata",
"RequestRecordInformation"
]
},
@@ -159,7 +149,6 @@
"UndeclareRecords",
"DeclareAuditAsRecord",
"DeleteAudit",
- "CreateModifyDestroyTimeframes",
"AuthorizeNominatedTransfers",
"EditSelectionLists",
"AuthorizeAllTransfers",
@@ -181,11 +170,6 @@
"AccessAudit",
"ExportAudit",
"CreateModifyDestroyReferenceTypes",
- "UpdateClassificationDates",
- "CreateModifyDestroyClassificationGuides",
- "UpgradeDowngradeAndDeclassifyRecords",
- "UpdateExemptionCategories",
- "MapClassificationGuideMetadata",
"ManageAccessControls",
"ManageRules",
"RequestRecordInformation"
diff --git a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/forms/RecordsManagementTypeFormFilter.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/forms/RecordsManagementTypeFormFilter.java
index 28aa892093..e2a56cbb83 100644
--- a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/forms/RecordsManagementTypeFormFilter.java
+++ b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/forms/RecordsManagementTypeFormFilter.java
@@ -102,9 +102,6 @@ public class RecordsManagementTypeFormFilter extends RecordsManagementFormFilter
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 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);
-// }
-// }
-// }
-// }
}
diff --git a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/patch/RMv21CapabilityPatch.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/patch/RMv21CapabilityPatch.java
index 517286a888..2cb9322df4 100644
--- a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/patch/RMv21CapabilityPatch.java
+++ b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/patch/RMv21CapabilityPatch.java
@@ -167,6 +167,5 @@ public class RMv21CapabilityPatch extends AbstractModuleComponent
}
}
}
- }
-
+ }
}
diff --git a/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/CapabilitiesTestSuite.java b/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/CapabilitiesTestSuite.java
index a21edd0d7c..8afdbbe829 100644
--- a/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/CapabilitiesTestSuite.java
+++ b/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/CapabilitiesTestSuite.java
@@ -21,9 +21,8 @@ package org.alfresco.module.org_alfresco_module_rm.test;
import junit.framework.Test;
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.DeclarativeCapabilityTest;
/**
@@ -41,7 +40,6 @@ public class CapabilitiesTestSuite extends TestSuite
public static Test suite()
{
TestSuite suite = new TestSuite();
- suite.addTestSuite(CapabilitiesTest.class);
suite.addTestSuite(DeclarativeCapabilityTest.class);
suite.addTestSuite(CompositeCapabilityTest.class);
return suite;
diff --git a/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/capabilities/CapabilitiesTest.java b/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/capabilities/CapabilitiesTest.java
deleted file mode 100644
index d43e722fd2..0000000000
--- a/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/capabilities/CapabilitiesTest.java
+++ /dev/null
@@ -1,3504 +0,0 @@
-/*
- * Copyright (C) 2005-2012 Alfresco Software Limited.
- *
- * This file is part of Alfresco
- *
- * Alfresco is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Alfresco is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with Alfresco. If not, see .
- */
-package org.alfresco.module.org_alfresco_module_rm.test.capabilities;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-import org.alfresco.module.org_alfresco_module_rm.capability.Capability;
-import org.alfresco.module.org_alfresco_module_rm.capability.RMPermissionModel;
-import org.alfresco.module.org_alfresco_module_rm.model.RecordsManagementModel;
-import org.alfresco.module.org_alfresco_module_rm.test.util.BaseRMTestCase;
-import org.alfresco.repo.security.authentication.AuthenticationUtil;
-import org.alfresco.repo.transaction.RetryingTransactionHelper.RetryingTransactionCallback;
-import org.alfresco.service.cmr.repository.NodeRef;
-import org.alfresco.service.cmr.security.AccessPermission;
-import org.alfresco.service.cmr.security.AccessStatus;
-import org.alfresco.service.cmr.security.PermissionService;
-
-/**
- * Test the RM permissions model
- *
- * @author Andy Hind
- * @author Roy Wetherall
- */
-public class CapabilitiesTest extends BaseRMTestCase implements
- RMPermissionModel, RecordsManagementModel
-{
- private NodeRef record;
- private PermissionService permissionService;
-
- @Override
- protected void initServices()
- {
- super.initServices();
- permissionService = (PermissionService) applicationContext.getBean("PermissionService");
- }
-
- @Override
- protected boolean isUserTest()
- {
- return true;
- }
-
- @Override
- protected boolean isFillingForAllUsers()
- {
- return true;
- }
-
- @Override
- protected void setupTestDataImpl()
- {
- super.setupTestDataImpl();
-
- record = utils.createRecord(rmFolder, "CapabilitiesTest.txt");
- }
-
- protected void check(Map access, String name, AccessStatus accessStatus)
- {
- Capability capability = capabilityService.getCapability(name);
- assertNotNull(capability);
- assertEquals(accessStatus, access.get(capability));
- }
-
- /**
- * Test file plan as system
- */
- public void testFilePlanAsSystem()
- {
- retryingTransactionHelper.doInTransaction(
- new RetryingTransactionCallback