Merged V2.1 to HEAD:\

59208: RM-1115: Manage Rules action is available for a Frozen folder - Added condition that manage rules isn't shown for frozen folders
   59343: RM-1114: 'Loading the Document Library' message is displayed on a New Rule page in RM Site - Added appropriate message.loading properties to all languages for rule-details.get and rule-edit.get where this message is used
   59361: RM-1105: Adding the RM module causes exceptions when listing the existing audit applications through the audit webscript - Added a try/catch for a ClassCastException around the check to see if the returned object contained a PROP_HOLD_REASON in the RMAfterInvocationProvider. The reason for this is that the containsKeys method will throw a class cast exception if we attempt to see if the keys contain an instance of QName if the returnedObject instance is a TreeMap containing strings as is the case when listing the audit applications through the RESTful interface.
   59510: RM-1087: Increase default max number of site pages to 5 instead of 3 - Increased default maximum number of sites pages to 5 in rm-share-config.xml. This threw up an issue in the code that adds the RM Console widget so fixed that too. Important test case for this are that the number of widgets added to the site are smaller than, equal to and greater than the maximum displayed to ensure that the code adding the RM console is fully exercised.
   60429: RM-1162: CLONE - Alfresco 4.2.1 could not start with RM module
       * see MNT-10259
   60430: RM-1162: CLONE - Alfresco 4.2.1 could not start with RM module
       * see MNT-10259
       * missed files
   60431: RM-1162: CLONE - Alfresco 4.2.1 could not start with RM module
       * failing tests
       * see MNT-10259
   60478: RM-1174 (Unable to view record details)
   60698: RM-1175: Internal Error on details page of category/folder/record
   60699: RM-1177: User's name link on User Rights Report page directs to Admin Console instead of User Profile Page
   60700: RM-1176: Couldn't load email mappings
   61227: RM-1164: RM 2.1.1 core language bundle refresh
   62414: RM-1165 (RM 2.1.1 translation into Simplified Chineese)



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

rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/util/BaseRMTestCase.java

@@ -102,9 +102,6 @@ public abstract class BaseRMTestCase extends RetryingTransactionHelperTestCase
     protected QName ASPECT_CUSTOM_ASPECT = QName.createQName(URI, "customAspect");
     protected QName ASPECT_RECORD_META_DATA = QName.createQName(URI, "recordMetaData");
 
-    /** site id's */
-    protected static final String COLLABORATION_SITE_ID = "collab-site-id";
-
     /** Common test utils */
     protected CommonRMTestUtils utils;
 
@@ -161,6 +158,7 @@ public abstract class BaseRMTestCase extends RetryingTransactionHelperTestCase
     protected DispositionSchedule dispositionSchedule;
     protected NodeRef rmFolder;
     protected NodeRef unfiledContainer;
