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

2
source/java/org/alfresco/repo/site/SiteServiceImpl.java
View File

@@ -465,7 +465,7 @@ public class SiteServiceImpl extends AbstractLifecycleBean implements SiteServic
// Check to see if we already have a site of this name
NodeRef existingSite = getSiteNodeRef(shortName, false);
if (existingSite != null || authorityService.authorityExists(getSiteGroup(shortName, true)))
if (existingSite != null)
{
// Throw an exception since we have a duplicate site name
throw new SiteServiceException(MSG_UNABLE_TO_CREATE, new Object[]{shortName});

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

6
source/test-java/org/alfresco/repo/activities/ActivityServiceImplTest.java
View File

@@ -27,7 +27,6 @@ import junit.framework.TestCase;
import org.alfresco.repo.domain.activities.ActivityPostDAO;
import org.alfresco.repo.domain.activities.ActivityPostEntity;
import org.alfresco.repo.jscript.ClasspathScriptLocation;
import org.alfresco.repo.node.archive.NodeArchiveService;
import org.alfresco.repo.security.authentication.AuthenticationUtil;
import org.alfresco.service.cmr.activities.ActivityService;
import org.alfresco.service.cmr.activities.FeedControl;
@@ -35,7 +34,6 @@ import org.alfresco.service.cmr.repository.NodeRef;
import org.alfresco.service.cmr.repository.ScriptLocation;
import org.alfresco.service.cmr.repository.ScriptService;
import org.alfresco.service.cmr.security.MutableAuthenticationService;
import org.alfresco.service.cmr.site.SiteInfo;
import org.alfresco.service.cmr.site.SiteService;
import org.alfresco.service.cmr.site.SiteVisibility;
import org.alfresco.test_category.OwnJVMTestsCategory;
@@ -59,7 +57,6 @@ public class ActivityServiceImplTest extends TestCase
private MutableAuthenticationService authenticationService;
private SiteService siteService;
private ActivityPostDAO postDAO;
private NodeArchiveService nodeArchiveService;
private static final String ADMIN_PW = "admin";
@@ -74,7 +71,6 @@ public class ActivityServiceImplTest extends TestCase
activityService = (ActivityService)ctx.getBean("activityService");
scriptService = (ScriptService)ctx.getBean("ScriptService");
siteService = (SiteService)ctx.getBean("SiteService");
nodeArchiveService = (NodeArchiveService)ctx.getBean("nodeArchiveService");
postDAO = (ActivityPostDAO)ctx.getBean("postDAO");
@@ -149,9 +145,7 @@ public class ActivityServiceImplTest extends TestCase
assertNotNull(siteFeedEntries);
assertTrue(siteFeedEntries.isEmpty());
SiteInfo siteInfo = siteService.getSite(siteId);
siteService.deleteSite(siteId);
nodeArchiveService.purgeArchivedNode(nodeArchiveService.getArchivedNode(siteInfo.getNodeRef()));
}
public void testGetEmptyUserFeed() throws Exception

10
source/test-java/org/alfresco/repo/activities/feed/cleanup/AbstractFeedCleanerTest.java
View File

