Merged HEAD to DEV/caveatmarkdatatype:

114610: Merged BRANCHES/V2.3 to HEAD:
        114007: (RECORD ONLY) ACE-4390 ([RM] Unable to Add User/Group to files / folders - form does not open)
   114659: Removed warnings
   114660: RM-2669 (Spike: Investigate RM Enterprise approach)
   114661: RM-2669 (Spike: Investigate RM Enterprise approach)
   114662: RM-2669 (Spike: Investigate RM Enterprise approach)
   114676: Updated Alfresco dependency to 5.1.b-EA
   114677: Updated the svn:ignore list
   114678: Removed a workaround which was causing problems with 5.1.a-EA
   114680: Deleted .ant-targets-build.xml from the code base
   114681: Added .ant-targets-build.xml to svn:ignore list
   114685: Removed warnings
   114777: RM-2394 Created another user with ALFRESCO_ADMINISTRATORS role to check that it wouldn't have its security clearance editable. Created EditUserPage class that would allow the editing of users profiles on the UI (especially the adding to a Alfresco group). Changed the test "adminIsNotShown" name to adminSecurityClearanceIsNotEditable to be more accurate what is really tested.
   114791: RM-2702 (RM HEAD does not work with Alfresco 5.1.b-EA)
   114809: RM-2702 (RM HEAD does not work with Alfresco 5.1.b-EA)
   114827: RM-2394 Review RM.
   114903: Merged V2.3 to HEAD
        114902: Merged V2.2 to V2.3
           114900: Merged V2.2.1.x (2.2.1.3) to V2.2
              114608: Merged DEV to V2.2.1.x
                 114604: MNT-14900 : Alfresco doesn't work with Records Management
                    - Fixed the circular reference problem from Spring config xml using NonBlockingLazyInitTargetSource
   114912: Merged V2.3 to HEAD
        114905: Merged V2.2 to V2.3
           114786: RM-2391 : The Audit Log GET requests have to verify first which user is logged in and to which data it has access.
              - Implemented final fix and added a unit test.
   114922: Merged BRANCHES/V2.3 to HEAD:
        114921: Merged BRANCHES/V2.2 to BRANCHES/V2.3:
             114258: RM-2522 : Select "Download Zip" (rm-download-zip) on RM Transfer Target inside RM Transfer view throws 400 Bad Request: Node is not fileplan
                  - used isFilePlan method from FilePlanService instead of old check
             114917: Merged BRANCHES/V2.2.1.x to BRANCHES/V2.2:
                  114437: Merged DEV to V2.2.1.x
                       114241: MNT-14900 : Alfresco doesn't work with Records Management
                          - Fixed problem with circular references during Spring dependency injection process
                  114605: Reverse merged V2.2.1.x
                             <<< Need to use a different approach. >>>
                             Merged DEV to V2.2.1.x
                                114241: MNT-14900 : Alfresco doesn't work with Records Management
                                   - Fixed problem with circular references during Spring dependency injection process
                  114609: (RECORD ONLY) Update version to 2.2.1.3
                  114687: (RECORD ONLY) Updated version to 2.2.1.3 and dependency.share.po.version to 4.2.5-SNAPSHOT in pom.xml files
   115015: Added some info why we override a managed version of a dependency
   115087: RM-2693 (Create RM Enterprise server AMP)



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

rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/audit/RecordsManagementAuditServiceImpl.java

@@ -921,7 +921,7 @@ public class RecordsManagementAuditServiceImpl extends AbstractLifecycleBean
                     return true;
                 }
                 
