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 
59259: Merged V4.2-BUG-FIX (4.2.1) to HEAD-BUG-FIX (Cloud/4.3)
      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@62123 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Alan Davis
2014-02-12 01:22:17 +00:00
parent b5e03702c7
commit 526725db7d
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
source/test-java/org/alfresco/repo/subscriptions/SubscriptionServiceActivitiesTest.java
View File

@@ -112,10 +112,12 @@ public class SubscriptionServiceActivitiesTest
protected static ContentService contentService;
protected static PostLookup postLookup;
protected static FeedGenerator feedGenerator;
protected NodeArchiveService nodeArchiveService;
protected static RetryingTransactionHelper transactionHelper;
protected static NodeArchiveService nodeArchiveService;
private static Scheduler QUARTZ_SCHEDULER;
// Test Sites - these are all created by USER_ONE & hence USER_ONE is the SiteManager.
private SiteInfo publicSite,
privateSite1, privateSite2,