Merge branch 'release/V2.4'

Conflicts:
	rm-automation/src/main/java/org/alfresco/po/rm/rules/fileplan/CreateFilePlanRulePage.java
	rm-community/.editorConfig
	rm-community/.jshintrc
	rm-community/pom.xml
	rm-community/rm-community-repo/unit-test/java/org/alfresco/module/org_alfresco_module_rm/test/util/ExceptionUtils.java
	rm-community/rm-community-repo/unit-test/java/org/alfresco/module/org_alfresco_module_rm/test/util/ExceptionUtilsUsageExamplesUnitTest.java
	rm-enterprise/pom.xml
	rm-enterprise/rm-enterprise-repo/pom.xml
	rm-enterprise/rm-enterprise-repo/src/main/amp/config/alfresco/module/alfresco-rm-enterprise-repo/caveat-context.xml
	rm-enterprise/rm-enterprise-repo/src/main/amp/config/alfresco/module/alfresco-rm-enterprise-repo/context/webscript-context.xml
	rm-enterprise/rm-enterprise-repo/src/main/amp/config/alfresco/module/alfresco-rm-enterprise-repo/log4j.properties
	rm-enterprise/rm-enterprise-repo/src/main/amp/config/alfresco/module/alfresco-rm-enterprise-repo/messages/caveat-model.properties
	rm-enterprise/rm-enterprise-repo/src/main/amp/config/alfresco/module/alfresco-rm-enterprise-repo/messages/classified-content-model_de.properties
	rm-enterprise/rm-enterprise-repo/src/main/amp/config/alfresco/module/alfresco-rm-enterprise-repo/messages/classified-content-model_es.properties
	rm-enterprise/rm-enterprise-repo/src/main/amp/config/alfresco/module/alfresco-rm-enterprise-repo/messages/classified-content-model_fr.properties
	rm-enterprise/rm-enterprise-repo/src/main/amp/config/alfresco/module/alfresco-rm-enterprise-repo/messages/classified-content-model_it.properties
	rm-enterprise/rm-enterprise-repo/src/main/amp/config/alfresco/module/alfresco-rm-enterprise-repo/messages/classified-content-model_ja.properties
	rm-enterprise/rm-enterprise-repo/src/main/amp/config/alfresco/module/alfresco-rm-enterprise-repo/messages/classified-content-model_nb.properties
	rm-enterprise/rm-enterprise-repo/src/main/amp/config/alfresco/module/alfresco-rm-enterprise-repo/messages/classified-content-model_nl.properties
	rm-enterprise/rm-enterprise-repo/src/main/amp/config/alfresco/module/alfresco-rm-enterprise-repo/messages/classified-content-model_pt_BR.properties
	rm-enterprise/rm-enterprise-repo/src/main/amp/config/alfresco/module/alfresco-rm-enterprise-repo/messages/classified-content-model_ru.properties
	rm-enterprise/rm-enterprise-repo/src/main/amp/config/alfresco/module/alfresco-rm-enterprise-repo/messages/classified-content-model_zh_CN.properties
	rm-enterprise/rm-enterprise-repo/src/main/amp/config/alfresco/module/alfresco-rm-enterprise-repo/messages/classified-content_de.properties
	rm-enterprise/rm-enterprise-repo/src/main/amp/config/alfresco/module/alfresco-rm-enterprise-repo/messages/classified-content_es.properties
	rm-enterprise/rm-enterprise-repo/src/main/amp/config/alfresco/module/alfresco-rm-enterprise-repo/messages/classified-content_fr.properties
	rm-enterprise/rm-enterprise-repo/src/main/amp/config/alfresco/module/alfresco-rm-enterprise-repo/messages/classified-content_it.properties
	rm-enterprise/rm-enterprise-repo/src/main/amp/config/alfresco/module/alfresco-rm-enterprise-repo/messages/classified-content_ja.properties
	rm-enterprise/rm-enterprise-repo/src/main/amp/config/alfresco/module/alfresco-rm-enterprise-repo/messages/classified-content_nb.properties
	rm-enterprise/rm-enterprise-repo/src/main/amp/config/alfresco/module/alfresco-rm-enterprise-repo/messages/classified-content_nl.properties
	rm-enterprise/rm-enterprise-repo/src/main/amp/config/alfresco/module/alfresco-rm-enterprise-repo/messages/classified-content_pt_BR.properties
	rm-enterprise/rm-enterprise-repo/src/main/amp/config/alfresco/module/alfresco-rm-enterprise-repo/messages/classified-content_ru.properties
	rm-enterprise/rm-enterprise-repo/src/main/amp/config/alfresco/module/alfresco-rm-enterprise-repo/messages/classified-content_zh_CN.properties
	rm-enterprise/rm-enterprise-repo/src/main/amp/config/alfresco/module/alfresco-rm-enterprise-repo/model/caveatModel.xml
	rm-enterprise/rm-enterprise-repo/src/main/amp/config/alfresco/module/alfresco-rm-enterprise-repo/module-context.xml
	rm-enterprise/rm-enterprise-repo/src/main/amp/config/alfresco/templates/webscripts/org/alfresco/rma/caveat/caveatgroups.get.json.ftl
	rm-enterprise/rm-enterprise-repo/src/main/java/org/alfresco/module/org_alfresco_module_rm/bootstrap/ClearanceForAdminBootstrapComponent.java
	rm-enterprise/rm-enterprise-repo/src/main/java/org/alfresco/module/org_alfresco_module_rm/caveat/CaveatException.java
	rm-enterprise/rm-enterprise-repo/src/main/java/org/alfresco/module/org_alfresco_module_rm/caveat/CaveatMarkingService.java
	rm-enterprise/rm-enterprise-repo/src/main/java/org/alfresco/module/org_alfresco_module_rm/caveat/CaveatMarkingServiceImpl.java
	rm-enterprise/rm-enterprise-repo/src/main/java/org/alfresco/module/org_alfresco_module_rm/caveat/dao/CaveatDAOCache.java
	rm-enterprise/rm-enterprise-repo/src/main/java/org/alfresco/module/org_alfresco_module_rm/caveat/dao/CaveatDAOFromJSONBootstrap.java
	rm-enterprise/rm-enterprise-repo/src/main/java/org/alfresco/module/org_alfresco_module_rm/caveat/dao/CaveatDAOInterface.java
	rm-enterprise/rm-enterprise-repo/src/main/java/org/alfresco/module/org_alfresco_module_rm/caveat/model/CaveatModel.java
	rm-enterprise/rm-enterprise-repo/src/main/java/org/alfresco/module/org_alfresco_module_rm/caveat/scheme/CaveatAccessUtility.java
	rm-enterprise/rm-enterprise-repo/src/main/java/org/alfresco/module/org_alfresco_module_rm/caveat/scheme/CaveatGroup.java
	rm-enterprise/rm-enterprise-repo/src/main/java/org/alfresco/module/org_alfresco_module_rm/caveat/scheme/CaveatMark.java
	rm-enterprise/rm-enterprise-repo/src/main/java/org/alfresco/module/org_alfresco_module_rm/caveat/scheme/CaveatSchemeService.java
	rm-enterprise/rm-enterprise-repo/src/main/java/org/alfresco/module/org_alfresco_module_rm/caveat/scheme/CaveatSchemeServiceImpl.java
	rm-enterprise/rm-enterprise-repo/src/main/java/org/alfresco/module/org_alfresco_module_rm/caveat/scheme/CaveatUtils.java
	rm-enterprise/rm-enterprise-repo/src/main/java/org/alfresco/module/org_alfresco_module_rm/classification/ClassificationLevelManager.java
	rm-enterprise/rm-enterprise-repo/src/main/java/org/alfresco/module/org_alfresco_module_rm/classification/ClassificationSchemeServiceImpl.java
	rm-enterprise/rm-enterprise-repo/src/main/java/org/alfresco/module/org_alfresco_module_rm/classification/permission/ClassificationPermissionPreProcessor.java
	rm-enterprise/rm-enterprise-repo/src/main/java/org/alfresco/module/org_alfresco_module_rm/script/caveat/CaveatGroupsGet.java
	rm-enterprise/rm-enterprise-repo/src/main/java/org/alfresco/repo/jscript/app/CurrentClassificationPropertyDecorator.java
	rm-enterprise/rm-enterprise-repo/src/main/java/org/alfresco/repo/quickshare/ExtendedQuickShareServiceImpl.java
	rm-enterprise/rm-enterprise-repo/src/main/properties/local/alfresco-global.properties
	rm-enterprise/rm-enterprise-repo/src/main/resources/alfresco/module/alfresco-rm-server-enterprise/classification/rm-classification-reasons.json
	rm-enterprise/rm-enterprise-repo/src/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/caveat/CaveatsBootstrapTest.java
	rm-enterprise/rm-enterprise-repo/src/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/classification/ClassificationReasonsTest.java
	rm-enterprise/rm-enterprise-repo/src/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/classification/ClassifyTest.java
	rm-enterprise/rm-enterprise-repo/src/test/java/org/alfresco/module/org_alfresco_module_rm/test/legacy/webscript/ClassificationRestApiTest.java
	rm-enterprise/rm-enterprise-repo/src/test/resources/alfresco/extension/disable-webscript-caching-context.xml
	rm-enterprise/rm-enterprise-repo/src/test/resources/alfresco/module/alfresco-rm-server-enterprise/classification/rm-classification-reasons.json
	rm-enterprise/rm-enterprise-repo/src/unit-test/java/org/alfresco/module/org_alfresco_module_rm/caveat/CaveatMarkingServiceImplUnitTestBase.java
	rm-enterprise/rm-enterprise-repo/src/unit-test/java/org/alfresco/module/org_alfresco_module_rm/caveat/CaveatMarkingServiceImpl_NodeRefUnitTest.java
	rm-enterprise/rm-enterprise-repo/src/unit-test/java/org/alfresco/module/org_alfresco_module_rm/caveat/CaveatMarkingServiceImpl_UserUnitTest.java
	rm-enterprise/rm-enterprise-repo/src/unit-test/java/org/alfresco/module/org_alfresco_module_rm/caveat/TestOnlyCaveatSchemeService.java
	rm-enterprise/rm-enterprise-repo/src/unit-test/java/org/alfresco/module/org_alfresco_module_rm/caveat/dao/CaveatDAOFromJSONBootstrapUnitTest.java
	rm-enterprise/rm-enterprise-repo/src/unit-test/java/org/alfresco/module/org_alfresco_module_rm/classification/ClassificationLevelManagerUnitTest.java
	rm-enterprise/rm-enterprise-repo/src/unit-test/java/org/alfresco/module/org_alfresco_module_rm/classification/SecurityClearanceServiceImplUnitTest.java
	rm-enterprise/rm-enterprise-repo/src/unit-test/java/org/alfresco/module/org_alfresco_module_rm/classification/permission/ClassificationPermissionPreProcessorUnitTest.java
	rm-enterprise/rm-enterprise-repo/src/unit-test/java/org/alfresco/module/org_alfresco_module_rm/script/caveat/CaveatGroupsGetUnitTest.java
	rm-enterprise/rm-enterprise-repo/src/unit-test/java/org/alfresco/module/org_alfresco_module_rm/script/classification/ClassifyContentPostUnitTest.java
	rm-enterprise/rm-enterprise-repo/src/unit-test/java/org/alfresco/repo/jscript/app/CurrentClassificationPropertyDecoratorUnitTest.java
	rm-enterprise/rm-enterprise-share/.jshintrc
	rm-enterprise/rm-enterprise-share/pom.xml
	rm-enterprise/rm-enterprise-share/src/main/amp/web/js/alfresco/rm/renderers/ClassificationLabel.js