+    protected String collabSiteId;
 
     /** multi-hierarchy test data
      *
@@ -452,9 +450,9 @@ public abstract class BaseRMTestCase extends RetryingTransactionHelperTestCase
             }
 
             // delete the collaboration site (if required)
-            if (isCollaborationSiteTest() == true && siteService.getSite(COLLABORATION_SITE_ID) != null)
+            if (isCollaborationSiteTest() == true && siteService.getSite(collabSiteId) != null)
             {
-                siteService.deleteSite(COLLABORATION_SITE_ID);
+                siteService.deleteSite(collabSiteId);
             }
         }
         finally
@@ -739,9 +737,10 @@ public abstract class BaseRMTestCase extends RetryingTransactionHelperTestCase
     protected void setupCollaborationSiteTestDataImpl()
     {
         // create collaboration site
-        collaborationSite = siteService.createSite("preset", COLLABORATION_SITE_ID, "title", "description", SiteVisibility.PRIVATE);
+        collabSiteId = GUID.generate();
+        collaborationSite = siteService.createSite("preset", collabSiteId, "title", "description", SiteVisibility.PRIVATE);
         documentLibrary = SiteServiceImpl.getSiteContainer(
-                COLLABORATION_SITE_ID,
+                collabSiteId,
                 SiteService.DOCUMENT_LIBRARY,
                 true,
                 siteService,
@@ -756,11 +755,11 @@ public abstract class BaseRMTestCase extends RetryingTransactionHelperTestCase
 
         dmConsumer = GUID.generate();
         dmConsumerNodeRef = createPerson(dmConsumer);
-        siteService.setMembership(COLLABORATION_SITE_ID, dmConsumer, SiteModel.SITE_CONSUMER);
+        siteService.setMembership(collabSiteId, dmConsumer, SiteModel.SITE_CONSUMER);
 
         dmCollaborator = GUID.generate();
         dmCollaboratorNodeRef = createPerson(dmCollaborator);
-        siteService.setMembership(COLLABORATION_SITE_ID, dmCollaborator, SiteModel.SITE_COLLABORATOR);
+        siteService.setMembership(collabSiteId, dmCollaborator, SiteModel.SITE_COLLABORATOR);
     }
 
     /**

rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/util/BaseRMWebScriptTestCase.java

@@ -72,9 +72,6 @@ import org.springframework.context.ApplicationContext;
  */
 public class BaseRMWebScriptTestCase extends BaseWebScriptTest
 {
-    /** Collab site id */
-    protected static final String COLLAB_SITE_ID = "myCollabSite";
-
 	/** Common test utils */
 	protected CommonRMTestUtils utils;
 
@@ -123,6 +120,7 @@ public class BaseRMWebScriptTestCase extends BaseWebScriptTest
     protected DispositionSchedule dispositionSchedule;
     protected NodeRef recordFolder;
     protected NodeRef recordFolder2;
+    protected String collabSiteId;
 
     /**
      * Indicates whether the test collaboration site should be created
@@ -222,7 +220,7 @@ public class BaseRMWebScriptTestCase extends BaseWebScriptTest
         // Delete the collaboration site (if required)
         if (isCollaborationSiteTest() == true)
         {
-            siteService.deleteSite(COLLAB_SITE_ID);
+            siteService.deleteSite(collabSiteId);
         }
     }
 
@@ -328,9 +326,10 @@ public class BaseRMWebScriptTestCase extends BaseWebScriptTest
     protected void setupCollaborationSiteTestDataImpl()
     {
         // create collaboration site
-        siteService.createSite("preset", COLLAB_SITE_ID, "title", "description", SiteVisibility.PRIVATE);
+        collabSiteId = GUID.generate();
+        siteService.createSite("preset", collabSiteId, "title", "description", SiteVisibility.PRIVATE);
         NodeRef documentLibrary = SiteServiceImpl.getSiteContainer(
-                COLLAB_SITE_ID,
+                collabSiteId,
                 SiteService.DOCUMENT_LIBRARY,
                 true,
                 siteService,

rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/webscript/RmClassesRestApiTest.java

@@ -88,7 +88,7 @@ public class RmClassesRestApiTest extends BaseRMWebScriptTestCase
         // Get the list of dm aspects and check them. It also contains rm related aspects.
 
         // Format url and send request
-        url = String.format(RM_ASPECTS_URL, "aspect", COLLAB_SITE_ID);
+        url = String.format(RM_ASPECTS_URL, "aspect", collabSiteId);
         response = sendRequest(new GetRequest(url), Status.STATUS_OK);
 
         // Check the content from the response

rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/webscript/RmPropertiesRestApiTest.java

@@ -88,7 +88,7 @@ public class RmPropertiesRestApiTest extends BaseRMWebScriptTestCase
         // Get the list of dm types and check them. It also contains rm related types.
 
         // Format url and send request
-        url = String.format(RM_TYPES_URL, "type", COLLAB_SITE_ID);
+        url = String.format(RM_TYPES_URL, "type", collabSiteId);
         response = sendRequest(new GetRequest(url), Status.STATUS_OK);
 
         // Check the content from the response