diff --git a/source/java/org/alfresco/repo/site/SiteServiceImpl.java b/source/java/org/alfresco/repo/site/SiteServiceImpl.java index 4383d5d489..fde22ca01e 100644 --- a/source/java/org/alfresco/repo/site/SiteServiceImpl.java +++ b/source/java/org/alfresco/repo/site/SiteServiceImpl.java @@ -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}); diff --git a/source/test-java/org/alfresco/repo/activities/AbstractSiteActivityTest.java b/source/test-java/org/alfresco/repo/activities/AbstractSiteActivityTest.java index 26aaefa013..7b955c6dd1 100644 --- a/source/test-java/org/alfresco/repo/activities/AbstractSiteActivityTest.java +++ b/source/test-java/org/alfresco/repo/activities/AbstractSiteActivityTest.java @@ -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 diff --git a/source/test-java/org/alfresco/repo/activities/ActivityServiceImplTest.java b/source/test-java/org/alfresco/repo/activities/ActivityServiceImplTest.java index e7b58cbdf4..4a1c0f5040 100644 --- a/source/test-java/org/alfresco/repo/activities/ActivityServiceImplTest.java +++ b/source/test-java/org/alfresco/repo/activities/ActivityServiceImplTest.java @@ -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 diff --git a/source/test-java/org/alfresco/repo/activities/feed/cleanup/AbstractFeedCleanerTest.java b/source/test-java/org/alfresco/repo/activities/feed/cleanup/AbstractFeedCleanerTest.java index 4374d3f2b7..f0366e39b7 100644 --- a/source/test-java/org/alfresco/repo/activities/feed/cleanup/AbstractFeedCleanerTest.java +++ b/source/test-java/org/alfresco/repo/activities/feed/cleanup/AbstractFeedCleanerTest.java @@ -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,8 +61,7 @@ public abstract class AbstractFeedCleanerTest private SiteService siteService; private PersonService personService; protected RetryingTransactionHelper transactionHelper; - private NodeArchiveService nodeArchiveService; - + private static final String TEST_SITE = "testSite"; private static final String TEST_SITE_1 = TEST_SITE+"1"; @@ -94,8 +91,7 @@ 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"); scheduler.shutdown(); @@ -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() diff --git a/source/test-java/org/alfresco/repo/googledocs/GoogleDocumentServiceSystemTest.java b/source/test-java/org/alfresco/repo/googledocs/GoogleDocumentServiceSystemTest.java index 59e0ba316d..31275a9c05 100644 --- a/source/test-java/org/alfresco/repo/googledocs/GoogleDocumentServiceSystemTest.java +++ b/source/test-java/org/alfresco/repo/googledocs/GoogleDocumentServiceSystemTest.java @@ -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() diff --git a/source/test-java/org/alfresco/repo/publishing/flickr/FlickrTest.java b/source/test-java/org/alfresco/repo/publishing/flickr/FlickrTest.java index 4789fbb887..0afae023ff 100644 --- a/source/test-java/org/alfresco/repo/publishing/flickr/FlickrTest.java +++ b/source/test-java/org/alfresco/repo/publishing/flickr/FlickrTest.java @@ -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() diff --git a/source/test-java/org/alfresco/repo/publishing/slideshare/SlideShareTest.java b/source/test-java/org/alfresco/repo/publishing/slideshare/SlideShareTest.java index e35409238d..e923d5b4e2 100644 --- a/source/test-java/org/alfresco/repo/publishing/slideshare/SlideShareTest.java +++ b/source/test-java/org/alfresco/repo/publishing/slideshare/SlideShareTest.java @@ -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 testFiles = new TreeMap(); protected Map testNodeMap = new HashMap(); - 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() diff --git a/source/test-java/org/alfresco/repo/publishing/youtube/YouTubeTest.java b/source/test-java/org/alfresco/repo/publishing/youtube/YouTubeTest.java index f7831a16b8..297db0fea0 100644 --- a/source/test-java/org/alfresco/repo/publishing/youtube/YouTubeTest.java +++ b/source/test-java/org/alfresco/repo/publishing/youtube/YouTubeTest.java @@ -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() diff --git a/source/test-java/org/alfresco/repo/security/authority/AuthorityServiceTest.java b/source/test-java/org/alfresco/repo/security/authority/AuthorityServiceTest.java index 9d9e357d93..81521ace94 100644 --- a/source/test-java/org/alfresco/repo/security/authority/AuthorityServiceTest.java +++ b/source/test-java/org/alfresco/repo/security/authority/AuthorityServiceTest.java @@ -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(); diff --git a/source/test-java/org/alfresco/repo/site/SiteServiceImplTest.java b/source/test-java/org/alfresco/repo/site/SiteServiceImplTest.java index ea56368729..3ab6adafb8 100644 --- a/source/test-java/org/alfresco/repo/site/SiteServiceImplTest.java +++ b/source/test-java/org/alfresco/repo/site/SiteServiceImplTest.java @@ -800,8 +800,9 @@ public class SiteServiceImplTest extends BaseAlfrescoSpringTest { return authorityService.createAuthority(AuthorityType.GROUP, testGroupName); } + }, AuthenticationUtil.getAdminUserName()); - + // Create a test site String siteShortName = "testUpdateSite"; this.siteService.createSite(TEST_SITE_PRESET, siteShortName, TEST_TITLE, TEST_DESCRIPTION, SiteVisibility.PUBLIC); @@ -816,15 +817,14 @@ public class SiteServiceImplTest extends BaseAlfrescoSpringTest assertNull(this.siteService.getSite(siteShortName)); 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 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 diff --git a/source/test-java/org/alfresco/repo/subscriptions/SubscriptionServiceActivitiesTest.java b/source/test-java/org/alfresco/repo/subscriptions/SubscriptionServiceActivitiesTest.java index 3ab75721f6..5d68fc4e3b 100644 --- a/source/test-java/org/alfresco/repo/subscriptions/SubscriptionServiceActivitiesTest.java +++ b/source/test-java/org/alfresco/repo/subscriptions/SubscriptionServiceActivitiesTest.java @@ -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 { diff --git a/source/test-java/org/alfresco/util/test/junitrules/TemporarySites.java b/source/test-java/org/alfresco/util/test/junitrules/TemporarySites.java index 0511f4ac83..1d872bd2d3 100644 --- a/source/test-java/org/alfresco/util/test/junitrules/TemporarySites.java +++ b/source/test-java/org/alfresco/util/test/junitrules/TemporarySites.java @@ -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() @@ -114,20 +112,6 @@ public class TemporarySites extends AbstractPersonRule return null; } }); - transactionHelper.doInTransaction(new RetryingTransactionCallback() - { - @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());