pom.xml

@@ -256,6 +256,7 @@
 
                 <verbose>${license.verbose}</verbose>
                 <addSvnKeyWords>false</addSvnKeyWords>
+                <addJavaLicenseAfterPackage>false</addJavaLicenseAfterPackage>
 
                 <!-- header configuration -->
                 <organizationName>Alfresco Software Limited</organizationName>

rm-community/.editorConfig

@@ -0,0 +1,17 @@
+
+# EditorConfig file: http://editorconfig.org/
+# Syntax at: https://github.com/editorconfig/editorconfig/wiki/EditorConfig-Properties
+
+# This is the Top level for the RM project
+root = true
+
+# All files should use spaces.
+[*]
+indent_style = space
+
+# Just JS for now.
+[*.js]
+indent_size = 3
+trim_trailing_whitespace = true
+
+#TODO: css, xml, ftl, etc.

rm-community/.jshintrc

@@ -0,0 +1,45 @@
+
+{
+   "bitwise": true,
+   "curly": true,
+   "eqeqeq": true,
+   "es3": true,
+   "forin": true,
+   "freeze": true,
+   "funcscope": true,
+   "immed": true,
+   "indent": 3,
+   "iterator": true,
+   "latedef": true,
+   "maxcomplexity": 10,
+   "maxdepth": 50,
+   "maxerr": 50,
+   "maxlen": 250,
+   "maxparams": 50,
+   "maxstatements": 30,
+   "newcap": true,
+   "noarg": true,
+   "nonbsp": true,
+   "nonew": true,
+   "notypeof": true,
+   "shadow": "outer",
+   "undef": true,
+   "unused": true,
+
+   "globals": {
+      "module": false,
+      "model": true,
+      "Alfresco": true,
+      "YAHOO": false,
+      "appContext": false,
+      "PDFJS": false,
+      "AlfrescoUtil": true,
+      "msg": false
+   },
+
+   "expr": true,
+   "strict": false,
+
+   "browser": true,
+   "dojo": true
+}

rm-community/pom.xml

@@ -24,6 +24,6 @@
    </modules>
 
    <properties>
-      <alfresco.version>5.1.d-EA</alfresco.version>
+      <alfresco.version>5.1.e</alfresco.version>
    </properties>
 </project>

rm-community/rm-community-repo/source/compatibility/org/alfresco/module/org_alfresco_module_dod5015/caveat/RMListOfValuesConstraint.java

@@ -1,5 +1,3 @@
-package org.alfresco.module.org_alfresco_module_dod5015.caveat;
-
 /*
  * #%L
  * Alfresco Records Management Module
@@ -27,6 +25,7 @@ package org.alfresco.module.org_alfresco_module_dod5015.caveat;
  * #L%
  */
 
+package org.alfresco.module.org_alfresco_module_dod5015.caveat;
 
 /**
  * Compatibility Implementation.

rm-community/rm-community-repo/source/compatibility/org/alfresco/module/org_alfresco_module_rm/CannotApplyConstraintMetadataException.java

@@ -1,6 +1,3 @@
- 
-package org.alfresco.module.org_alfresco_module_rm;
-
 /*
  * #%L
  * Alfresco Records Management Module
@@ -28,6 +25,8 @@ package org.alfresco.module.org_alfresco_module_rm;
  * #L%
  */
 
+package org.alfresco.module.org_alfresco_module_rm;
+
 import org.alfresco.service.namespace.QName;
 import org.springframework.extensions.surf.util.I18NUtil;
 

rm-community/rm-community-repo/source/compatibility/org/alfresco/module/org_alfresco_module_rm/CustomMetadataException.java

@@ -1,6 +1,3 @@
- 
-package org.alfresco.module.org_alfresco_module_rm;
-
 /*
  * #%L
  * Alfresco Records Management Module
@@ -28,6 +25,8 @@ package org.alfresco.module.org_alfresco_module_rm;
  * #L%
  */
 
+package org.alfresco.module.org_alfresco_module_rm;
+
 /**
  * @deprecated as of 2.1 see {@link org.alfresco.module.org_alfresco_module_rm.admin.CustomMetadataException}
  */

rm-community/rm-community-repo/source/compatibility/org/alfresco/module/org_alfresco_module_rm/InvalidCustomAspectMetadataException.java

@@ -1,6 +1,3 @@
- 
-package org.alfresco.module.org_alfresco_module_rm;
-
 /*
  * #%L
  * Alfresco Records Management Module
@@ -28,6 +25,8 @@ package org.alfresco.module.org_alfresco_module_rm;
  * #L%
  */
 
+package org.alfresco.module.org_alfresco_module_rm;
+
 import org.alfresco.service.namespace.QName;
 import org.springframework.extensions.surf.util.I18NUtil;
 

rm-community/rm-community-repo/source/compatibility/org/alfresco/module/org_alfresco_module_rm/NotCustomisableMetadataException.java

@@ -1,6 +1,3 @@
- 
-package org.alfresco.module.org_alfresco_module_rm;
-
 /*
  * #%L
  * Alfresco Records Management Module
@@ -28,6 +25,8 @@ package org.alfresco.module.org_alfresco_module_rm;
  * #L%
  */
 