@@ -30,13 +30,11 @@ import org.alfresco.model.ContentModel;
import org.alfresco.repo.domain.activities.ActivityFeedDAO;
import org.alfresco.repo.domain.activities.ActivityFeedEntity;
import org.alfresco.repo.lock.JobLockService;
import org.alfresco.repo.node.archive.NodeArchiveService;
import org.alfresco.repo.policy.PolicyComponent;
import org.alfresco.repo.security.authentication.AuthenticationUtil;
import org.alfresco.repo.transaction.RetryingTransactionHelper;
import org.alfresco.service.cmr.repository.NodeService;
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;
@@ -63,7 +61,6 @@ public abstract class AbstractFeedCleanerTest
private SiteService siteService;
private PersonService personService;
protected RetryingTransactionHelper transactionHelper;
private NodeArchiveService nodeArchiveService;
private static final String TEST_SITE = "testSite";
@@ -94,7 +91,6 @@ public abstract class AbstractFeedCleanerTest
personService = (PersonService) ctx.getBean("PersonService");
feedDAO = (ActivityFeedDAO) ctx.getBean("feedDAO");
transactionHelper = (RetryingTransactionHelper)ctx.getBean("retryingTransactionHelper");
nodeArchiveService = (NodeArchiveService)ctx.getBean("nodeArchiveService");
// Let's shut down the scheduler so that we aren't competing with the scheduled versions of jobs (ie. feed cleaner)
Scheduler scheduler = (Scheduler) ctx.getBean("schedulerFactory");
@@ -128,11 +124,9 @@ public abstract class AbstractFeedCleanerTest
for (int i = 1; i <= 7; i++)
{
SiteInfo site = siteService.getSite("testSite"+i);
if (site != null)
if (siteService.getSite("testSite"+i) != null)
{
siteService.deleteSite("testSite"+i);
nodeArchiveService.purgeArchivedNode(nodeArchiveService.getArchivedNode(site.getNodeRef()));
}
}
@@ -378,10 +372,8 @@ public abstract class AbstractFeedCleanerTest
assertEquals(site4FeedCnt, feedDAO.selectSiteFeedEntries(TEST_SITE_4, -1).size());
assertEquals(site4FeedCnt+site5FeedCnt, feedDAO.selectUserFeedEntries(TEST_USER_D, null, false, false,-1L, -1).size());
SiteInfo site = siteService.getSite(TEST_SITE_4);
// delete the site
siteService.deleteSite(TEST_SITE_4);
nodeArchiveService.purgeArchivedNode(nodeArchiveService.getArchivedNode(site.getNodeRef()));
// note: site feed cleanup is done in separate txn after commit
transactionHelper.doInTransaction(new RetryingTransactionHelper.RetryingTransactionCallback<Void>()

6
source/test-java/org/alfresco/repo/googledocs/GoogleDocumentServiceSystemTest.java
View File

@@ -32,7 +32,6 @@ import org.alfresco.model.ContentModel;
import org.alfresco.repo.content.MimetypeMap;
import org.alfresco.repo.content.transform.AbstractContentTransformerTest;
import org.alfresco.repo.management.subsystems.ApplicationContextFactory;
import org.alfresco.repo.node.archive.NodeArchiveService;
import org.alfresco.repo.rendition.executer.AbstractRenderingEngine;
import org.alfresco.repo.rendition.executer.ReformatRenderingEngine;
import org.alfresco.repo.security.authentication.AuthenticationUtil;
@@ -48,7 +47,6 @@ import org.alfresco.service.cmr.repository.NodeRef;
import org.alfresco.service.cmr.repository.NodeService;
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.service.namespace.NamespaceService;
@@ -75,7 +73,6 @@ public class GoogleDocumentServiceSystemTest extends TestCase implements GoogleD
private PersonService personService;
private ApplicationContextFactory subsystem;
private RenditionService renditionService;
private NodeArchiveService nodeArchiveService;
private static final String USER_ONE = "GoogleDocUserOne";
private static final String USER_TWO = "GoogleDocUserTwo";
@@ -108,7 +105,6 @@ public class GoogleDocumentServiceSystemTest extends TestCase implements GoogleD
authenticationService = (MutableAuthenticationService)appContext.getBean("authenticationService");
personService = (PersonService)appContext.getBean("personService");
renditionService = (RenditionService)appContext.getBean("renditionService");
nodeArchiveService = (NodeArchiveService)appContext.getBean("nodeArchiveService");
// Start the user transaction
userTransaction = transactionService.getUserTransaction();
@@ -210,14 +206,12 @@ public class GoogleDocumentServiceSystemTest extends TestCase implements GoogleD
@Override
protected void tearDown() throws Exception
{
SiteInfo siteInfo = siteService.getSite(siteId);
siteService.deleteSite(siteId);
if (userTransaction != null)
{
userTransaction.commit();
}
nodeArchiveService.purgeArchivedNode(nodeArchiveService.getArchivedNode(siteInfo.getNodeRef()));
}
private boolean isGoogleServiceAvailable()

11
source/test-java/org/alfresco/repo/publishing/flickr/FlickrTest.java
View File

@@ -25,7 +25,6 @@ import java.util.Map;
import org.alfresco.model.ContentModel;
import org.alfresco.repo.content.MimetypeMap;
import org.alfresco.repo.node.archive.NodeArchiveService;
import org.alfresco.repo.publishing.Environment;
import org.alfresco.repo.publishing.PublishingModel;
import org.alfresco.repo.publishing.PublishingQueueImpl;
@@ -40,7 +39,6 @@ import org.alfresco.service.cmr.repository.ContentService;
import org.alfresco.service.cmr.repository.ContentWriter;
import org.alfresco.service.cmr.repository.NodeRef;
import org.alfresco.service.cmr.repository.NodeService;
import org.alfresco.service.cmr.site.SiteInfo;
import org.alfresco.service.cmr.site.SiteService;
import org.alfresco.service.cmr.site.SiteVisibility;
import org.alfresco.service.namespace.NamespaceService;
@@ -69,7 +67,6 @@ public class FlickrTest extends BaseSpringTest
protected PublishingQueueImpl queue;
protected Environment environment;
protected NodeRef docLib;
protected NodeArchiveService nodeArchiveService;
private ChannelService channelService;
@@ -79,7 +76,6 @@ public class FlickrTest extends BaseSpringTest
{
serviceRegistry = (ServiceRegistry) getApplicationContext().getBean("ServiceRegistry");
channelService = (ChannelService) getApplicationContext().getBean("channelService");
nodeArchiveService = (NodeArchiveService) getApplicationContext().getBean("nodeArchiveService");
AuthenticationUtil.setFullyAuthenticatedUser(AuthenticationUtil.getAdminUserName());
siteService = serviceRegistry.getSiteService();
fileFolderService = serviceRegistry.getFileFolderService();
@@ -94,12 +90,7 @@ public class FlickrTest extends BaseSpringTest
public void onTearDown()
{
SiteInfo siteInfo = siteService.getSite(siteId);
if (siteInfo != null)
{
siteService.deleteSite(siteId);
nodeArchiveService.purgeArchivedNode(nodeArchiveService.getArchivedNode(siteInfo.getNodeRef()));
}
siteService.deleteSite(siteId);
}
public void testBlank()

11
source/test-java/org/alfresco/repo/publishing/slideshare/SlideShareTest.java
View File

@@ -29,7 +29,6 @@ import java.util.TreeMap;
import org.alfresco.model.ContentModel;
import org.alfresco.repo.content.MimetypeMap;
import org.alfresco.repo.node.archive.NodeArchiveService;
import org.alfresco.repo.publishing.Environment;
import org.alfresco.repo.publishing.PublishingModel;
import org.alfresco.repo.publishing.PublishingQueueImpl;
@@ -45,7 +44,6 @@ import org.alfresco.service.cmr.repository.ContentService;
import org.alfresco.service.cmr.repository.ContentWriter;
import org.alfresco.service.cmr.repository.NodeRef;
import org.alfresco.service.cmr.repository.NodeService;
import org.alfresco.service.cmr.site.SiteInfo;
import org.alfresco.service.cmr.site.SiteService;
import org.alfresco.service.cmr.site.SiteVisibility;
import org.alfresco.service.namespace.NamespaceService;
@@ -77,7 +75,6 @@ public class SlideShareTest extends BaseSpringTest
protected NodeRef docLib;
protected Map<String, String> testFiles = new TreeMap<String, String>();
protected Map<NodeRef, String> testNodeMap = new HashMap<NodeRef, String>();
protected NodeArchiveService nodeArchiveService;
private ChannelService channelService;
@@ -87,7 +84,6 @@ public class SlideShareTest extends BaseSpringTest
{
serviceRegistry = (ServiceRegistry) getApplicationContext().getBean("ServiceRegistry");
channelService = (ChannelService) getApplicationContext().getBean("channelService");
nodeArchiveService = (NodeArchiveService) getApplicationContext().getBean("nodeArchiveService");
AuthenticationUtil.setFullyAuthenticatedUser(AuthenticationUtil.getAdminUserName());
siteService = serviceRegistry.getSiteService();
fileFolderService = serviceRegistry.getFileFolderService();
@@ -107,12 +103,7 @@ public class SlideShareTest extends BaseSpringTest
public void onTearDown()
{
SiteInfo siteInfo = siteService.getSite(siteId);
if (siteInfo != null)
{
siteService.deleteSite(siteId);
nodeArchiveService.purgeArchivedNode(nodeArchiveService.getArchivedNode(siteInfo.getNodeRef()));
}
siteService.deleteSite(siteId);
}
public void testBlank()

11
source/test-java/org/alfresco/repo/publishing/youtube/YouTubeTest.java
View File

@@ -24,7 +24,6 @@ import java.util.HashMap;
import java.util.Map;
import org.alfresco.model.ContentModel;
import org.alfresco.repo.node.archive.NodeArchiveService;
import org.alfresco.repo.publishing.Environment;
import org.alfresco.repo.publishing.PublishingModel;
import org.alfresco.repo.publishing.PublishingQueueImpl;
@@ -39,7 +38,6 @@ import org.alfresco.service.cmr.repository.ContentService;
import org.alfresco.service.cmr.repository.ContentWriter;
import org.alfresco.service.cmr.repository.NodeRef;
import org.alfresco.service.cmr.repository.NodeService;
import org.alfresco.service.cmr.site.SiteInfo;
import org.alfresco.service.cmr.site.SiteService;
import org.alfresco.service.cmr.site.SiteVisibility;
import org.alfresco.service.namespace.NamespaceService;
@@ -68,7 +66,6 @@ public class YouTubeTest extends BaseSpringTest
protected PublishingQueueImpl queue;
protected Environment environment;
protected NodeRef docLib;
protected NodeArchiveService nodeArchiveService;
private ChannelService channelService;
@@ -78,7 +75,6 @@ public class YouTubeTest extends BaseSpringTest
{
serviceRegistry = (ServiceRegistry) getApplicationContext().getBean("ServiceRegistry");
channelService = (ChannelService) getApplicationContext().getBean("channelService");
nodeArchiveService = (NodeArchiveService) getApplicationContext().getBean("nodeArchiveService");
AuthenticationUtil.setFullyAuthenticatedUser(AuthenticationUtil.getAdminUserName());
siteService = serviceRegistry.getSiteService();
fileFolderService = serviceRegistry.getFileFolderService();
@@ -93,12 +89,7 @@ public class YouTubeTest extends BaseSpringTest
public void onTearDown()
{
SiteInfo siteInfo = siteService.getSite(siteId);
if (siteInfo != null)
{
siteService.deleteSite(siteId);
nodeArchiveService.purgeArchivedNode(nodeArchiveService.getArchivedNode(siteInfo.getNodeRef()));
}
siteService.deleteSite(siteId);
}
public void testBlank()

7
source/test-java/org/alfresco/repo/security/authority/AuthorityServiceTest.java
View File

@@ -39,7 +39,6 @@ import org.alfresco.model.ContentModel;
import org.alfresco.query.PagingRequest;
import org.alfresco.query.PagingResults;
import org.alfresco.repo.domain.permissions.AclDAO;
import org.alfresco.repo.node.archive.NodeArchiveService;
import org.alfresco.repo.security.authentication.AuthenticationComponent;
import org.alfresco.repo.security.authentication.AuthenticationUtil;
import org.alfresco.repo.security.authentication.MutableAuthenticationDao;
@@ -49,7 +48,6 @@ import org.alfresco.service.ServiceRegistry;
import org.alfresco.service.cmr.repository.ChildAssociationRef;
import org.alfresco.service.cmr.repository.NodeRef;
import org.alfresco.service.cmr.repository.NodeService;
import org.alfresco.service.cmr.repository.StoreRef;
import org.alfresco.service.cmr.repository.datatype.DefaultTypeConverter;
import org.alfresco.service.cmr.security.AuthorityService;
import org.alfresco.service.cmr.security.AuthorityType;
@@ -80,7 +78,6 @@ public class AuthorityServiceTest extends TestCase
private AclDAO aclDaoComponent;
private NodeService nodeService;
private AuthorityBridgeTableAsynchronouslyRefreshedCache authorityBridgeTableCache;
private NodeArchiveService nodeArchiveService;
public AuthorityServiceTest()
{
@@ -113,14 +110,10 @@ public class AuthorityServiceTest extends TestCase
aclDaoComponent = (AclDAO) ctx.getBean("aclDAO");
nodeService = (NodeService) ctx.getBean("nodeService");
authorityBridgeTableCache = (AuthorityBridgeTableAsynchronouslyRefreshedCache) ctx.getBean("authorityBridgeTableCache");
nodeArchiveService = (NodeArchiveService) ctx.getBean("nodeArchiveService");
String defaultAdminUser = AuthenticationUtil.getAdminUserName();
AuthenticationUtil.setFullyAuthenticatedUser(defaultAdminUser);
// cleanup trashcan
nodeArchiveService.purgeAllArchivedNodes(StoreRef.STORE_REF_WORKSPACE_SPACESSTORE);
// note: currently depends on any existing (and/or bootstrap) group data - eg. default site "swsdp" (Sample Web Site Design Project)
SiteService siteService = (SiteService) ctx.getBean("SiteService");
SITE_CNT = siteService.listSites(defaultAdminUser).size();

8
source/test-java/org/alfresco/repo/site/SiteServiceImplTest.java
View File

@@ -800,6 +800,7 @@ public class SiteServiceImplTest extends BaseAlfrescoSpringTest
{
return authorityService.createAuthority(AuthorityType.GROUP, testGroupName);
}
}, AuthenticationUtil.getAdminUserName());
// Create a test site
@@ -817,14 +818,13 @@ public class SiteServiceImplTest extends BaseAlfrescoSpringTest
NodeRef archivedNodeRef = nodeArchiveService.getArchivedNode(siteInfo.getNodeRef());
assertTrue("Deleted sites can be recovered from the Trash.", nodeService.exists(archivedNodeRef));
// related site groups should remain after site delete but should be deleted on site purge from trashcan.
// Such case is tested in SiteServiceImplMoreTest.deleteSiteAndRestoreEnsuringSiteGroupsAreRecovered
assertTrue(authorityService.authorityExists(((SiteServiceImpl)smallSiteService).getSiteGroup(siteShortName, true)));
// Ensure that all the related site groups are deleted
assertFalse(authorityService.authorityExists(((SiteServiceImpl)smallSiteService).getSiteGroup(siteShortName, true)));
Set<String> permissions = permissionService.getSettablePermissions(SiteModel.TYPE_SITE);
for (String permission : permissions)
{
String siteRoleGroup = ((SiteServiceImpl)smallSiteService).getSiteRoleGroup(siteShortName, permission, true);
assertTrue(authorityService.authorityExists(siteRoleGroup));
assertFalse(authorityService.authorityExists(siteRoleGroup));
}
// Ensure that the added "normal" groups have not been deleted

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

@@ -32,7 +32,6 @@ import org.alfresco.repo.activities.feed.local.LocalFeedTaskProcessor;
import org.alfresco.repo.activities.post.lookup.PostLookup;
import org.alfresco.repo.content.MimetypeMap;
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.site.SiteModel;
import org.alfresco.repo.transaction.RetryingTransactionHelper;
@@ -113,11 +112,9 @@ public class SubscriptionServiceActivitiesTest
protected static PostLookup postLookup;
protected static FeedGenerator feedGenerator;
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,
@@ -142,7 +139,6 @@ public class SubscriptionServiceActivitiesTest
activityService = (ActivityService) ctx.getBean("activityService");
nodeService = (NodeService) ctx.getBean("NodeService");
contentService = (ContentService) ctx.getBean("ContentService");
nodeArchiveService = (NodeArchiveService)ctx.getBean("nodeArchiveService");
transactionHelper = (RetryingTransactionHelper) ctx.getBean("retryingTransactionHelper");
ChildApplicationContextFactory activitiesFeed = (ChildApplicationContextFactory) ctx.getBean("ActivitiesFeed");
@@ -477,12 +473,10 @@ public class SubscriptionServiceActivitiesTest
private void deleteSite(String siteShortName)
{
SiteInfo siteInfo = siteService.getSite(siteShortName);
if (siteInfo != null)
if (siteService.getSite(siteShortName) != null)
{
log.debug("Deleting site: " + siteShortName);
siteService.deleteSite(siteShortName);
nodeArchiveService.purgeArchivedNode(nodeArchiveService.getArchivedNode(siteInfo.getNodeRef()));
}
else
{

16
source/test-java/org/alfresco/util/test/junitrules/TemporarySites.java
View File

@@ -26,7 +26,6 @@ import java.util.List;
import org.alfresco.model.ContentModel;
import org.alfresco.repo.domain.activities.ActivityPostDAO;
import org.alfresco.repo.domain.activities.ActivityPostEntity;
import org.alfresco.repo.node.archive.NodeArchiveService;
import org.alfresco.repo.security.authentication.AuthenticationUtil;
import org.alfresco.repo.security.authentication.AuthenticationUtil.RunAsWork;
import org.alfresco.repo.site.SiteModel;
@@ -75,7 +74,6 @@ public class TemporarySites extends AbstractPersonRule
final RetryingTransactionHelper transactionHelper = (RetryingTransactionHelper) appContextRule.getApplicationContext().getBean("retryingTransactionHelper");
final SiteService siteService = appContextRule.getApplicationContext().getBean("siteService", SiteService.class);
final ActivityPostDAO postDAO = appContextRule.getApplicationContext().getBean("postDAO", ActivityPostDAO.class);
final NodeArchiveService nodeArchiveService = (NodeArchiveService)appContextRule.getApplicationContext().getBean("nodeArchiveService");
// Run as admin to ensure all sites can be deleted irrespective of which user created them.
AuthenticationUtil.runAs(new RunAsWork<Void>()
@@ -114,20 +112,6 @@ public class TemporarySites extends AbstractPersonRule
return null;
}
});
transactionHelper.doInTransaction(new RetryingTransactionCallback<Void>()
{
@Override public Void execute() throws Throwable
{
for (SiteInfo site : temporarySites)
{
log.debug("Purging temporary site from trashcan: " + site.getShortName());
nodeArchiveService.purgeArchivedNode(nodeArchiveService.getArchivedNode(site.getNodeRef()));
}
return null;
}
});
return null;
}
}, AuthenticationUtil.getAdminUserName());