-                if( nodeRef != null &&
+                if(nodeRef != null && nodeService.exists(nodeRef) &&
                     !AccessStatus.ALLOWED.equals(
                         capabilityService.getCapabilityAccessState(nodeRef, ACCESS_AUDIT_CAPABILITY)))
                 {

rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/referredmetadata/ReferralAdminServiceImpl.java

@@ -128,19 +128,6 @@ public class ReferralAdminServiceImpl implements ReferralAdminService
         return metadataReferral;
     }
 
-    /** Gets the {@link MetadataReferral} which uses the specified {@code assocType}. */
-    private MetadataReferral getReferralForAssociation(QName assocType)
-    {
-        final MetadataReferral metadataReferral = registry.getReferralForAssociation(assocType);
-
-        if (metadataReferral == null)
-        {
-            throw new IllegalArgumentException("No " + MetadataReferral.class.getSimpleName() +
-                                               " configured for assocType " + assocType);
-        }
-        return metadataReferral;
-    }
-
     @Override public MetadataReferral detachReferrer(NodeRef referrer, QName aspectName)
     {
         final MetadataReferral referral = registry.getReferralForAspect(aspectName);

rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/referredmetadata/ReferredMetadataException.java

@@ -31,12 +31,16 @@ import java.util.List;
  */
 public class ReferredMetadataException extends AlfrescoRuntimeException
 {
+    private static final long serialVersionUID = -6059777070036571486L;
+
     public ReferredMetadataException(String msgId)                  { super(msgId); }
     public ReferredMetadataException(String msgId, Throwable cause) { super(msgId, cause); }
 
     /** This exception may be thrown when a {@link MetadataReferral} was incorrectly initialised. */
     public static class InvalidMetadataReferral extends ReferredMetadataException
     {
+        private static final long serialVersionUID = 8507076314709440295L;
+
         public InvalidMetadataReferral(String msgId)
         {
             super(msgId);
@@ -46,6 +50,8 @@ public class ReferredMetadataException extends AlfrescoRuntimeException
     /** This exception may be thrown when a {@link MetadataReferral} already exists. */
     public static class MetadataReferralAlreadyExists extends ReferredMetadataException
     {
+        private static final long serialVersionUID = 8119954252195817706L;
+
         private final MetadataReferral metadataReferral;
 
         public MetadataReferralAlreadyExists(String msgId, MetadataReferral metadataReferral)
@@ -53,11 +59,18 @@ public class ReferredMetadataException extends AlfrescoRuntimeException
             super(msgId);
             this.metadataReferral = metadataReferral;
         }
+
+        public MetadataReferral getMetadataReferral()
+        {
+            return this.metadataReferral;
+        }
     }
 
     /** A {@link MetadataReferral} has not been found. */
     public static class MetadataReferralNotFound extends ReferredMetadataException
     {
+        private static final long serialVersionUID = 8648089074801662142L;
+
         public MetadataReferralNotFound(String msgId)
         {
             super(msgId);
@@ -67,6 +80,8 @@ public class ReferredMetadataException extends AlfrescoRuntimeException
     /** A referent Node has not been found. */
     public static class ReferentNodeNotFound extends ReferredMetadataException
     {
+        private static final long serialVersionUID = -6003487925958374458L;
+
         public ReferentNodeNotFound(String msgId)
         {
             super(msgId);
@@ -76,6 +91,8 @@ public class ReferredMetadataException extends AlfrescoRuntimeException
     /** Exception to report that chains of metadata referral are not currently supported. */
     public static class ChainedMetadataReferralUnsupported extends ReferredMetadataException
     {
+        private static final long serialVersionUID = -2293262325447442964L;
+
         private final List<NodeRef> existingReferrers;
 
         public ChainedMetadataReferralUnsupported(String msgId, List<NodeRef> existingReferrers)
@@ -101,6 +118,8 @@ public class ReferredMetadataException extends AlfrescoRuntimeException
     /** Exception to report that metadata referral is not supported for metadata defined on content types. */
     public static class TypeMetadataReferralUnsupported extends ReferredMetadataException
     {
+        private static final long serialVersionUID = 7498707640089715503L;
+
         public TypeMetadataReferralUnsupported(String msgId)
         {
             super(msgId);

rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/script/BaseTransferWebScript.java

@@ -104,7 +104,7 @@ public abstract class BaseTransferWebScript extends StreamACP
             }
 
             // ensure the node is a filePlan object
-            if (!TYPE_FILE_PLAN.equals(this.nodeService.getType(filePlan)))
+            if (!filePlanService.isFilePlan(filePlan))
             {
                 status.setCode(HttpServletResponse.SC_BAD_REQUEST,
                             "Node " + filePlan.toString() + " is not a file plan");