+package org.alfresco.module.org_alfresco_module_rm;
+
 import org.springframework.extensions.surf.util.I18NUtil;
 
 /**

rm-community/rm-community-repo/source/compatibility/org/alfresco/module/org_alfresco_module_rm/PropertyAlreadyExistsMetadataException.java

@@ -1,6 +1,3 @@
- 
-package org.alfresco.module.org_alfresco_module_rm;
-
 /*
  * #%L
  * Alfresco Records Management Module
@@ -28,6 +25,8 @@ package org.alfresco.module.org_alfresco_module_rm;
  * #L%
  */
 
+package org.alfresco.module.org_alfresco_module_rm;
+
 import org.springframework.extensions.surf.util.I18NUtil;
 
 /**

rm-community/rm-community-repo/source/compatibility/org/alfresco/module/org_alfresco_module_rm/RecordsManagementAdminService.java

@@ -1,6 +1,3 @@
- 
-package org.alfresco.module.org_alfresco_module_rm;
-
 /*
  * #%L
  * Alfresco Records Management Module
@@ -28,7 +25,7 @@ package org.alfresco.module.org_alfresco_module_rm;
  * #L%
  */
 
-
+package org.alfresco.module.org_alfresco_module_rm;
 
 /**
  * @deprecated as of 2.1 see {@link org.alfresco.module.org_alfresco_module_rm.admin.RecordsManagementAdminService}

rm-community/rm-community-repo/source/compatibility/org/alfresco/module/org_alfresco_module_rm/RecordsManagementService.java

@@ -1,6 +1,3 @@
- 
-package org.alfresco.module.org_alfresco_module_rm;
-
 /*
  * #%L
  * Alfresco Records Management Module
@@ -28,6 +25,7 @@ package org.alfresco.module.org_alfresco_module_rm;
  * #L%
  */
 
+package org.alfresco.module.org_alfresco_module_rm;
 
 import java.io.Serializable;
 import java.util.List;

rm-community/rm-community-repo/source/compatibility/org/alfresco/module/org_alfresco_module_rm/RecordsManagementServiceImpl.java

@@ -1,6 +1,3 @@
- 
-package org.alfresco.module.org_alfresco_module_rm;
-
 /*
  * #%L
  * Alfresco Records Management Module
@@ -28,6 +25,7 @@ package org.alfresco.module.org_alfresco_module_rm;
  * #L%
  */
 
+package org.alfresco.module.org_alfresco_module_rm;
 
 import java.io.Serializable;
 import java.util.ArrayList;

rm-community/rm-community-repo/source/compatibility/org/alfresco/module/org_alfresco_module_rm/audit/RecordsManagementAuditServiceDeprecated.java

@@ -1,6 +1,3 @@
- 
-package org.alfresco.module.org_alfresco_module_rm.audit;
-
 /*
  * #%L
  * Alfresco Records Management Module
@@ -28,6 +25,7 @@ package org.alfresco.module.org_alfresco_module_rm.audit;
  * #L%
  */
 
+package org.alfresco.module.org_alfresco_module_rm.audit;
 
 import java.io.Serializable;
 import java.util.Date;

rm-community/rm-community-repo/source/compatibility/org/alfresco/module/org_alfresco_module_rm/caveat/PivotUtil.java

@@ -1,6 +1,3 @@
- 
-package org.alfresco.module.org_alfresco_module_rm.caveat;
-
 /*
  * #%L
  * Alfresco Records Management Module
@@ -28,6 +25,7 @@ package org.alfresco.module.org_alfresco_module_rm.caveat;
  * #L%
  */
 
+package org.alfresco.module.org_alfresco_module_rm.caveat;
 
 import java.util.ArrayList;
 import java.util.HashMap;

rm-community/rm-community-repo/source/compatibility/org/alfresco/module/org_alfresco_module_rm/caveat/RMCaveatConfigComponent.java

@@ -1,6 +1,3 @@
- 
-package org.alfresco.module.org_alfresco_module_rm.caveat;
-
 /*
  * #%L
  * Alfresco Records Management Module
@@ -28,6 +25,7 @@ package org.alfresco.module.org_alfresco_module_rm.caveat;
  * #L%
  */
 
+package org.alfresco.module.org_alfresco_module_rm.caveat;
 
 import java.io.File;
 import java.io.InputStream;

rm-community/rm-community-repo/source/compatibility/org/alfresco/module/org_alfresco_module_rm/caveat/RMCaveatConfigComponentImpl.java

@@ -1,6 +1,3 @@
- 
-package org.alfresco.module.org_alfresco_module_rm.caveat;
-
 /*
  * #%L
  * Alfresco Records Management Module
@@ -28,6 +25,7 @@ package org.alfresco.module.org_alfresco_module_rm.caveat;
  * #L%
  */
 
+package org.alfresco.module.org_alfresco_module_rm.caveat;
 
 import static org.apache.commons.lang.exception.ExceptionUtils.getFullStackTrace;
 
@@ -46,8 +44,6 @@ import java.util.concurrent.locks.Lock;
 import java.util.concurrent.locks.ReadWriteLock;
 import java.util.concurrent.locks.ReentrantReadWriteLock;
 
-import net.sf.acegisecurity.AccessDeniedException;
-
 import org.alfresco.error.AlfrescoRuntimeException;
 import org.alfresco.model.ContentModel;
 import org.alfresco.module.org_alfresco_module_rm.caveat.RMListOfValuesConstraint.MatchLogic;
@@ -85,6 +81,8 @@ import org.apache.commons.logging.LogFactory;
 import org.json.JSONException;
 import org.json.JSONObject;
 
+import net.sf.acegisecurity.AccessDeniedException;
+
 /**
  * RM Caveat Config component impl
  *

rm-community/rm-community-repo/source/compatibility/org/alfresco/module/org_alfresco_module_rm/caveat/RMCaveatConfigService.java

@@ -1,6 +1,3 @@
- 
-package org.alfresco.module.org_alfresco_module_rm.caveat;
-
 /*
  * #%L
  * Alfresco Records Management Module
@@ -28,6 +25,7 @@ package org.alfresco.module.org_alfresco_module_rm.caveat;
  * #L%
  */
 
+package org.alfresco.module.org_alfresco_module_rm.caveat;
 
 import java.io.File;
 import java.io.InputStream;

rm-community/rm-community-repo/source/compatibility/org/alfresco/module/org_alfresco_module_rm/caveat/RMCaveatConfigServiceImpl.java

@@ -1,6 +1,3 @@
- 
-package org.alfresco.module.org_alfresco_module_rm.caveat;
-
 /*
  * #%L
  * Alfresco Records Management Module
@@ -28,6 +25,8 @@ package org.alfresco.module.org_alfresco_module_rm.caveat;
  * #L%
  */
 
+package org.alfresco.module.org_alfresco_module_rm.caveat;
+
 import java.io.File;
 import java.io.InputStream;
 import java.util.ArrayList;

rm-community/rm-community-repo/source/compatibility/org/alfresco/module/org_alfresco_module_rm/caveat/RMConstraintInfo.java

@@ -1,6 +1,3 @@
- 
-package org.alfresco.module.org_alfresco_module_rm.caveat;
-
 /*
  * #%L
  * Alfresco Records Management Module
@@ -28,6 +25,7 @@ package org.alfresco.module.org_alfresco_module_rm.caveat;
  * #L%
  */
 
+package org.alfresco.module.org_alfresco_module_rm.caveat;
 
 import java.util.Arrays;
 

rm-community/rm-community-repo/source/compatibility/org/alfresco/module/org_alfresco_module_rm/caveat/RMConstraintMessageKeys.java

@@ -1,6 +1,3 @@
- 
-package org.alfresco.module.org_alfresco_module_rm.caveat;
-
 /*
  * #%L
  * Alfresco Records Management Module
@@ -28,6 +25,7 @@ package org.alfresco.module.org_alfresco_module_rm.caveat;
  * #L%
  */
 
+package org.alfresco.module.org_alfresco_module_rm.caveat;
 
 /**
  * A class to hold I18N keys for messages related to constraint validation.

rm-community/rm-community-repo/source/compatibility/org/alfresco/module/org_alfresco_module_rm/caveat/RMListOfValuesConstraint.java

@@ -1,6 +1,3 @@
- 
-package org.alfresco.module.org_alfresco_module_rm.caveat;
-
 /*
  * #%L
  * Alfresco Records Management Module
@@ -28,6 +25,7 @@ package org.alfresco.module.org_alfresco_module_rm.caveat;
  * #L%
  */
 
