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 V4.1-BUG-FIX to HEAD

Browse Source 
42933: ALF-15328 could we add a sample log4j file in 'extension'? 
   42935: ALF-16455: Merged V3.4-BUG-FIX (3.4.12) to V4.1-BUG-FIX (4.1.2)
      42934: ALF-16454 TransformerDebug id values have gaps 
   42955: ALF-15328 could we add a sample log4j file in 'extension'?
      - missing j in file name
   42982: Merged DEV to V4.1-BUG-FIX
      42873: ALF-16194: Checkout/Checkin leaves Lockable aspect on which disables autoVersionOnUpdateProps
             DoNothingCopyBehaviourCallback policy has been set for lockable aspect (implemented in LockServiceImpl);
             Unit test has been added. 
   43000: Merged BRANCHES/DEV/BELARUS/V4.1-BUG-FIX-2012_10_19 to BRANCHES/DEV/V4.1-BUG-FIX:
      42936: ALF-11573: It's impossible to Modify settings for document versions
   43010: ALF-16006 MT: Document Library is absent after upgrade from 3.4.x to 4.1.x (eg. 3.4.10 -> 4.1.1)
      - applied patch suggested in JIRA
   43017: ALF-16457: "CmisObjectNotFoundException: No corresponding type found! Not a CMIS object?" thrown by AlfrescoCmisServiceImpl.getChildren
        - Check CMISNodeInfo for invalid type before processing.
   43019: ALF-14353: Upgrade Activiti dependencies in Maven build
   43022: ALF-14353: Upgrade Activiti dependencies in Maven build
   43027: Merged DEV to V4.1-BUG-FIX
       42426: ALF-15577: " does not support the method HEAD " when opening a MS Access file with "View In Browser"
   43029: Merged DEV to 4.1-BUG-FIX (4.1.2)
      42988: ALF-15791: Custom Types,Aspects defined with prefix using underscore cannot be loaded by API calls like api/classes/<type or aspect>
         Identical logic for old and new ClassDef API was moved to abstract super classes
      42924: ALF-15791: Custom Types,Aspects defined with prefix using underscore cannot be loaded by API calls like api/classes/<type or aspect>
         New set of URL templates for class defenitions were provided to support requests with separated namespace prefixes and names
   43031: ALF-16489: Typo in column-name of newly created index
   43041: Merged DEV to 4.1-BUG-FIX (4.1.2)
      43040: ALF-16425: API call to return all classes, returns wrong properties in classes
         Propertydefs and assocdefs are reordered to corelate with classdefs. Unit test was added for issue.
   43052: ALF-16194: Checkout/Checkin leaves Lockable aspect on which disables autoVersionOnUpdateProps
      - Fix failing test
   43055: Probable fix for ALF-15813. Replaced the 'skipCount' with the one in the query request, rather than query result.
   The Lucene query result does not support the reporting of the skipCount.
   43065: Merged V3.4-BUG-FIX to V4.1-BUG-FIX
      42958: ALF-14421: Inconsistencies when applying Versionable Aspect 
      - We think the most preferable fix that will result in the best consistency between Share and old Explorer behaviour is to make the adding of the versionable aspect always result in an initial MAJOR version, if a version type has not been specified. Major/minor versions can still be controlled explicitly by checkout/checkin the versionable aspect properties and the version service API.
      42998: ALF-14421: Fixed version label unit test fallout - back to what it used to be.
      42999: Fix for ALF-16261 - IE script error occurs when email space users providing there are no users in this space
      43006: Removed dependency on Apache Commons StringUtils. See ALF-12541, ALF-14254, AMZNSSS-17
      43028: ALF-14722: Merged V4.1-BUG-FIX to V3.4-BUG-FIX
         42902: Merged DEV to V4.1-BUG-FIX
            42519: ALF-13588: Google Doc failed to authenticate after incorrect password being entered for google account 
               Add ability to unregister class behaviours.
               Unregister googledocs behaviours when subsystem stops.
   43066: ALF-16502: Merged PATCHES/V4.0.2 to V4.1-BUG-FIX
      42969: Merged DEV to PATCHES/V4.0.2
         42967: MNT-158: SharePoint Protocol Opening Documents in Read-Only for Site Consumer with Collaborator Privileges
            Remove manual throwing of AccessDeniedException is user has "consumer" or "contributor" role.
            Create "links" container from system user.
   43067: Merged PATCHES/V4.1.1 to V4.1-BUG-FIX
      42470: ALF-16503 / ALF-16256: Upgrade 3.4.6 HF to 4.1.1 - DuplicateChildNodeNameException: Duplicate child name not allowed: surf-config 
      42591: ALF-16504 / ALF-16332: Fixed synchronization around org.alfresco.repo.dictionary.NamespaceDAOImpl.namespaceRegistryCache
      - There was no 'double checking' after releasing the write lock, meaning that under high concurrency lots of threads would queue up to continuously re-initialize the registry. 
      42705: ALF-16504/ ALF-16332, ALF-16377: Revisited synchronization and initialization of mutually-dependent DictionaryDAO and NamespaceDAO to prevent deadlock and simultaneous re-initialization in more than one thread
   43068: Merged DEV to V4.1-BUG-FIX
      - TODO: Update DB2 DDL in activiti
      42388: ALF-15828: DB2: unexpected index found in database.
      Modify activity create script for db2 to create normal name for ACT_HI_PROCINST.PROC_INST_ID_ index.
      Introduce patch that will rename autogenerated name to normal name for ACT_HI_PROCINST.PROC_INST_ID_ index.
      Update schema reference file for DB2.
      42429: ALF-15828: DB2: unexpected index found in database.
      Fix scripts from ALF-14983 and ALF-16038 to drop/recreate tables in DB2.
   43069: ALF-11214: IMAP subsystem is not successfully restarted after incorrect modification of IMAP properties via Admin Console
      Stopped ChildApplicationContextFactory from caching a stale application context that didn't successfully refresh.
   43071: ALF-13660: When using kerberos SSO, non domain explorer users requesting a download URL get a login page but after login do not get the requested document
   - Now the Web Client authentication filters use the same mechanism for preserving the request URL through a redirect to the login page
   43076: ALF-15828: Fixed merge issue
   43079: ALF-13602: Incorrect number of documents displayed in Share DocLib when a file is checked out
   - added ability for FileFolderService.list (-> FileFolder GetChildren CQ) to filter by one or more aspects, eg. cm:checkedOut
   43080: ALF-14421: More version label unit test fallout
   43092: Fix ALF-16460: Users may receive activity feed entries (from people they follow) for moderated sites to which they do not belong
   - also add unit test
   43093: Fix for ALF-16091 - Unable to inline edit javascript file.
   43096: Fix for ALF-16283 - When document is checked out, 'Edit Online' and 'Upload New Version' options should not be visible on the original document.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@43103 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Dave Ward
