inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-08-07 17:49:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)

Browse Source 
59267: Merged V4.2-BUG-FIX (4.2.1) to HEAD-BUG-FIX (4.3/Cloud)
      59266: Reverse Merge attempt at merging from V4.1-BUG-FIX (will do it again)
         AND record only merge the original commits 59231,59239 and reverse merge 59262 that took place on V4.1-BUG-FIX   
         59237: Merged V4.1-BUG-FIX (4.1.8) to V4.2-BUG-FIX (4.2.1)
            59231: MNT-10237: Merged V4.1.6 (4.1.6.4) to V4.1-BUG-FIX (4.1.8)
               58895: MNT-10109: Merged DEV to PATCHES/V4.1.6 (4.1.6.4)
                  58855: MNT-10109: Permissions are not restored when a deleted site is recovered from the trashcan
                     - Fix unit tests failure by purging archived sites. Forbid new site creation if site group already exists.
                  58871: MNT-10109: Permissions are not restored when a deleted site is recovered from the trashcan
                     - Return beforePurgeNode callback binding to Site class.
               58947: MNT-10109: PATCHES/V4.1.6 (4.1.6.4)
                  58946: MNT-10109: Permissions are not restored when a deleted site is recovered from the trashcan
                     - Fix test failures by purging deleted sites from trashcan so that sitename can be reused. Change SiteServiceImplTest to avoid database deadlock.
               58949: MNT-10109: PATCHES/V4.1.6 (4.1.6.4)
                  58948: MNT-10109: Permissions are not restored when a deleted site is recovered from the trashcan
                     - Fix test failures by purging deleted sites from trashcan so that sitename can be reused.
         59240: Merged V4.1-BUG-FIX (4.1.8) to V4.2-BUG-FIX (4.2.1)
            59239: MNT-10237: Permissions are not restored when a deleted site is recovered from the trashcan
               - The merge of the HF commit on 4.1.6 removed a variable that was not being used, but
                 was being used in later versions.
         59241: MNT-10237: Permissions are not restored when a deleted site is recovered from the trashcan
            - Correct error in merge from V4.1-BUG-FIX to V4.2-BUG-FIX


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@62124 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Alan Davis
2014-02-12 01:23:12 +00:00
parent 526725db7d
commit dd04a7ebfa
12 changed files with 31 additions and 101 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
source/test-java/org/alfresco/repo/activities/AbstractSiteActivityTest.java
View File

@@ -28,7 +28,6 @@ import org.alfresco.repo.activities.feed.FeedGenerator;
import org.alfresco.repo.activities.feed.local.LocalFeedTaskProcessor;
import org.alfresco.repo.activities.post.lookup.PostLookup;
import org.alfresco.repo.management.subsystems.ChildApplicationContextFactory;
import org.alfresco.repo.node.archive.NodeArchiveService;
import org.alfresco.repo.security.authentication.AuthenticationUtil;
import org.alfresco.repo.security.permissions.AccessDeniedException;
import org.alfresco.repo.site.SiteModel;
@@ -36,7 +35,6 @@ import org.alfresco.service.cmr.activities.ActivityService;
import org.alfresco.service.cmr.activities.FeedControl;
import org.alfresco.service.cmr.security.MutableAuthenticationService;
import org.alfresco.service.cmr.security.PersonService;
import org.alfresco.service.cmr.site.SiteInfo;
import org.alfresco.service.cmr.site.SiteService;
import org.alfresco.service.cmr.site.SiteVisibility;
import org.alfresco.util.ApplicationContextHelper;
@@ -67,7 +65,6 @@ public abstract class AbstractSiteActivityTest
private PersonService personService;
private PostLookup postLookup;
private FeedGenerator feedGenerator;
private NodeArchiveService nodeArchiveService;
//
// Test config & data
@@ -119,7 +116,6 @@ public abstract class AbstractSiteActivityTest
this.siteService = (SiteService)applicationContext.getBean("SiteService");
this.authenticationService = (MutableAuthenticationService)applicationContext.getBean("AuthenticationService");
this.personService = (PersonService)applicationContext.getBean("PersonService");
this.nodeArchiveService = (NodeArchiveService)applicationContext.getBean("nodeArchiveService");
LocalFeedTaskProcessor feedProcessor = null;
@@ -200,13 +196,23 @@ public abstract class AbstractSiteActivityTest
protected void deleteSite(String siteId) throws Exception
{
SiteInfo siteInfo = siteService.getSite(siteId);
if (siteInfo != null)
{
// delete site (and site's associated groups)
siteService.deleteSite(siteId);
nodeArchiveService.purgeArchivedNode(nodeArchiveService.getArchivedNode(siteInfo.getNodeRef()));
}
// delete site (and site's associated groups)
siteService.deleteSite(siteId);
}
@Test
//MNT-9104 If username contains uppercase letters the action of joining a site will not be displayed in "My activities"
public void testUserActivitiesOnSite() throws Exception
{
login(ADMIN_USER, ADMIN_PW);
addMembership(site1, user4, SiteModel.SITE_CONSUMER);
generateFeed();
login(user4, USER_PW);
getUserFeed(user4, site1, false, false, true, 1);
}
@Test