+package org.alfresco.module.org_alfresco_module_rm.caveat;
 
 import java.util.ArrayList;
 import java.util.Collections;

rm-community/rm-community-repo/source/compatibility/org/alfresco/module/org_alfresco_module_rm/caveat/ScriptAuthority.java

@@ -1,6 +1,3 @@
- 
-package org.alfresco.module.org_alfresco_module_rm.caveat;
-
 /*
  * #%L
  * Alfresco Records Management Module
@@ -28,6 +25,7 @@ package org.alfresco.module.org_alfresco_module_rm.caveat;
  * #L%
  */
 
+package org.alfresco.module.org_alfresco_module_rm.caveat;
 
 import java.io.Serializable;
 

rm-community/rm-community-repo/source/compatibility/org/alfresco/module/org_alfresco_module_rm/caveat/ScriptConstraint.java

@@ -1,6 +1,3 @@
- 
-package org.alfresco.module.org_alfresco_module_rm.caveat;
-
 /*
  * #%L
  * Alfresco Records Management Module
@@ -28,14 +25,14 @@ package org.alfresco.module.org_alfresco_module_rm.caveat;
  * #L%
  */
 
+package org.alfresco.module.org_alfresco_module_rm.caveat;
 
 import java.io.Serializable;
-
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.HashMap;
-import java.util.Map;
 import java.util.List;
+import java.util.Map;
 import java.util.Set;
 
 import org.alfresco.service.cmr.security.AuthorityService;

rm-community/rm-community-repo/source/compatibility/org/alfresco/module/org_alfresco_module_rm/caveat/ScriptConstraintAuthority.java

@@ -1,6 +1,3 @@
- 
-package org.alfresco.module.org_alfresco_module_rm.caveat;
-
 /*
  * #%L
  * Alfresco Records Management Module
@@ -28,9 +25,10 @@ package org.alfresco.module.org_alfresco_module_rm.caveat;
  * #L%
  */
 
+package org.alfresco.module.org_alfresco_module_rm.caveat;
 
-import java.util.List;
 import java.io.Serializable;