2012-10-25 16:38:22 +00:00
parent 4b4b1f72a7
commit b794365eaa
26 changed files with 728 additions and 203 deletions
Download Patch File Download Diff File Expand all files Collapse all files

278
source/java/org/alfresco/repo/subscriptions/SubscriptionServiceActivitiesTest.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright (C) 2005-2011 Alfresco Software Limited.
* Copyright (C) 2005-2012 Alfresco Software Limited.
*
* This file is part of Alfresco
*
@@ -18,8 +18,11 @@
*/
package org.alfresco.repo.subscriptions;
import java.io.Serializable;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import junit.framework.TestCase;
@@ -27,11 +30,23 @@ import org.alfresco.model.ContentModel;
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.content.MimetypeMap;
import org.alfresco.repo.management.subsystems.ChildApplicationContextFactory;
import org.alfresco.repo.security.authentication.AuthenticationUtil;
import org.alfresco.repo.site.SiteModel;
import org.alfresco.service.cmr.activities.ActivityService;
import org.alfresco.service.cmr.repository.ChildAssociationRef;
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.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.cmr.subscriptions.SubscriptionService;
import org.alfresco.service.namespace.NamespaceService;
import org.alfresco.service.namespace.QName;
import org.alfresco.util.ApplicationContextHelper;
import org.alfresco.util.PropertyMap;
import org.quartz.Scheduler;
@@ -42,13 +57,17 @@ public class SubscriptionServiceActivitiesTest extends TestCase
// Location of activity type templates (for site activities)
// assumes test-resources is on classpath
protected static final String TEST_TEMPLATES_LOCATION = "activities";
protected ApplicationContext ctx = ApplicationContextHelper.getApplicationContext();
protected SubscriptionService subscriptionService;
protected PersonService personService;
protected SiteService siteService;
protected ActivityService activityService;
protected NodeService nodeService;
protected ContentService contentService;
protected PostLookup postLookup;
protected FeedGenerator feedGenerator;
@Override
public void setUp() throws Exception
{
@@ -57,58 +76,155 @@ public class SubscriptionServiceActivitiesTest extends TestCase
// feed generator jobs
Scheduler scheduler = (Scheduler) ctx.getBean("schedulerFactory");
scheduler.shutdown();
// Get the required services
subscriptionService = (SubscriptionService) ctx.getBean("SubscriptionService");
personService = (PersonService) ctx.getBean("PersonService");
siteService = (SiteService) ctx.getBean("SiteService");
activityService = (ActivityService) ctx.getBean("activityService");
nodeService = (NodeService) ctx.getBean("NodeService");
contentService = (ContentService) ctx.getBean("ContentService");
ChildApplicationContextFactory activitiesFeed = (ChildApplicationContextFactory) ctx.getBean("ActivitiesFeed");
ApplicationContext activitiesFeedCtx = activitiesFeed.getApplicationContext();
postLookup = (PostLookup) activitiesFeedCtx.getBean("postLookup");
feedGenerator = (FeedGenerator) activitiesFeedCtx.getBean("feedGenerator");
LocalFeedTaskProcessor feedProcessor = (LocalFeedTaskProcessor) activitiesFeedCtx.getBean("feedTaskProcessor");
List<String> templateSearchPaths = new ArrayList<String>(1);
templateSearchPaths.add(TEST_TEMPLATES_LOCATION);
feedProcessor.setTemplateSearchPaths(templateSearchPaths);
feedProcessor.setUseRemoteCallbacks(false);
AuthenticationUtil.setFullyAuthenticatedUser(AuthenticationUtil.getSystemUserName());
}
protected void deletePerson(String userId)
{
personService.deletePerson(userId);
}
protected NodeRef createPerson(String userId)
{
deletePerson(userId);
PropertyMap properties = new PropertyMap(5);
properties.put(ContentModel.PROP_USERNAME, userId);
properties.put(ContentModel.PROP_FIRSTNAME, userId);
properties.put(ContentModel.PROP_LASTNAME, "Test");
properties.put(ContentModel.PROP_EMAIL, userId + "@email.com");
return personService.createPerson(properties);
}
protected void deleteSite(String siteId)
{
if (siteService.getSite(siteId) != null)
{
siteService.deleteSite(siteId);
}
}
protected SiteInfo createSite(String siteId, SiteVisibility visibility)
{
deleteSite(siteId);
return siteService.createSite("sitePreset", siteId, null, null, visibility);
}
protected NodeRef addTextContent(String siteId, String name)
{
String textData = name;
String mimeType = MimetypeMap.MIMETYPE_TEXT_PLAIN;
Map<QName, Serializable> contentProps = new HashMap<QName, Serializable>();
contentProps.put(ContentModel.PROP_NAME, name);
// ensure that the Document Library folder is pre-created so that test code can start creating content straight away.
// At the time of writing V4.1 does not create this folder automatically, but Thor does
NodeRef parentRef = siteService.getContainer(siteId, SiteService.DOCUMENT_LIBRARY);
if (parentRef == null)
{
parentRef = siteService.createContainer(siteId, SiteService.DOCUMENT_LIBRARY, ContentModel.TYPE_FOLDER, null);
}
ChildAssociationRef association = nodeService.createNode(parentRef,
ContentModel.ASSOC_CONTAINS,
QName.createQName(NamespaceService.CONTENT_MODEL_1_0_URI, name),
ContentModel.TYPE_CONTENT,
contentProps);
NodeRef content = association.getChildRef();
// add titled aspect (for Web Client display)
Map<QName, Serializable> titledProps = new HashMap<QName, Serializable>();
titledProps.put(ContentModel.PROP_TITLE, name);
titledProps.put(ContentModel.PROP_DESCRIPTION, name);
this.nodeService.addAspect(content, ContentModel.ASPECT_TITLED, titledProps);
ContentWriter writer = contentService.getWriter(content, ContentModel.PROP_CONTENT, true);
writer.setMimetype(mimeType);
writer.setEncoding("UTF-8");
writer.putContent(textData);
activityService.postActivity("org.alfresco.documentlibrary.file-added", siteId, "documentlibrary", content, name, ContentModel.PROP_CONTENT, parentRef);
return content;
}
protected void generateFeed() throws Exception
{
postLookup.execute();
feedGenerator.execute();
}
public void testFollowingActivity() throws Exception
{
final String userId1 = "bob";
final String userId2 = "tom";
createPerson(userId1);
createPerson(userId2);
AuthenticationUtil.runAs(new AuthenticationUtil.RunAsWork<Object>()
{
@Override
public Object doWork() throws Exception
{
createPerson(userId1);
createPerson(userId2);
createSite(userId1+"pub", SiteVisibility.PUBLIC);
siteService.setMembership(userId1+"pub", userId1, SiteModel.SITE_MANAGER);
createSite(userId1+"priv1", SiteVisibility.PRIVATE);
siteService.setMembership(userId1+"priv1", userId1, SiteModel.SITE_MANAGER);
createSite(userId1+"priv2", SiteVisibility.PRIVATE);
siteService.setMembership(userId1+"priv2", userId1, SiteModel.SITE_MANAGER);
createSite(userId1+"mod1", SiteVisibility.MODERATED);
siteService.setMembership(userId1+"mod1", userId1, SiteModel.SITE_MANAGER);
createSite(userId1+"mod2", SiteVisibility.MODERATED);
siteService.setMembership(userId1+"mod2", userId1, SiteModel.SITE_MANAGER);
return null;
}
}, AuthenticationUtil.getAdminUserName());
List<String> feed = activityService.getUserFeedEntries(userId1, "json", null, false, false, null, null);
assertEquals(feed.toString(), 0, feed.size());
feed = activityService.getUserFeedEntries(userId2, "json", null, false, false, null, null);
assertEquals(feed.toString(), 0, feed.size());
// userId1 + 5, userId2 + 0
generateFeed();
feed = activityService.getUserFeedEntries(userId1, "json", null, false, false, null, null);
assertEquals(feed.toString(), 5, feed.size());
feed = activityService.getUserFeedEntries(userId2, "json", null, false, false, null, null);
assertEquals(feed.toString(), 0, feed.size());
AuthenticationUtil.runAs(new AuthenticationUtil.RunAsWork<Object>()
{
@Override
@@ -118,7 +234,7 @@ public class SubscriptionServiceActivitiesTest extends TestCase
return null;
}
}, userId1);
AuthenticationUtil.runAs(new AuthenticationUtil.RunAsWork<Object>()
{
@Override
@@ -128,10 +244,124 @@ public class SubscriptionServiceActivitiesTest extends TestCase
return null;
}
}, userId2);
// userId1 + 5, userId2 + 2
generateFeed();
deletePerson(userId1);
deletePerson(userId2);
feed = activityService.getUserFeedEntries(userId1, "json", null, false, false, null, null);
assertEquals(feed.toString(), 7, feed.size());
feed = activityService.getUserFeedEntries(userId2, "json", null, false, false, null, null);
assertEquals(feed.toString(), 2, feed.size());
AuthenticationUtil.runAs(new AuthenticationUtil.RunAsWork<Object>()
{
@Override
public Object doWork() throws Exception
{
addTextContent(userId1+"pub", userId1+"pub-a");
addTextContent(userId1+"priv1", userId1+"priv1-a");
addTextContent(userId1+"priv2", userId1+"priv2-a");
addTextContent(userId1+"mod1", userId1+"mod1-a");
addTextContent(userId1+"mod2", userId1+"mod2-a");
return null;
}
}, userId1);
// userId1 + 5, userId2 + 1
generateFeed();
feed = activityService.getUserFeedEntries(userId1, "json", null, false, false, null, null);
assertEquals(feed.toString(), 12, feed.size());
// note: userId2 should not see activities from followers in moderated sites that they do not belong do (ALF-16460)
feed = activityService.getUserFeedEntries(userId2, "json", null, false, false, null, null);
assertEquals(feed.toString(), 3, feed.size());
AuthenticationUtil.runAs(new AuthenticationUtil.RunAsWork<Object>()
{
@Override
public Object doWork() throws Exception
{
siteService.setMembership(userId1+"priv2", userId2, SiteModel.SITE_CONSUMER);
siteService.setMembership(userId1+"mod2", userId2, SiteModel.SITE_MANAGER);
return null;
}
}, AuthenticationUtil.getAdminUserName());
// userId1 + 2, userId2 + 2
generateFeed();
feed = activityService.getUserFeedEntries(userId1, "json", null, false, false, null, null);
assertEquals(feed.toString(), 14, feed.size());
// note: userId2 should not see activities from followers in moderated sites that they do not belong do (ALF-16460)
feed = activityService.getUserFeedEntries(userId2, "json", null, false, false, null, null);
assertEquals(feed.toString(), 5, feed.size());
AuthenticationUtil.runAs(new AuthenticationUtil.RunAsWork<Object>()
{
@Override
public Object doWork() throws Exception
{
addTextContent(userId1+"pub", userId1+"pub-b");
addTextContent(userId1+"priv1", userId1+"priv1-b");
addTextContent(userId1+"priv2", userId1+"priv2-b");
addTextContent(userId1+"mod1", userId1+"mod1-b");
addTextContent(userId1+"mod2", userId1+"mod2-b");
return null;
}
}, userId1);
// userId1 + 5, userId2 + 3
generateFeed();
feed = activityService.getUserFeedEntries(userId1, "json", null, false, false, null, null);
assertEquals(feed.toString(), 19, feed.size());
// note: userId2 should not see activities from followers in moderated sites that they do not belong do (ALF-16460)
feed = activityService.getUserFeedEntries(userId2, "json", null, false, false, null, null);
assertEquals(feed.toString(), 8, feed.size());
AuthenticationUtil.runAs(new AuthenticationUtil.RunAsWork<Object>()
{
@Override
public Object doWork() throws Exception
{
deleteSite(userId1+"pub");
deleteSite(userId1+"priv1");
deleteSite(userId1+"priv2");
deleteSite(userId1+"mod1");
deleteSite(userId1+"mod2");
return null;
}
}, AuthenticationUtil.getAdminUserName());
feed = activityService.getUserFeedEntries(userId1, "json", null, false, false, null, null);
assertEquals(feed.toString(), 2, feed.size());
feed = activityService.getUserFeedEntries(userId2, "json", null, false, false, null, null);
assertEquals(feed.toString(), 2, feed.size());
AuthenticationUtil.runAs(new AuthenticationUtil.RunAsWork<Object>()
{
@Override
public Object doWork() throws Exception
{
deletePerson(userId1);
deletePerson(userId2);
return null;
}
}, AuthenticationUtil.getAdminUserName());
feed = activityService.getUserFeedEntries(userId1, "json", null, false, false, null, null);
assertEquals(feed.toString(), 0, feed.size());
feed = activityService.getUserFeedEntries(userId2, "json", null, false, false, null, null);
assertEquals(feed.toString(), 0, feed.size());
}
}