Merged DEV/BUGFIXING/HEAD-2014_12_09 to HEAD

r92551: RM-1646 Also added the schema patch for the EndRetention capability
r92431: RM-1646: Added End Retention permission to role assignable permissions. End Retention capability is now available only if the user has the associated permission.

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/HEAD@92600 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261

rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/patch/v23/RMv23EndRetentionCapabilityPatch.java

@@ -0,0 +1,45 @@
+/*
+ * Copyright (C) 2005-2014 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 <http://www.gnu.org/licenses/>.
+ */
+package org.alfresco.module.org_alfresco_module_rm.patch.v23;
+
+import org.alfresco.module.org_alfresco_module_rm.patch.common.CapabilityPatch;
+import org.alfresco.module.org_alfresco_module_rm.role.FilePlanRoleService;
+import org.alfresco.service.cmr.repository.NodeRef;
+
+/**
+ * RM v2.3 patch to add new end retention capability.
+ *
+ * @author Alex Balan
+ * @since 2.3
+ */
+public class RMv23EndRetentionCapabilityPatch extends CapabilityPatch
+{
+    /**
+     * @see org.alfresco.module.org_alfresco_module_rm.patch.common.CapabilityPatch#applyCapabilityPatch(org.alfresco.service.cmr.repository.NodeRef)
+     */
+    protected void applyCapabilityPatch(NodeRef filePlan) 
+    {
+        // add new capability
+        addCapability(filePlan,
+                      "EndRetention",
+                      FilePlanRoleService.ROLE_ADMIN,
+                      FilePlanRoleService.ROLE_RECORDS_MANAGER);
+        
+    }
+}