+import java.util.List;
 
 public class ScriptConstraintAuthority implements Serializable
 {

rm-community/rm-community-repo/source/compatibility/org/alfresco/module/org_alfresco_module_rm/caveat/ScriptConstraintValue.java

@@ -1,6 +1,3 @@
- 
-package org.alfresco.module.org_alfresco_module_rm.caveat;
-
 /*
  * #%L
  * Alfresco Records Management Module
@@ -28,9 +25,10 @@ package org.alfresco.module.org_alfresco_module_rm.caveat;
  * #L%
  */
 
+package org.alfresco.module.org_alfresco_module_rm.caveat;
 
-import java.util.List;
 import java.io.Serializable;
+import java.util.List;
 
 public class ScriptConstraintValue implements Serializable
 {

rm-community/rm-community-repo/source/compatibility/org/alfresco/module/org_alfresco_module_rm/caveat/ScriptRMCaveatConfigService.java

@@ -1,6 +1,3 @@
- 
-package org.alfresco.module.org_alfresco_module_rm.caveat;
-
 /*
  * #%L
  * Alfresco Records Management Module
@@ -28,6 +25,7 @@ package org.alfresco.module.org_alfresco_module_rm.caveat;
  * #L%
  */
 
+package org.alfresco.module.org_alfresco_module_rm.caveat;
 
 import java.util.ArrayList;
 import java.util.List;

rm-community/rm-community-repo/source/compatibility/org/alfresco/module/org_alfresco_module_rm/compatibility/CompatibilityModel.java

@@ -1,6 +1,3 @@
- 
-package org.alfresco.module.org_alfresco_module_rm.compatibility;
-
 /*
  * #%L
  * Alfresco Records Management Module
@@ -28,6 +25,7 @@ package org.alfresco.module.org_alfresco_module_rm.compatibility;
  * #L%
  */
 
+package org.alfresco.module.org_alfresco_module_rm.compatibility;
 
 import org.alfresco.module.org_alfresco_module_rm.dod5015.DOD5015Model;
 import org.alfresco.service.namespace.QName;

rm-community/rm-community-repo/source/compatibility/org/alfresco/module/org_alfresco_module_rm/security/RecordsManagementSecurityService.java

@@ -1,6 +1,3 @@
- 
-package org.alfresco.module.org_alfresco_module_rm.security;
-
 /*
  * #%L
  * Alfresco Records Management Module
@@ -28,6 +25,7 @@ package org.alfresco.module.org_alfresco_module_rm.security;
  * #L%
  */
 
+package org.alfresco.module.org_alfresco_module_rm.security;
 
 import java.util.Set;
 

rm-community/rm-community-repo/source/compatibility/org/alfresco/module/org_alfresco_module_rm/security/RecordsManagementSecurityServiceImpl.java

@@ -1,6 +1,3 @@
- 
-package org.alfresco.module.org_alfresco_module_rm.security;
-
 /*
  * #%L
  * Alfresco Records Management Module
@@ -28,6 +25,7 @@ package org.alfresco.module.org_alfresco_module_rm.security;
  * #L%
  */
 
+package org.alfresco.module.org_alfresco_module_rm.security;
 
 import java.util.Set;
 

rm-community/rm-community-repo/source/compatibility/org/alfresco/module/org_alfresco_module_rm/security/Role.java

@@ -1,6 +1,3 @@
- 
-package org.alfresco.module.org_alfresco_module_rm.security;
-
 /*
  * #%L
  * Alfresco Records Management Module
@@ -28,6 +25,7 @@ package org.alfresco.module.org_alfresco_module_rm.security;
  * #L%
  */
 
+package org.alfresco.module.org_alfresco_module_rm.security;
 
 import java.util.HashSet;
 import java.util.Set;

rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/RecordsManagementPolicies.java

@@ -1,6 +1,3 @@
- 
-package org.alfresco.module.org_alfresco_module_rm;
-
 /*
  * #%L
  * Alfresco Records Management Module
@@ -28,6 +25,7 @@ package org.alfresco.module.org_alfresco_module_rm;
  * #L%
  */
 
+package org.alfresco.module.org_alfresco_module_rm;
 
 import java.io.Serializable;
 import java.util.Map;

rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/RecordsManagementServiceRegistry.java

@@ -1,6 +1,3 @@
- 
-package org.alfresco.module.org_alfresco_module_rm;
-
 /*
  * #%L
  * Alfresco Records Management Module
@@ -28,6 +25,7 @@ package org.alfresco.module.org_alfresco_module_rm;
  * #L%
  */
 
+package org.alfresco.module.org_alfresco_module_rm;
 
 import org.alfresco.module.org_alfresco_module_rm.action.RecordsManagementActionService;
 import org.alfresco.module.org_alfresco_module_rm.audit.RecordsManagementAuditService;

rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/RecordsManagementServiceRegistryImpl.java

@@ -1,6 +1,3 @@
- 
-package org.alfresco.module.org_alfresco_module_rm;
-
 /*
  * #%L
  * Alfresco Records Management Module
@@ -28,6 +25,7 @@ package org.alfresco.module.org_alfresco_module_rm;
  * #L%
  */
 
+package org.alfresco.module.org_alfresco_module_rm;
 
 import org.alfresco.module.org_alfresco_module_rm.action.RecordsManagementActionService;
 import org.alfresco.module.org_alfresco_module_rm.audit.RecordsManagementAuditService;

rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/action/AuditableActionExecuterAbstractBase.java

@@ -1,6 +1,3 @@
- 
-package org.alfresco.module.org_alfresco_module_rm.action;
-
 /*
  * #%L
  * Alfresco Records Management Module
@@ -28,6 +25,7 @@ package org.alfresco.module.org_alfresco_module_rm.action;
  * #L%
  */
 
+package org.alfresco.module.org_alfresco_module_rm.action;
 
 import org.alfresco.module.org_alfresco_module_rm.audit.RecordsManagementAuditService;
 import org.alfresco.repo.action.executer.ActionExecuterAbstractBase;

rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/action/PropertySubActionExecuterAbstractBase.java

@@ -1,6 +1,3 @@
- 
-package org.alfresco.module.org_alfresco_module_rm.action;
-
 /*
  * #%L
  * Alfresco Records Management Module
@@ -28,6 +25,7 @@ package org.alfresco.module.org_alfresco_module_rm.action;
  * #L%
  */
 
+package org.alfresco.module.org_alfresco_module_rm.action;
 
 import org.alfresco.repo.action.parameter.ParameterProcessorComponent;
 import org.alfresco.service.cmr.action.Action;

rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/action/RMActionExecuterAbstractBase.java

@@ -1,6 +1,3 @@
- 
-package org.alfresco.module.org_alfresco_module_rm.action;
-
 /*
  * #%L
  * Alfresco Records Management Module
@@ -28,6 +25,7 @@ package org.alfresco.module.org_alfresco_module_rm.action;
  * #L%
  */
 
+package org.alfresco.module.org_alfresco_module_rm.action;
 
 import java.io.Serializable;
 import java.util.HashSet;

rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/action/RMDispositionActionExecuterAbstractBase.java

@@ -1,6 +1,3 @@
- 
-package org.alfresco.module.org_alfresco_module_rm.action;
-
 /*
  * #%L
  * Alfresco Records Management Module
@@ -28,6 +25,7 @@ package org.alfresco.module.org_alfresco_module_rm.action;
  * #L%
  */
 
+package org.alfresco.module.org_alfresco_module_rm.action;
 
 import java.util.Date;
 import java.util.List;

rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/action/RecordsManagementAction.java

@@ -1,6 +1,3 @@
- 
-package org.alfresco.module.org_alfresco_module_rm.action;
-
 /*
  * #%L
  * Alfresco Records Management Module
@@ -28,6 +25,7 @@ package org.alfresco.module.org_alfresco_module_rm.action;
  * #L%
  */
 
+package org.alfresco.module.org_alfresco_module_rm.action;
 
 import java.io.Serializable;
 import java.util.Map;

rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/action/RecordsManagementActionCondition.java

@@ -1,6 +1,3 @@
- 
-package org.alfresco.module.org_alfresco_module_rm.action;
-
 /*
  * #%L
  * Alfresco Records Management Module
@@ -28,6 +25,7 @@ package org.alfresco.module.org_alfresco_module_rm.action;
  * #L%
  */
 
+package org.alfresco.module.org_alfresco_module_rm.action;
 
 /**
  * Record Management Action Condition

rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/action/RecordsManagementActionConditionDefinition.java

@@ -1,6 +1,3 @@
- 
-package org.alfresco.module.org_alfresco_module_rm.action;
-
 /*
  * #%L
  * Alfresco Records Management Module
@@ -28,6 +25,7 @@ package org.alfresco.module.org_alfresco_module_rm.action;
  * #L%
  */
 
+package org.alfresco.module.org_alfresco_module_rm.action;
 
 import org.alfresco.service.cmr.action.ActionConditionDefinition;
 

rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/action/RecordsManagementActionConditionDefinitionImpl.java

@@ -1,6 +1,3 @@
- 
-package org.alfresco.module.org_alfresco_module_rm.action;
-
 /*
  * #%L
  * Alfresco Records Management Module
@@ -28,6 +25,7 @@ package org.alfresco.module.org_alfresco_module_rm.action;
  * #L%
  */
 
+package org.alfresco.module.org_alfresco_module_rm.action;
 
 import org.alfresco.repo.action.ActionConditionDefinitionImpl;
 

rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/action/RecordsManagementActionConditionEvaluatorAbstractBase.java

@@ -1,6 +1,3 @@
- 
-package org.alfresco.module.org_alfresco_module_rm.action;
-
 /*
  * #%L
  * Alfresco Records Management Module
@@ -28,6 +25,7 @@ package org.alfresco.module.org_alfresco_module_rm.action;
  * #L%
  */
 
+package org.alfresco.module.org_alfresco_module_rm.action;
 
 import java.util.List;
 

rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/action/RecordsManagementActionDefinition.java

@@ -1,6 +1,3 @@
- 
-package org.alfresco.module.org_alfresco_module_rm.action;
-
 /*
  * #%L
  * Alfresco Records Management Module
@@ -28,6 +25,7 @@ package org.alfresco.module.org_alfresco_module_rm.action;
  * #L%
  */
 
+package org.alfresco.module.org_alfresco_module_rm.action;
 
 import java.util.Set;
 

rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/action/RecordsManagementActionDefinitionImpl.java

@@ -1,6 +1,3 @@
- 
-package org.alfresco.module.org_alfresco_module_rm.action;
-
 /*
  * #%L
  * Alfresco Records Management Module
@@ -28,6 +25,7 @@ package org.alfresco.module.org_alfresco_module_rm.action;
  * #L%
  */
 
+package org.alfresco.module.org_alfresco_module_rm.action;
 
 import java.util.Set;
 

rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/action/RecordsManagementActionResult.java

@@ -1,7 +1,3 @@
- 
-
-package org.alfresco.module.org_alfresco_module_rm.action;
-
 /*
  * #%L
  * Alfresco Records Management Module
@@ -29,6 +25,7 @@ package org.alfresco.module.org_alfresco_module_rm.action;
  * #L%
  */
 
+package org.alfresco.module.org_alfresco_module_rm.action;
 
 /**
  * Records management action result.

rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/action/RecordsManagementActionService.java

@@ -1,6 +1,3 @@
- 
-package org.alfresco.module.org_alfresco_module_rm.action;
-
 /*
  * #%L
  * Alfresco Records Management Module
@@ -28,6 +25,7 @@ package org.alfresco.module.org_alfresco_module_rm.action;
  * #L%
  */
 
+package org.alfresco.module.org_alfresco_module_rm.action;
 
 import java.io.Serializable;
 import java.util.List;

rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/action/RecordsManagementActionServiceImpl.java

@@ -1,6 +1,3 @@
- 
-package org.alfresco.module.org_alfresco_module_rm.action;
-
 /*
  * #%L
  * Alfresco Records Management Module
@@ -28,6 +25,7 @@ package org.alfresco.module.org_alfresco_module_rm.action;
  * #L%
  */
 
+package org.alfresco.module.org_alfresco_module_rm.action;
 
 import java.io.Serializable;
 import java.util.ArrayList;

rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/action/ScheduledDispositionJob.java

@@ -1,6 +1,3 @@
- 
-package org.alfresco.module.org_alfresco_module_rm.action;
-
 /*
  * #%L
  * Alfresco Records Management Module
@@ -28,6 +25,7 @@ package org.alfresco.module.org_alfresco_module_rm.action;
  * #L%
  */
 
+package org.alfresco.module.org_alfresco_module_rm.action;
 
 import java.util.Calendar;
 import java.util.List;

rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/action/constraint/CustomParameterConstraint.java

@@ -1,7 +1,3 @@
- 
-
-package org.alfresco.module.org_alfresco_module_rm.action.constraint;
-
 /*
  * #%L
  * Alfresco Records Management Module
@@ -29,6 +25,7 @@ package org.alfresco.module.org_alfresco_module_rm.action.constraint;
  * #L%
  */
 
+package org.alfresco.module.org_alfresco_module_rm.action.constraint;
 
 import java.util.HashMap;
 import java.util.List;

rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/action/constraint/DispositionActionParameterConstraint.java

@@ -1,7 +1,3 @@
- 
-
-package org.alfresco.module.org_alfresco_module_rm.action.constraint;
-
 /*
  * #%L
  * Alfresco Records Management Module
@@ -29,6 +25,7 @@ package org.alfresco.module.org_alfresco_module_rm.action.constraint;
  * #L%
  */
 
+package org.alfresco.module.org_alfresco_module_rm.action.constraint;
 
 import java.util.HashMap;
 import java.util.List;

rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/action/constraint/ManualEventParameterConstraint.java

@@ -1,7 +1,3 @@
- 
-
-package org.alfresco.module.org_alfresco_module_rm.action.constraint;
-
 /*
  * #%L
  * Alfresco Records Management Module
@@ -29,6 +25,7 @@ package org.alfresco.module.org_alfresco_module_rm.action.constraint;
  * #L%
  */
 
+package org.alfresco.module.org_alfresco_module_rm.action.constraint;
 
 import java.util.HashMap;
 import java.util.List;

rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/action/constraint/RecordTypeParameterConstraint.java

@@ -1,7 +1,3 @@
- 
-
-package org.alfresco.module.org_alfresco_module_rm.action.constraint;
-
 /*
  * #%L
  * Alfresco Records Management Module
@@ -29,6 +25,7 @@ package org.alfresco.module.org_alfresco_module_rm.action.constraint;
  * #L%
  */
 
+package org.alfresco.module.org_alfresco_module_rm.action.constraint;
 
 import java.util.Collections;
 import java.util.HashMap;

rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/action/constraint/VersionParameterConstraint.java

@@ -1,6 +1,3 @@
- 
-package org.alfresco.module.org_alfresco_module_rm.action.constraint;
-
 /*
  * #%L
  * Alfresco Records Management Module
@@ -28,6 +25,7 @@ package org.alfresco.module.org_alfresco_module_rm.action.constraint;
  * #L%
  */
 
+package org.alfresco.module.org_alfresco_module_rm.action.constraint;
 
 import java.util.HashMap;
 import java.util.Map;

rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/action/dm/CreateRecordAction.java

@@ -1,6 +1,3 @@
- 
-package org.alfresco.module.org_alfresco_module_rm.action.dm;
-
 /*
  * #%L
  * Alfresco Records Management Module
@@ -28,6 +25,7 @@ package org.alfresco.module.org_alfresco_module_rm.action.dm;
  * #L%
  */
 
+package org.alfresco.module.org_alfresco_module_rm.action.dm;
 
 import java.util.List;
 

rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/action/dm/DeclareAsVersionRecordAction.java

@@ -1,6 +1,3 @@
- 
-package org.alfresco.module.org_alfresco_module_rm.action.dm;
-
 /*
  * #%L
  * Alfresco Records Management Module
@@ -28,6 +25,7 @@ package org.alfresco.module.org_alfresco_module_rm.action.dm;
  * #L%
  */
 
+package org.alfresco.module.org_alfresco_module_rm.action.dm;
 
 import java.util.List;
 

rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/action/dm/ExecuteScriptAction.java

@@ -1,6 +1,3 @@
- 
-package org.alfresco.module.org_alfresco_module_rm.action.dm;
-
 /*
  * #%L
  * Alfresco Records Management Module
@@ -28,6 +25,7 @@ package org.alfresco.module.org_alfresco_module_rm.action.dm;
  * #L%
  */
 
+package org.alfresco.module.org_alfresco_module_rm.action.dm;
 
 import java.util.List;
 

rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/action/dm/HideRecordAction.java

@@ -1,6 +1,3 @@
- 
-package org.alfresco.module.org_alfresco_module_rm.action.dm;
-
 /*
  * #%L
  * Alfresco Records Management Module
@@ -28,6 +25,7 @@ package org.alfresco.module.org_alfresco_module_rm.action.dm;
  * #L%
  */
 
+package org.alfresco.module.org_alfresco_module_rm.action.dm;
 
 import java.util.List;
 

rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/action/dm/MoveDmRecordAction.java

@@ -1,6 +1,3 @@
- 
-package org.alfresco.module.org_alfresco_module_rm.action.dm;
-
 /*
  * #%L
  * Alfresco Records Management Module
@@ -28,6 +25,7 @@ package org.alfresco.module.org_alfresco_module_rm.action.dm;
  * #L%
  */
 
+package org.alfresco.module.org_alfresco_module_rm.action.dm;
 
 import java.util.List;
 

rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/action/dm/RecordableVersionConfigAction.java

@@ -1,6 +1,3 @@
- 
-package org.alfresco.module.org_alfresco_module_rm.action.dm;
-
 /*
  * #%L
  * Alfresco Records Management Module
@@ -28,6 +25,7 @@ package org.alfresco.module.org_alfresco_module_rm.action.dm;
  * #L%
  */
 
+package org.alfresco.module.org_alfresco_module_rm.action.dm;
 
 import static org.alfresco.model.ContentModel.ASPECT_VERSIONABLE;
 import static org.alfresco.model.ContentModel.TYPE_CONTENT;

rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/action/evaluator/CapabilityConditionEvaluator.java

@@ -1,6 +1,3 @@
- 
-package org.alfresco.module.org_alfresco_module_rm.action.evaluator;
-
 /*
  * #%L
  * Alfresco Records Management Module
@@ -28,6 +25,7 @@ package org.alfresco.module.org_alfresco_module_rm.action.evaluator;
  * #L%
  */
 
+package org.alfresco.module.org_alfresco_module_rm.action.evaluator;
 
 import org.alfresco.module.org_alfresco_module_rm.action.RecordsManagementActionConditionEvaluatorAbstractBase;
 import org.alfresco.module.org_alfresco_module_rm.capability.declarative.CapabilityCondition;

rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/action/evaluator/DelegateActionCondition.java

@@ -1,6 +1,3 @@
- 
-package org.alfresco.module.org_alfresco_module_rm.action.evaluator;
-
 /*
  * #%L
  * Alfresco Records Management Module
@@ -28,6 +25,7 @@ package org.alfresco.module.org_alfresco_module_rm.action.evaluator;
  * #L%
  */
 
+package org.alfresco.module.org_alfresco_module_rm.action.evaluator;
 
 import java.util.List;
 

rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/action/evaluator/DispositionActionRelativePositions.java

@@ -1,6 +1,3 @@
- 
-package org.alfresco.module.org_alfresco_module_rm.action.evaluator;
-
 /*
  * #%L
  * Alfresco Records Management Module
@@ -28,6 +25,7 @@ package org.alfresco.module.org_alfresco_module_rm.action.evaluator;
  * #L%
  */
 
+package org.alfresco.module.org_alfresco_module_rm.action.evaluator;
 
 /**
  * Disposition action relative position enumeration class. <br>

rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/action/evaluator/HasDispositionActionEvaluator.java

@@ -1,6 +1,3 @@
- 
-package org.alfresco.module.org_alfresco_module_rm.action.evaluator;
-
 /*
  * #%L
  * Alfresco Records Management Module
@@ -28,6 +25,7 @@ package org.alfresco.module.org_alfresco_module_rm.action.evaluator;
  * #L%
  */
 
+package org.alfresco.module.org_alfresco_module_rm.action.evaluator;
 
 import java.util.List;
 

rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/action/evaluator/IsKindEvaluator.java

@@ -1,6 +1,3 @@
- 
-package org.alfresco.module.org_alfresco_module_rm.action.evaluator;
-
 /*
  * #%L
  * Alfresco Records Management Module
@@ -28,6 +25,7 @@ package org.alfresco.module.org_alfresco_module_rm.action.evaluator;
  * #L%
  */
 
+package org.alfresco.module.org_alfresco_module_rm.action.evaluator;
 
 import java.util.List;
 

rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/action/evaluator/IsRecordTypeEvaluator.java

@@ -1,6 +1,3 @@
- 
-package org.alfresco.module.org_alfresco_module_rm.action.evaluator;
-
 /*
  * #%L
  * Alfresco Records Management Module
@@ -28,6 +25,7 @@ package org.alfresco.module.org_alfresco_module_rm.action.evaluator;
  * #L%
  */
 
+package org.alfresco.module.org_alfresco_module_rm.action.evaluator;
 
 import java.util.List;
 

rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/action/impl/AddRecordTypeAction.java

@@ -1,6 +1,3 @@
- 
-package org.alfresco.module.org_alfresco_module_rm.action.impl;
-
 /*
  * #%L
  * Alfresco Records Management Module
@@ -28,6 +25,7 @@ package org.alfresco.module.org_alfresco_module_rm.action.impl;
  * #L%
  */
 
+package org.alfresco.module.org_alfresco_module_rm.action.impl;
 
 import java.util.List;
 

rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/action/impl/ApplyCustomTypeAction.java

@@ -1,6 +1,3 @@
- 
-package org.alfresco.module.org_alfresco_module_rm.action.impl;
-
 /*
  * #%L
  * Alfresco Records Management Module
@@ -28,6 +25,7 @@ package org.alfresco.module.org_alfresco_module_rm.action.impl;
  * #L%
  */
 
+package org.alfresco.module.org_alfresco_module_rm.action.impl;
 
 import java.io.Serializable;
 import java.util.ArrayList;

rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/action/impl/BroadcastDispositionActionDefinitionUpdateAction.java

@@ -1,6 +1,3 @@
- 
-package org.alfresco.module.org_alfresco_module_rm.action.impl;
-
 /*
  * #%L
  * Alfresco Records Management Module
@@ -28,6 +25,7 @@ package org.alfresco.module.org_alfresco_module_rm.action.impl;
  * #L%
  */
 
+package org.alfresco.module.org_alfresco_module_rm.action.impl;
 
 import java.io.Serializable;
 import java.util.ArrayList;

rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/action/impl/CloseRecordFolderAction.java

@@ -1,6 +1,3 @@
- 
-package org.alfresco.module.org_alfresco_module_rm.action.impl;
-
 /*
  * #%L
  * Alfresco Records Management Module
@@ -28,6 +25,7 @@ package org.alfresco.module.org_alfresco_module_rm.action.impl;
  * #L%
  */
 
+package org.alfresco.module.org_alfresco_module_rm.action.impl;
 
 import org.alfresco.module.org_alfresco_module_rm.action.RMActionExecuterAbstractBase;
 import org.alfresco.repo.security.authentication.AuthenticationUtil;

rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/action/impl/CompleteEventAction.java

@@ -1,6 +1,3 @@
- 
-package org.alfresco.module.org_alfresco_module_rm.action.impl;
-
 /*
  * #%L
  * Alfresco Records Management Module
@@ -28,6 +25,7 @@ package org.alfresco.module.org_alfresco_module_rm.action.impl;
  * #L%
  */
 
+package org.alfresco.module.org_alfresco_module_rm.action.impl;
 
 import java.util.Date;
 import java.util.List;

rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/action/impl/CopyMoveLinkFileToBaseAction.java

@@ -1,5 +1,3 @@
-package org.alfresco.module.org_alfresco_module_rm.action.impl;
-
 /*
  * #%L
  * Alfresco Records Management Module
@@ -27,6 +25,7 @@ package org.alfresco.module.org_alfresco_module_rm.action.impl;
  * #L%
  */
 
+package org.alfresco.module.org_alfresco_module_rm.action.impl;
 
 import java.util.Arrays;
 import java.util.List;

rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/action/impl/CopyToAction.java

@@ -1,5 +1,3 @@
-package org.alfresco.module.org_alfresco_module_rm.action.impl;
-
 /*
  * #%L
  * Alfresco Records Management Module
@@ -27,6 +25,7 @@ package org.alfresco.module.org_alfresco_module_rm.action.impl;
  * #L%
  */
 
+package org.alfresco.module.org_alfresco_module_rm.action.impl;
 
 /**
  * File To action implementation.

rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/action/impl/CreateDispositionScheduleAction.java

@@ -1,6 +1,3 @@
- 
-package org.alfresco.module.org_alfresco_module_rm.action.impl;
-
 /*
  * #%L
  * Alfresco Records Management Module
@@ -28,6 +25,7 @@ package org.alfresco.module.org_alfresco_module_rm.action.impl;
  * #L%
  */
 
+package org.alfresco.module.org_alfresco_module_rm.action.impl;
 
 import org.alfresco.error.AlfrescoRuntimeException;
 import org.alfresco.module.org_alfresco_module_rm.action.RMActionExecuterAbstractBase;

rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/action/impl/CutOffAction.java

@@ -1,6 +1,3 @@
- 
-package org.alfresco.module.org_alfresco_module_rm.action.impl;
-
 /*
  * #%L
  * Alfresco Records Management Module
@@ -28,6 +25,7 @@ package org.alfresco.module.org_alfresco_module_rm.action.impl;
  * #L%
  */
 
+package org.alfresco.module.org_alfresco_module_rm.action.impl;
 
 import org.alfresco.error.AlfrescoRuntimeException;
 import org.alfresco.module.org_alfresco_module_rm.action.RMDispositionActionExecuterAbstractBase;

rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/action/impl/DeclareRecordAction.java

@@ -1,6 +1,3 @@
- 
-package org.alfresco.module.org_alfresco_module_rm.action.impl;
-
 /*
  * #%L
  * Alfresco Records Management Module
@@ -28,6 +25,7 @@ package org.alfresco.module.org_alfresco_module_rm.action.impl;
  * #L%
  */
 
+package org.alfresco.module.org_alfresco_module_rm.action.impl;
 
 import java.io.Serializable;
 import java.util.ArrayList;

rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/action/impl/DelegateAction.java

@@ -1,6 +1,3 @@
- 
-package org.alfresco.module.org_alfresco_module_rm.action.impl;
-
 /*
  * #%L
  * Alfresco Records Management Module
@@ -28,6 +25,7 @@ package org.alfresco.module.org_alfresco_module_rm.action.impl;
  * #L%
  */
 
+package org.alfresco.module.org_alfresco_module_rm.action.impl;
 
 import java.util.List;
 

rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/action/impl/DeleteHoldAction.java

@@ -1,6 +1,3 @@
- 
-package org.alfresco.module.org_alfresco_module_rm.action.impl;
-
 /*
  * #%L
  * Alfresco Records Management Module
@@ -28,6 +25,7 @@ package org.alfresco.module.org_alfresco_module_rm.action.impl;
  * #L%
  */
 
+package org.alfresco.module.org_alfresco_module_rm.action.impl;
 
 import org.alfresco.error.AlfrescoRuntimeException;
 import org.alfresco.module.org_alfresco_module_rm.action.RMActionExecuterAbstractBase;

rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/action/impl/DestroyAction.java

@@ -1,6 +1,3 @@
- 
-package org.alfresco.module.org_alfresco_module_rm.action.impl;
-
 /*
  * #%L
  * Alfresco Records Management Module
@@ -28,6 +25,7 @@ package org.alfresco.module.org_alfresco_module_rm.action.impl;
  * #L%
  */
 
+package org.alfresco.module.org_alfresco_module_rm.action.impl;
 
 import java.io.Serializable;
 import java.util.Collections;

rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/action/impl/EditDispositionActionAsOfDateAction.java

@@ -1,6 +1,3 @@
- 
-package org.alfresco.module.org_alfresco_module_rm.action.impl;
-
 /*
  * #%L
  * Alfresco Records Management Module
@@ -28,6 +25,7 @@ package org.alfresco.module.org_alfresco_module_rm.action.impl;
  * #L%
  */
 
+package org.alfresco.module.org_alfresco_module_rm.action.impl;
 
 import java.util.Date;
 

rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/action/impl/EditHoldReasonAction.java

@@ -1,6 +1,3 @@
- 
-package org.alfresco.module.org_alfresco_module_rm.action.impl;
-
 /*
  * #%L
  * Alfresco Records Management Module
@@ -28,6 +25,7 @@ package org.alfresco.module.org_alfresco_module_rm.action.impl;
  * #L%
  */
 
+package org.alfresco.module.org_alfresco_module_rm.action.impl;
 
 import org.alfresco.error.AlfrescoRuntimeException;
 import org.alfresco.module.org_alfresco_module_rm.action.RMActionExecuterAbstractBase;

rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/action/impl/EditReviewAsOfDateAction.java

@@ -1,6 +1,3 @@
- 
-package org.alfresco.module.org_alfresco_module_rm.action.impl;
-
 /*
  * #%L
  * Alfresco Records Management Module
@@ -28,6 +25,7 @@ package org.alfresco.module.org_alfresco_module_rm.action.impl;
  * #L%
  */
 
+package org.alfresco.module.org_alfresco_module_rm.action.impl;
 
 import java.util.Date;
 

rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/action/impl/FileReportAction.java

@@ -1,6 +1,3 @@
- 
-package org.alfresco.module.org_alfresco_module_rm.action.impl;
-
 /*
  * #%L
  * Alfresco Records Management Module
@@ -28,6 +25,7 @@ package org.alfresco.module.org_alfresco_module_rm.action.impl;
  * #L%
  */
 
+package org.alfresco.module.org_alfresco_module_rm.action.impl;
 
 import org.alfresco.error.AlfrescoRuntimeException;
 import org.alfresco.model.ContentModel;

rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/action/impl/FileToAction.java

@@ -1,5 +1,3 @@
-package org.alfresco.module.org_alfresco_module_rm.action.impl;
-
 /*
  * #%L
  * Alfresco Records Management Module
@@ -27,6 +25,7 @@ package org.alfresco.module.org_alfresco_module_rm.action.impl;
  * #L%
  */
 
+package org.alfresco.module.org_alfresco_module_rm.action.impl;
 
 /**
  * File To action implementation.

rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/action/impl/FreezeAction.java

@@ -1,6 +1,3 @@
- 
-package org.alfresco.module.org_alfresco_module_rm.action.impl;
-
 /*
  * #%L
  * Alfresco Records Management Module
@@ -28,6 +25,7 @@ package org.alfresco.module.org_alfresco_module_rm.action.impl;
  * #L%
  */
 
+package org.alfresco.module.org_alfresco_module_rm.action.impl;
 
 import java.util.List;
 

rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/action/impl/LinkToAction.java

@@ -1,5 +1,3 @@
-package org.alfresco.module.org_alfresco_module_rm.action.impl;
-
 /*
  * #%L
  * Alfresco Records Management Module
@@ -27,6 +25,7 @@ package org.alfresco.module.org_alfresco_module_rm.action.impl;
  * #L%
  */
 
+package org.alfresco.module.org_alfresco_module_rm.action.impl;
 
 /**
  * Link To action implementation.

rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/action/impl/MoveToAction.java

@@ -1,5 +1,3 @@
-package org.alfresco.module.org_alfresco_module_rm.action.impl;
-
 /*
  * #%L
  * Alfresco Records Management Module
@@ -27,6 +25,7 @@ package org.alfresco.module.org_alfresco_module_rm.action.impl;
  * #L%
  */
 
+package org.alfresco.module.org_alfresco_module_rm.action.impl;
 
 /**
  * File To action implementation.

rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/action/impl/OpenRecordFolderAction.java

@@ -1,6 +1,3 @@
- 
-package org.alfresco.module.org_alfresco_module_rm.action.impl;
-
 /*
  * #%L
  * Alfresco Records Management Module
@@ -28,6 +25,7 @@ package org.alfresco.module.org_alfresco_module_rm.action.impl;
  * #L%
  */
 
+package org.alfresco.module.org_alfresco_module_rm.action.impl;
 
 import org.alfresco.model.ContentModel;
 import org.alfresco.module.org_alfresco_module_rm.action.RMActionExecuterAbstractBase;

rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/action/impl/RejectAction.java

@@ -1,6 +1,3 @@
- 
-package org.alfresco.module.org_alfresco_module_rm.action.impl;
-
 /*
  * #%L
  * Alfresco Records Management Module
@@ -28,6 +25,7 @@ package org.alfresco.module.org_alfresco_module_rm.action.impl;
  * #L%
  */
 
+package org.alfresco.module.org_alfresco_module_rm.action.impl;
 
 import java.util.List;
 

rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/action/impl/RelinquishHoldAction.java

@@ -1,6 +1,3 @@
- 
-package org.alfresco.module.org_alfresco_module_rm.action.impl;
-
 /*
  * #%L
  * Alfresco Records Management Module
@@ -28,6 +25,7 @@ package org.alfresco.module.org_alfresco_module_rm.action.impl;
  * #L%
  */
 
+package org.alfresco.module.org_alfresco_module_rm.action.impl;
 
 import org.alfresco.error.AlfrescoRuntimeException;
 import org.alfresco.module.org_alfresco_module_rm.action.RMActionExecuterAbstractBase;

rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/action/impl/RequestInfoAction.java

@@ -1,6 +1,3 @@
- 
-package org.alfresco.module.org_alfresco_module_rm.action.impl;
-
 /*
  * #%L
  * Alfresco Records Management Module
@@ -28,6 +25,7 @@ package org.alfresco.module.org_alfresco_module_rm.action.impl;
  * #L%
  */
 
+package org.alfresco.module.org_alfresco_module_rm.action.impl;
 
 import java.io.Serializable;
 import java.util.ArrayList;

rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/action/impl/RetainAction.java

@@ -1,6 +1,3 @@
- 
-package org.alfresco.module.org_alfresco_module_rm.action.impl;
-
 /*
  * #%L
  * Alfresco Records Management Module
@@ -28,6 +25,7 @@ package org.alfresco.module.org_alfresco_module_rm.action.impl;
  * #L%
  */
 
+package org.alfresco.module.org_alfresco_module_rm.action.impl;
 
 import org.alfresco.module.org_alfresco_module_rm.action.RMDispositionActionExecuterAbstractBase;
 import org.alfresco.service.cmr.action.Action;

rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/action/impl/SplitEmailAction.java

@@ -1,6 +1,3 @@
- 
-package org.alfresco.module.org_alfresco_module_rm.action.impl;
-
 /*
  * #%L
  * Alfresco Records Management Module
@@ -28,6 +25,7 @@ package org.alfresco.module.org_alfresco_module_rm.action.impl;
  * #L%
  */
 
+package org.alfresco.module.org_alfresco_module_rm.action.impl;
 
 import static org.apache.commons.lang.StringUtils.isBlank;
 

rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/action/impl/TransferAction.java

@@ -1,6 +1,3 @@
- 
-package org.alfresco.module.org_alfresco_module_rm.action.impl;
-
 /*
  * #%L
  * Alfresco Records Management Module
@@ -28,6 +25,7 @@ package org.alfresco.module.org_alfresco_module_rm.action.impl;
  * #L%
  */
 
+package org.alfresco.module.org_alfresco_module_rm.action.impl;
 
 import org.alfresco.module.org_alfresco_module_rm.action.RMDispositionActionExecuterAbstractBase;
 import org.alfresco.module.org_alfresco_module_rm.transfer.TransferService;

rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/action/impl/TransferCompleteAction.java

@@ -1,6 +1,3 @@
- 
-package org.alfresco.module.org_alfresco_module_rm.action.impl;
-
 /*
  * #%L
  * Alfresco Records Management Module
@@ -28,6 +25,7 @@ package org.alfresco.module.org_alfresco_module_rm.action.impl;
  * #L%
  */
 
+package org.alfresco.module.org_alfresco_module_rm.action.impl;
 
 import org.alfresco.error.AlfrescoRuntimeException;
 import org.alfresco.module.org_alfresco_module_rm.action.RMActionExecuterAbstractBase;

rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/action/impl/UnCutoffAction.java

@@ -1,6 +1,3 @@
- 
-package org.alfresco.module.org_alfresco_module_rm.action.impl;
-
 /*
  * #%L
  * Alfresco Records Management Module
@@ -28,6 +25,7 @@ package org.alfresco.module.org_alfresco_module_rm.action.impl;
  * #L%
  */
 
+package org.alfresco.module.org_alfresco_module_rm.action.impl;
 
 import java.util.List;
 

rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/action/impl/UndeclareRecordAction.java

@@ -1,6 +1,3 @@
- 
-package org.alfresco.module.org_alfresco_module_rm.action.impl;
-
 /*
  * #%L
  * Alfresco Records Management Module
@@ -28,6 +25,7 @@ package org.alfresco.module.org_alfresco_module_rm.action.impl;
  * #L%
  */
 
+package org.alfresco.module.org_alfresco_module_rm.action.impl;
 
 import org.alfresco.module.org_alfresco_module_rm.action.RMActionExecuterAbstractBase;
 import org.alfresco.service.cmr.action.Action;

rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/action/impl/UndoEventAction.java

@@ -1,6 +1,3 @@
- 
-package org.alfresco.module.org_alfresco_module_rm.action.impl;
-
 /*
  * #%L
  * Alfresco Records Management Module
@@ -28,6 +25,7 @@ package org.alfresco.module.org_alfresco_module_rm.action.impl;
  * #L%
  */
 
+package org.alfresco.module.org_alfresco_module_rm.action.impl;
 
 import java.util.List;
 

rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/action/impl/UnfreezeAction.java

@@ -1,6 +1,3 @@
- 
-package org.alfresco.module.org_alfresco_module_rm.action.impl;
-
 /*
  * #%L
  * Alfresco Records Management Module
@@ -28,6 +25,7 @@ package org.alfresco.module.org_alfresco_module_rm.action.impl;
  * #L%
  */
 
+package org.alfresco.module.org_alfresco_module_rm.action.impl;
 
 import org.alfresco.module.org_alfresco_module_rm.action.RMActionExecuterAbstractBase;
 import org.alfresco.service.cmr.action.Action;

rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/action/impl/UnlinkFromAction.java

@@ -1,6 +1,3 @@
- 
-package org.alfresco.module.org_alfresco_module_rm.action.impl;
-
 /*
  * #%L
  * Alfresco Records Management Module
@@ -28,6 +25,7 @@ package org.alfresco.module.org_alfresco_module_rm.action.impl;
  * #L%
  */
 
+package org.alfresco.module.org_alfresco_module_rm.action.impl;
 
 import org.alfresco.error.AlfrescoRuntimeException;
 import org.alfresco.model.ContentModel;