mirror of
https://github.com/Alfresco/alfresco-community-repo.git
synced 2025-07-07 18:25:23 +00:00
44918: Fix for ALF-14850 Opencmis getTotalNumItems doesn't return the correct result when setting MaxItemsPerPage - correctly report the max number of items 44927: ALF-16254 ("Leave Site" behaviour for group based site membership) 44931: Merged V3.4-BUG-FIX to V4.1-BUG-FIX (RECORD ONLY) 44930: Merged V3.4 (3.4.12) to V3.4-BUG-FIX 44929: Merged V4.1-BUG-FIX to V3.4 (3.4.12) 42118: ALF-15878 ALF-15741: generate doc and src zip for web-framework-commons and jlan 44939: Remove svn:mergeinfo 44985: Merged DEV to V4.1-BUG-FIX 44981: ALF-17085 : DB2: unexpected index found in database Correcting db structure after upgrade from 3.4. Optional statement was added. 44988: Merged DEV to V4.1-BUG-FIX 44937: ALF-16756: WebDAV: An error occurs on drag&drop content from local machine to alfresco when inbound move rule configured. Add check for content data length during determining existence of content on node. 44989: Merged PATCHES/V4.1.3 to V4.1-BUG-FIX 44984: Merged DEV to PATCHES/V4.1.3 44983: ALF-12425: Can't launch activiti workflow console from Share when external / ntlm / kerberos authentication is used. In activiti-admin.get.js generated an absolute URL . Use url.server + url.context instead of /alfresco. 44986: (RECORD ONLY) Merged DEV to PATCHES/V4.1.3 44937: ALF-16756: WebDAV: An error occurs on drag&drop content from local machine to alfresco when inbound move rule configured. Add check for content data length during determining existence of content on node. 44987: ALF-17331 60k Site Performance: Admin Console | Groups | Browse Groups (include sys groups): Pagination doesn't work correctly 45008: ALF-17300 - ConcurrentModificationException 45011: BDE-103 - Timezone test fail when not run from the UK (at least from Maven build) 45054: Merged from DEV to V4.1-BUG-FIX ALF-13312 - If the license does not exist, please specify in the error message 45055: Fix for ALF-13921. Description of the web project is not updated. 45063: Slight improvement to test code as part of ALF-15413. Changing test code to get companyHome from repositoryHelper rather than Lucene query, which doesn't work on a dev box with ill-configured SOLR/Lucene. 45170: Merged PATCHES\V4.1.3 to BRANCHES\DEV\V4.1-BUG-FIX 45161: Fix for ALF-17341 CLONE - Hyphen not handled correctly in cmis-alfresco search for Aspects/types : " no viable alternative at character 'a' " 45192: Merged BRANCHES/DEV/V3.4-BUG-FIX to BRANCHES/DEV/V4.1-BUG-FIX: 45187: (RECORD ONLY) Fix for ALF-16997 Discrepancies between standalone and cluster ehcache config 45312: Merged V4.0.2 (4.0.2.23-24) to V4.1-BUG-FIX (4.1.4) 44912: MNT-248 - 4.0.2.22 HOT FIX: Extra version is created saving changes in OpenOffice document via CIFS 44964: Merged DEV to PATCHES/V4.0.2 44963: MNT-263 : CLONE - CIFS: Image document version history lost after saving content in Preview on Mac Mountain Lion Fix for "Preview" shuffle scenario on Mac Mountain Lion. New ScenarioDoubleRenameShuffle scenario was added for pattern .*\.sb(-[A-Za-z0-9]*){2}. Unit test for correspomding scenario was added. 45037: Remove PID check from byte range lock list checks. MNT-266. 45286: MNT-277 - CIFS: Input/output error during saving ods file via OpenOffice. (Linux Specific) 45319: NORWEGIAN: Translation updates. 45338: Merged V4.1.3 (4.1.3) to V4.1-BUG-FIX (4.1.4) 45186: ALF-17303: fix naming mismatch when deploying alfresco-enterprise-repository artifactId to Maven 45247: Part 2: Better fix for ALF-16359 Fix SOLR logging in production and other environments 45265: ALF-17337 Read time out when browsing trash can 45298: ALF-17389: Merged: CLOUD1 to V4.1.3 45082: CLOUD-1139: Cloud feednotifier running on 2 boxes - FeedNotifierImpl modified to use reliable lock refresh - Added additional debug logging to AbstractUserNotifier just in case we have to prove duplicate entries are still being processed - For full debug logging set log4j.logger.org.alfresco.repo.activities.feed.FeedNotifier=debug - Happy New Year! 45355: ALF-17389: Fix build error 45357: Fix for ALF-17430 CMIS valid relationships do not check the source and target are valid CMIS docs or folders. 45363: Merge CLOUD1-BUG-FIX to V4.1-BUG-FIX 42576 : Job Locking of PostLookup 45367: Build fix corrections to merge 45363 45381: ALF-17389 : Implementing Activities Job Lock. 45416: Merged V4.1.3 (4.1.3) to V4.1-BUG-FIX (4.1.4) RECORD ONLY 45415: ALF-17389: Merged V4.1-BUG-FIX to V4.1.3 (4.1.3) << Previous merge was to the wrong branch >> 45363: Merge CLOUD1-BUG-FIX to V4.1-BUG-FIX 42576 : Job Locking of PostLookup 45367: Build fix corrections to merge 45363 45381: ALF-17389 : Implementing Activities Job Lock. 45424: Merged BRANCHES/DEV/BELARUS/V4.1-BUG-FIX-2013_01_05 to BRANCHES/DEV/V4.1-BUG-FIX: 45235: ALF-15604 : Oracle: schema reference files missing nvarchar2 column sizes 45425: Merged BRANCHES/DEV/BELARUS/V4.1-BUG-FIX-2013_01_05 to BRANCHES/DEV/V4.1-BUG-FIX: 45236: ALF-15604 : Oracle: schema reference files missing nvarchar2 column sizes 45480: ALF-17224: There will not be a "pageList" object in the freemarker model if a wiki page does not exist in a site and the wiki dashlet will cause an error on the site 45482: Fixed ALF-11036, applied the patch, ran the tests. 45485: ALF-17224: If the wiki page which was configured in the wiki dashlet will be deleted the dashlet will cause an error. The result of the call must be checked. 45513: MNT-279: Use binary search in cached authority search to cut down search time when a group contains an astronomical number of authorities - Experimental fix to cut down on severe profiling hit 45542: Fix for ALF-17443 - Contributors cannot edit their own discussion reply --This line, and th se below, will be ignored-- M root/projects/remote-api/source/java/org/alfresco/repo/web/scripts/discussion/ForumPostPut.java M root/projects/remote-api/source/java/org/alfresco/repo/web/scripts/discussion/DiscussionRestApiTest.java 45550: Merged V3.4-BUG-FIX to V4.1-BUG-FIX 44920: ALF-11315 removed date localisation on blogpost.lib.ftl dates and corrected date format on pubDate within postlist-rss.get.rss.ftl (iso8601 was being used instead of the required RFC822) 44936: Fix build 44967: Merged V3.4 to V3.4-BUG-FIX 44966: Merged PATCHES/V3.4.11 to V3.4 (3.4.12) 44891: ALF-17339: Merged DEV to V3.4.11 (3.4.11.2) 44877: MNT-265: possible improvement to Alfresco SQL query? - Add getOneTxnsByCommitTimeDescending function that makes efficient query to find most recent transaction in time range. 44951: ALF-17325 / MNT-274: Merged HEAD to PATCHES/V3.4.11 33015: ALF-11837 - Alfresco 4.0 SMTP Inbound does not work with messages without From and To Headers. 45191: Merged BRANCHES/V3.4 to BRANCHES/DEV/V3.4-BUG-FIX: 45172: Fixed ALF-16140: Blank filetype icon is displayed for tiff image 45436: Merged HEAD to BRANCHES/DEV/V3.4-BUG-FIX: 31107: Google Docs SSL error * Fixed SSL required error that has appeared recently. * Google seemingly no longer supports non secure access to GDoc API. * Default URL's fixed up. 45547: Merged V3.4 to V3.4-BUG-FIX 45166: ALF-17339: Merged V3.4.11 (3.4.11.4) to V3.4 (3.4.12) 45162: Merged DEV to V3.4.11 (3.4.11.4) 44877: MNT-275 Possible issue with MNT-265 fix - SQL from original HF should have used < rather than <= for upper time limit. 45230: Merged DEV to V3.4 (3.4.12) 45203: ALF-16992 : patch.fixAclInheritance is failing on sharedAclsThatDoNotInheritCorrectlyFromThePrimaryParent Ignoring of repeated ACL added 45233: Mark the NFS server as active during startup. ALF-16228. 45287: ALF-12145 Calendar autocomplete for advanced search form incorrectly handles zeros 45380: ALF-17461: There is different size of wcm-bootstrap-context.xml file from installer and archive - Replicated changes from ALF-11644 to Bitrock-installed copy of wcm-bootstrap-context.xml 45454: ALF-17396, ALF-13805: Merged V4.1-BUG-FIX (4.1.4) to V3.4 (3.4.12) Revision: 45452 Author: kroast Date: 16 January 2013 09:59:45 Message: Corrected config check for ALF-16413 - Share asks for Basic-Auth while not needed trying to access RSS feeds (thus breaking SSO). ---- Modified : /alfresco/BRANCHES/DEV/V4.1-BUG-FIX/root/projects/slingshot/source/java/org/alfresco/web/site/servlet/SlingshotFeedController.java 45491: Merge DEV to V3.4 (V3.4.12) 45473: ALF-11956: WCM accessibility DOJO time picker has been fixed to allow selection of hours and minutes, using keyboard. Missing JavaScript key event handlers have been added. CSS class checking has been fixed in 'alfresco.xforms.FocusResolver' in 'xforms.js' to support all versions of IE. Some other minor changes... 45543: Merged V4.1 to V3.4 44743: ALF-17533 / ALF-17117: Created article or publication cant be viewed on WQS site - Further corrections to locking to avoid deadlocks 44682: ALF-17512 / ALF-17118 WQS: Impossible to upload document to publications space - Only first part to do with the transformation failure has been committed. 44653: ALF-17533 / ALF-17117: Created article or publication cant be viewed on WQS site - Missed file from previous checkin 44652: ALF-17533/ ALF-17117: Created article or publication cant be viewed on WQS site - Fixes by Dmitry Vaserin - Removed unnecessary outer read locks from getRelatedAssets and getRelatedAsset to prevent deadlock - Correct markup error when node doesn't have tags 45546: ALF-17512: Corrections to property names by Pavel 45548: Merged V3.4 to V3.4-BUG-FIX (RECORD ONLY) 44977: Merged V3.4-BUG-FIX to V3.4 44936: Fix build 45553: Merged V3.4-BUG-FIX to V4.1-BUG-FIX (RECORD ONLY) 45523: Merged BRANCHES/DEV/V4.1-BUG-FIX to BRANCHES/DEV/V3.4-BUG-FIX: 45482: Fixed ALF-11036, applied the patch, ran the tests. 45557: Merged V3.4-BUG-FIX to V4.1-BUG-FIX (RECORD ONLY) 45556: Merged V3.4 to V3.4-BUG-FIX 45554: Latest translations from Gloria for revision 45205 45568: Merged PATCHES/V4.1.3 to V4.1-BUG-FIX 45421: Merged HEAD to PATCHES\V4.1.3 44243: Merged BRANCHES\DEV\AUTH_BRIDGE to HEAD 43735: Final part of ALF-14861 SOLR to scale for non-admin users in 100k sites and a subgroup of each of 1000 independent groupings with 1000 subgroups ALF-17489 ALF-17456 45428: ALF-17455 : BM-0013: SOAK01_04: Activities Feed Cleaner query runs for minutes 45489: ALF-17455 : BM-0013: SOAK01_04: Activities Feed Cleaner query runs for minutes 45569: Merged PATCHES/V4.1.3 to V4.1-BUG-FIX (RECORD ONLY) 45564: ALF-17492: WebScript errors must contain useful information - So doth Derek decree - Copied in Surf revision 1217 changes as class local to share.war to avoid pulling in any more untested Surf changes 45591: ALF-17465 (Document "social buttons/actions" not showing in document library page while document is being edited (locked)) 45601: ALF-17433 (Document detail version display incorrect document version when clicking on edit off line) 45611: ALF-17478 - MailMetadataExtracter does not store all Message-Recipient-Address 45622: Merged HEAD to BRANCHES/DEV/V4.1-BUG-FIX: 35614: ALF-17598: CLONE - Add range header support to the webDAV servlet 45633: ALF-17469: JSON message sent back to a client after a category creation is only partially JSON --This line, and th se below, will be ignored-- M category.post.json.ftl 45641: Fix non-ASCII character in source comment 45649: ALF-17556 (Share not redering URL correctly in description field) 45650: Manually merged HEAD to BRANCHES/DEV/V4.1-BUG-FIX: - Changes to StreamContent from merge of THOR1_SPRINTS to HEAD in r34698 45651: Merged HEAD to BRANCHES/DEV/V4.1-BUG-FIX: 45222: ALF-17599: CLONE - Support For HTTP Range Requests in Repository WebScripts - Added HttpRangeProcessor.processRange which takes a WebScriptResponse parameter instead of HttpServletResponse - Changed HttpRangeProcessor.processSingeRange and HttpRangeProcessor.processMultiRange to accept a generic Object parameter then cast to the appropriate WebScriptResponse or HttpServletResponse - Added Javadoc to HttpRangeProcessor.processRange - Changed StreamContent.streamContentImpl to add code from BaseDownloadContentServlet which does the work of processing the range header from the request - Changed StreamContent.streamContentImpl method signature to accept nodeRef and propertyQName parameters needed for multi-range requests - Modified methods which override or call StreamContent.streamContentImpl for new method signature, passing in nodeRef and propertyQName or nulls where appropriate 45655: Merged DEV to V4.1-BUG-FIX (4.1.4) 45565: ALF-17503 : Lucene search with skipcount > hits fails when RM is installed Return a length=0 if a difference of values (count of finded results and results, that need to skip) is < 0 45672: ALF-17452 (Status can't be updated with a blank status) 45682: ALF-17444: Transformation of Outlook files (.msg) doesn't work ootb 45751: Merged DEV to VC4.1-BUG-FIX (4.1.4) 45748: ALF-17517: Document does not revert to previous version if certain rule is applied to the parent folder. Check node existance on ActionExecuterAbstractBase execution. Add unit test for case when inbound rule executed on node that was checked in. 45758: ALF-12264: Fixed issue with pooled-tasks for groups with same name across tenants 45761: Block r45756 from being merged to V4.1-BUG-FIX 45765: Fix for ALF-17153 FTS query parser FTSQueryParser is not debuggable 45810: ALF-17520: Open Document templates are not tranformed properly for thumbnail and preview generation 45828: Additional fix for ALF-17153 FTS query parser FTSQueryParser is not debuggable 45857: ALF-17516 (SHARE: Admin console of users and groups) 45873: Remove so-called intermittent test category, so that only RepositoryStartupTest remains as a gatekeeper 45903: ALF-16611 (When opening My Pages filter, a link to the renamed document becomes red) 45906: ALF-17515: Wrong mimetype name in mimetype-map.xml - Changed macroEnabled to macroenabled 45913: ALF-17462 (In Alfresco explorer invitation to a site does not show the correct options) 45921: Fix for ALF-17421 If a property is both multi-valued and multilingual a ClassCastException is thrown when Solr tries to index the property - support multi-valued ML text but not content 45926: Fix for ALF-17602 lucene.defaultAnalyserResourceBundleName is not injected anywhere in the spring config 46024: Merged V4.1.3 (4.1.3) to V4.1-BUG-FIX (4.1.4) 45585: ALF-17303: alfresco-platform-distribution was not deployed properly to Maven repo 45621: Removed svn:mergeinfo. A 1.7 client should do this automatically. 45669: Fix ALF-17582 - BM-0013: JMeter: Run 02: MT ContentStore caching is not thread safe 45670: Fix ALF-17589 - BM-0013: JMeter: Run 02: CMISAbstractDictionaryService caching of DictionaryRegistry is not thread safe 45692: Config option for ALF-17526 BM-0013: JMeter: Run 02: Improve efficiency of services for SOLRAPIClient.getNodesMetaData - preloading can be controlled + removed incorrect use of the secondary cache that could pull in stale data 45705: Reverted Config option for ALF-17526 BM-0013: JMeter: Run 02: Improve efficiency of services for SOLRAPIClient.getNodesMetaData - preloading can be controlled + removed incorrect use of the secondary cache that could pull in stale data 45716: Fix for ALF-17594 SolrTracker: CMIS model diff (show 1 repeated diff) => CMIS dictionary re-init x2 (every 15 sec) - only refresh the CMIS dictionary if there was an actual model put 45755: Extra support to make clear what causes any difference between SOLR reports ALF-17588 BM-0013: JMeter: Run 02: Deviation was detected in full index check reports for SOLR nodes. - also added RETRY command to retry indexing any nodes that failed with errors. 45803: Fix for ALF-17490 Solr indexation problem with certain acls on a customer environment - AclsGet respects the maximum acls requested and does not silently truncate toe 1024 45829: GERMAN: Translation updates based on EN r45262 45830: SPANISH: Translation updates based on EN r45262 45831: FRENCH: Translation updates based on EN r45262 45832: ITALIAN: Translation updates based on EN r45262 45833: JAPANESE: Translation updates based on EN r45262 45834: DUTCH: Translation updates based on EN r45262 45835: RUSSIAN: Translation updates based on EN r45262 45836: CHINESE: Translation updates based on EN r45262 45858: Fix ALF-17634 -on startup FeedNotifier fetches all people slowly - switch from GetChildren CQ -> GetPeople CQ 45859: Fix ALF-17634 -on startup FeedNotifier fetches all people slowly - reverse fix for this test ... for now, until we re-implement the deprecated method and fix the test case ;-) 45951: Fix for ALF-17687 BM-0013: Soak: Run 02: SolrJSONResultSet must preload nodes - added node preload 45952: SiteServiceImplTest: Added check that size limiting of results is working (and other minor cleanup) 45953: Fixed ALF-17702: BM-0013: Soak: Run 02: getCachedChildAuthorities is not caching results - getChildAssocs specifically checks for 'members' associations (was eliminated by code) - Cache negative results i.e. when there are no children 45969: Part fix for ALF-17526 BM-0013: Soak: Run 02: SOLRAPIClient.getNodesMetaData does N+1 calls to NodeDAO - prependPaths caches nodes for the next layer 45998: Part 2 ALF-17526 BM-0013: Soak: Run 02: SOLRAPIClient.getNodesMetaData does N+1 calls to NodeDAO - make sure bulk node load works and that assocs are cached 45999: Alternative implementation for ALF-17719 BM-0013: Soak: Run 03: Contained authorities cache warmup times are restrictive - bridge table is the default for hasAuthority() - configurable on AuthorityServiceImpl 46000: ALF-17574 BM-0013: JMeter: Run 02: Blocked threads on PDFParser.parse - Found two blocking points in PdfBox to do with loading fonts from the class path (this was the main cause) and the PDFOperator access to a Synchronised map (identified above by Derek). - Note in 1.7.0 of PDFBox generally no font was loaded, but under 1.6.0 it was. This may be a bug in 1.7.0 46001: ALF-17722: Merged V3.4 (3.4.12) to V4.1.3 (4.1.3) 45629: ALF-17536: Stack Specific: Can't transform pdf to jpg - Added TRACE to log env properties using log4j.logger.org.alfresco.util.exec.RuntimeExec=trace 45667: ALF-17536 Can't transform multi page pdf to jpg - issue was introduced by ALF-15436 Alfresco 3.4c + Share + TIFF preview only shows the first page 46018: Merged HEAD to PATCHES/V4.1.3 41904: Fixes bugs uncovered by JDK 7 upgrade - nodeService's interceptors depended on nodeService, resulting in some 'interesting' interceptor ordering in the chain (3 * the normal number in a random order). Now we use a lazy interceptor to break the cycle. - When the Content Language was en_GB and an MLText property contained {en_US, en_GB} it would return the en_US one, not taking country codes into account when available 46023: Follow on to previous check in. Fix up evil cloud sync override of "nodeService" to also not suffer from a cyclic dependency! 46034: Merged V3.4-BUG-FIX (3.4.13) to V4.1-BUG-FIX (4.1.4) 45745: Merge V3.4 (3.4.12) to V3.4-BUG-FIX (3.4.13) 45629: ALF-17536: Stack Specific: Can't transform pdf to jpg - Added TRACE to log env properties using log4j.logger.org.alfresco.util.exec.RuntimeExec=trace 45667: ALF-17536 Can't transform multi page pdf to jpg - issue was introduced by ALF-15436 Alfresco 3.4c + Share + TIFF preview only shows the first page 45724: ALF-17533 CLONE - Created article or publication cant be viewed on WQS site - Further change required to avoid deadlock 45743: Correction to AuditComponentTest - Test was reporting "Incorrect number of audit entries after failed login expected:<1000> but was:<XXX>" where XXX was less than 1000. This was because results was being cleared if all all audit failures were not available in the first loop. The results needed to cleared before the first loop rather than in every loop. For example an XXX value of 830 would simply indicate that the first loop had received 170 audit results and that a second loop was required to get the rest. 45754: Merged V3.4 (3.4.12) to V3.4-BUG-FIX (3.4.13) 45747: Correction to AuditComponentTest - Okay last commit did not work. Try just waiting a bit longer than a second if we don't have all records. 45976: Merged DEV to V3.4-BUG-FIX 45925: ALF-16992 : patch.fixAclInheritance is failing on sharedAclsThatDoNotInheritCorrectlyFromThePrimaryParent Added a detection on cyclic loop for "inherits from" field. 46037: Merged V4.1.3 (4.1.3) to V4.1-BUG-FIX (4.1.4) 46033: Build fixes 46032: ALF-17628 (No information is displayed in My Activities and Site Activities dashlets for content creation) 46095: 46100: ALF-17773, ALF-17774, ALF-17775, ALF-17776: Merged V4.0.2 (4.0.2.26) to V4.1-BUG-FIX (4.1.4) 45469: MNT-280: Merge from HEAD to V4.0.2 (4.0.2.25) 43617: Fix for ALF-16795 CMIS 0.8 TCK - load of large content fails 45875: Merged DEV to V4.0.2 (4.0.2.26) 45874: MNT-282: Mbean error stemming from cmis create. Synchronize initiating ContentStore. Add tenant name to object name of ContentStore MBean for preventing overriding of tenant MBeans. 45904: MNT-285 Content Stream Errors during CMIS load test (Continuation of MNT-280) - Added 'advice' above retrying transactions to supply a ReusableContentStream 45910: MNT-285 Content Stream Errors during CMIS load test (Continuation of MNT-280) - Added unit tests - tests both new TempFileProvider method and AlfrescoCmisStreamInterceptor - Corrections to interceptor 46104: ALF-15843: Upgrade swftools back to 0.9.2 46109: Merged RECORD ONLY V4.1.3 (4.1.3) to V4.1-BUG-FIX (4.1.4) 46106: Merged V4.1-BUG-FIX (4.1.4) to V4.1.3 (4.1.3) 46100: ALF-17773, ALF-17774, ALF-17775, ALF-17776: Merged V4.0.2 (4.0.2.26) to V4.1-BUG-FIX (4.1.4) 45469: MNT-280: Merge from HEAD to V4.0.2 (4.0.2.25) 43617: Fix for ALF-16795 CMIS 0.8 TCK - load of large content fails 45875: Merged DEV to V4.0.2 (4.0.2.26) 45874: MNT-282: Mbean error stemming from cmis create. Synchronize initiating ContentStore. Add tenant name to object name of ContentStore MBean for preventing overriding of tenant MBeans. 45904: MNT-285 Content Stream Errors during CMIS load test (Continuation of MNT-280) - Added 'advice' above retrying transactions to supply a ReusableContentStream 45910: MNT-285 Content Stream Errors during CMIS load test (Continuation of MNT-280) - Added unit tests - tests both new TempFileProvider method and AlfrescoCmisStreamInterceptor - Corrections to interceptor 46087: Merge V4.1-BUG-FIX (4.1.4) to V4.1.3 (4.1.3) 45480: ALF-17224: There will not be a "pageList" object in the freemarker model if a wiki page does not exist in a site and the wiki dashlet will cause an error on the site 46112: Merged (4.1.3) to V4.1-BUG-FIX (4.1.4) 46048: ALF-17727 - BM-0013: Soak: Run 03: Site creation leads to contention on sites container - disable auditable behaviour on "sites" container (when creating a site) 46050: ALF-17727 - BM-0013: Soak: Run 03: Site creation leads to contention on sites container - disable auditable behaviour on "sites" container (when deleting a site) 46055: ALF-17729 - BM-0013: Soak: Run 03: ADMRemoteStore optimization to reduce contention on share folders - disable auditable behaviour on parent folder (when creating / deleting file) 46059: Fixed ALF-17756: Thumbnails are being indexed - Add the cm:indexControl aspect to thumbnails at creation time - Also prevent timestamp propagation when adding or removing thumbnails 46077: Following on from rev 46059 (ALF-17756): Fixed up the mock NodeService.createNode call as we now pass in indexControl properties 46078: Build fix for SiteServiceImplTest.testGroupMembership(SiteServiceImplTest.java:1308) 46079: Additional fix for out of transaction tests 46124: Reverse merge << Will A. did not intend to commit this >> 46095: 46159: Fixed ALF-16889, Enabled cookie support for /wcs/api/login, independent from SSOAuthenticationFilter, on by default. 46165: Fix for ALF-17787 - Site Members 'All Members' link should not run query immediately 46169: Fix for ALF-17787 - Site Members 'All Members' link should not run query immediately - missing file 46184: Refactoring a test class to use JUnit Rules - as part of attempt to reproduce ALF-17797. Using JUnit Rules like this will make it much easier to switch users between test methods. Checking in separately from future work as this check-in is a pure refactor. 46185: ALF-17503 : Lucene search with skipcount > hits fails when RM is installed Fix build failures - Correct tests which expected -ve number of rows returned in a resultset 46192: Enhancement to JUnit Rule TemporaryNodes.java as required by fix for ALF-17797. This check-in enhances TemporaryNodes to allow for the easy creation of specific named quick files. Previously you could only easily create a quick file selected by MIME type. Now you can use e.g. 'quickCorrupt.pdf' to get that specific file. 46194: Fix for ALF-17797. AddFailedThumbnailActionExecuter is failing. This check-in adds a test case that reproduces the issue and a fix. The fix was to have the AddFailedThumbnailActionExecuter action runAs system. This is consistent with the behaviour of the create-thumbnail action itself. There is no way via the ActionService to run an action (in this case a compensating action) as a nominated user, and therefore I have had to change the implementation of AddFailedThumbnailActionExecuter.executeImpl so that it always runs-as system. 46202: ALF-17644: Document version was increased after canceling editing. - Also a better fix for ALF-17167 46208: ALF-17517 Document does not revert to previous version if certain rule is applied to the parent folder. - fix build failures (may still be one left) - Not all actions are node based 46230: Merged V3.4-BUG-FIX to V4.1-BUG-FIX (4.1.4) 46227: Filter repository test resources from alfresco.war 46272: ALF-17841: Upgrade 4.0 --> 4.1.4 ClassCastException from OnPropertyUpdateRuleTrigger - Only listen for updates of single-valued content properties and cope with it previously being multi-valued (as can be the case with the devious license property) 46279: ALF-17810: Imagemagick requires installation of Visual C++ redistributables - x86 VC++ 2008 SP1 redistributables now installed to support ImageMagick 46354: ALF-10569: Reversing r32622 as it was due to an invalid interpretation of a Microsoft spec and should be unnecessary for the correct support of WebDAV 'dead properties'. - Correct fix about to be merged in from V3.4-BUG-FIX 46360: ALF-17697: Create proper source jars, to deploy to Maven repository 46361: Merged V3.4-BUG-FIX to V4.1-BUG-FIX 45756: ALF-14722: Repeat merge of V4.1-BUG-FIX to V3.4-BUG-FIX - previous merge in r43028 did not bring over all required changes 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. 45948: Merged DEV/WABSON/V4.1-GOOGLEDOCS-BUG-FIX to DEV/V3.4-BUG_FIX 45898: ALF-17704 / ALF-16167: 'Edit Offline' checks out document in Google docs - Edit in Google Docs action is now decoupled from Edit Offline action - The checkout to Google Docs is only performed if a new parameter 'gdc' is set as a paramter when calling the action web script - This paramter causes the web script to call a new method checkoutToGoogleDocs() on ScriptNode if the parameter is set - The new method simply calls the existing checkout() method after setting a custom property on the transaction - The Google Docs policies now check for the presence of this transaction property before sending the document to Google 45976: ALF-17876: Merged DEV to V3.4-BUG-FIX 45925: ALF-16992 : patch.fixAclInheritance is failing on sharedAclsThatDoNotInheritCorrectlyFromThePrimaryParent Added a detection on cyclic loop for "inherits from" field. 46041: ALF-17877: Merged DEV to V3.4-BUG-FIX (with corrections) 46013: ALF-17662 : The deleted via Sharepoint document is not removed from Alfresco but hidden aspect is added for it Documents marked with sys:hidden aspect should be invisible through SPP protocol and should be treated as nonexistent. 46054: ALF-17878 / ALF-17633 add alfresco-mmt.jar in the SDK distribution 46173: ALF-17879 / ALF-17806: Merged PATCHES/V3.4.10 to V3.4-BUG-FIX 46099: MNT-293: Merged V4.0-BUG-FIX to PATCHES/V3.4.10 37969: Fixes for: ALF-12772 'Path not found' error in Share if user has no permissions to parent folders in breadcrumb ALF-14527 Share - Error to display documents if user has no access to the parent folder - Share now correctly supports accessing documents and folders (and details page actions) where the user does not have Read permissions on the parent node. 46101: MNT-293: AccessDenied using CMIS when user does not have access to parent folder - Fix by Vasily 46125: MNT-293: Correct Kev's logic to do permission checks after resolving a path as system 46127: Merged V3.4 to PATCHES/V3.4.10 45743: Correction to AuditComponentTest - Test was reporting "Incorrect number of audit entries after failed login expected:<1000> but was:<XXX>" where XXX was less than 1000. This was because results was being cleared if all all audit failures were not available in the first loop. The results needed to cleared before the first loop rather than in every loop. For example an XXX value of 830 would simply indicate that the first loop had received 170 audit results and that a second loop was required to get the rest. 45747: Correction to AuditComponentTest - Okay last commit did not work. Try just waiting a bit longer than a second if we don't have all records. 46195: ALF-17880 / ALF-17378: Web content is not editable after cancelling the Edit Web Content Wizard - Fix by Andrey 46227: Filter repository test resources from alfresco.war 46324: Merged DEV to V3.4-BUG-FIX (with improvements) 45602: ALF-10569 / ALF-17519 : SPP is setting residual properties with an unknown name space (urn:schemas-microsoft-com) Implemented special case for handling dead webdav properties. New webdav:object aspect was introduced. It is used to store all dead properties that may be set on resource. 46353: ALF-17881 / ALF-17272: TooManyClauses error due to syntax error in the query generated from UIComponentSelector - Fixed typo in Lucene query generation introduced in r20310 46362: ALF-17876: Re-fix typo introduced in V3.4-BUG-FIX merge 46363: Merged V3.4-BUG-FIX to V4.1-BUG-FIX (RECORD ONLY) 46285: Merged V4.1-BUG-FIX to V3.4-BUG-FIX 46279: ALF-17810: Imagemagick requires installation of Visual C++ redistributables - x86 VC++ 2008 SP1 redistributables now installed to support ImageMagick 46325: ALF-17863: Merged V4.1-BUG-FIX to V3.4-BUG-FIX 43649: ALF-16756: WebDAV: An error occurs on drag&drop content from local machine to alfresco when inbound move rule configured. 43651: ALF-16756: Fixed typos - I took this code in good faith! 44988: Merged DEV to V4.1-BUG-FIX 44937: ALF-16756: WebDAV: An error occurs on drag&drop content from local machine to alfresco when inbound move rule configured. Add check for content data length during determining existence of content on node. 46395: Merged V4.1.3 (4.1.3) to V4.1-BUG-FIX (4.1.4) 46121: Fixed code warnings 46123: Further improvements on ALF-17702: BM-0013: Soak: Run 02: getCachedChildAuthorities is not caching result - Reduced cache entry size - Removed binary sort search for authority entries - PS: This is one of the most heavily used code paths in the system 46153: Merged DEV to V4.1.3 (4.1.3) << Lots of other changes in addition to merged code>> 46093: ALF-16149 : CLONE - User search retrieves all users from the DB regardless of search criteria - Re-implemented deprecated method PersonServiceImpl.getPeople(...) to use getPeopleCQ or FTS search - Replaced calls to deprecated getPeople with calls to other one where it would end up being called anyway. - Fixed PersonServiceTests - Fixed GetPeopleCannedQuery to use totalResultCount - tests failed otherwise - Added warning to PersonService.getPeopleFilteredByProperty(...) if PROP_FIRSTNAME, PROP_LASTNAME, PROP_USERNAME were not being used. This was the one place that 'could' called the deprecated getPeople(...) method with other properties. Other properties are not included in the search values. 46178: ALF-17796 - BM-0013: Soak: Run 04: Contention on folder 'user' containing users - disable auditable behaviour on parent folders (see also ALF-17729) 46244: Fix for ALF-17801 BM-0013: Soak: Run 04: ConcurrentModificationException in AbstractLuceneQueryParser - consistently name anonymous constraints defined on properties 46265: ALF-17799 - BM-0013: Soak: Run 04: Regular timeouts getting site memberships - initial fix: make sure limit cut-off is also applied when processing "groups to expand" 46286: Fix for ALF-17801 BM-0013: Soak: Run 04: ConcurrentModificationException in AbstractLuceneQueryParser - build fixes for 1) Anonymous over-ridden constraints defined to contain the wrong property definition (no matter) 2) but above causes name collision on over-ridden anonymous constraints on properties 3) fix -over ride order to set inherited property definition info before over-ridding the property 46290: ALF-17799 - BM-0013: Soak: Run 04: Regular timeouts getting site memberships - fix SiteActivityTest fallout (and adhere to current API contract) 46315: ALF-17788: WebSphere: QueryException occurs during the clean startup - Corrected regression where FeedNotifier tries to scroll past the end of a result set 46316: ALF-17702: Fixed regression of MNT-279 fix - Avoid sequential search across massive user sets when evaluating ACLs 46350: Update Maven POM files - Upgrade version to 4.1.3 - Upgrade pdfbox to 1.7.0-alfresco-20130130, to catch up after r46000 fixing ALF-17574 46370: ALF-17613: Merged V4.0.2 (4.0.2.27) to V4.1.3 (4.1.3) 46368: MNT-298 HF - Replace file by drag-and-drop over CIFS on Mac OS X and passthru/LDAP-AD gets "is in use" message and deletes the file 46421: Fix for ALF-17886. DeleteRenditionActionExecuter Acces is denied. With test of course. 46438: ALF-17622 (Activities with Google Docs are not displayed in My Site Activities and Site Activities dashlets) 46445: Fix for ALF-17327 Cannot retrieve documents with a Japanese keyword. 46457: ALF-17904 (GoogleDocs action doesn't work in doclib view) 46482: Fix for ALF-17858. NPE in formService webscript. 46497: Fix for ALF-15371 Instances of java.util.Map interface cannot be accessed in JavaScript The fix was to have getDefaultValue(Class) return the map.toString. It was previously returning null. 46533: ALF-17286: SPP (Cluster specific):Document workspace is not browseable via Share if alfresco.host is pointing to balancer host - Ensure that concurrency conditions from AclDAO get propagagedby NodeDAO 46540: Fix for ALF-17397 searching based on property value that contains dashes doesn't work in a crossloanguage context using Solr - fixed - also added support for query/index time analysis control for the default cross-language analyser. - Not required to resolve the bug but may be useful to reduce query complexity (e.g. do not generate concatenated tokens for query) which could have been used as a work around for this bug if available. 46546: Merged DEV to V4.1-BUG-FIX 46494: ALF-17899 TempFileProvider.createTempFile() is not debugable Added debug logs. 46562: ALF-17917: Corrected internationalization of Imap Home folder - Unfinished business from ALF-15700 46563: Fix for ALF-17572 - Grey background in 'Google Docs Theme' when uploading files with IE8 46564: Fix for ALF-17150 - Edit Online action missing in Share for some mime types (incorrect mimetype for PowerPoint files with SLDM extension) 46565: ALF-17917: Correction to previous fix - Use distinct key spaces.imap_home.childname, because spaces.imapConfig.childname was already being used for other purposes 46568: Fix for ALF-17757 and ALF-1101 RSS Dashlet cannot display RSS feed produced by Shareӳ blog / RSS Feed Dashlet unable to read internal Alfesco Share site RSS Feeds - Fix implementation from Will Abson NOTE: there is a cavet, suggest SSO style config as per ALF-16413 to avoid basic auth pop-up when displaying some feeds. 46624: removed 46625: Undo last commit 46626: Merged V4.1.1 (4.1.1.21) to V4.1-BUG-FIX (4.1.4) 46602: ALF-17953: Alfresco constantly running full GCs - Possible fix to TikaPoweredContentTransformer to make it wrap FileContentReaders as TikaInputStreams which can be cast to Files and appear not to need reading into memory in their entirety in uncompressed form! - Fix also required to TikaOfficeDetectParser to avoid it wrapping a TikaInputStream unnecessarily 46629: RECORD ONLY Merged V4.1.3 (4.1.3) to V4.1-BUG-FIX (4.1.4) 46622: ALF-17968: Merged V4.0.2 (4.1.1.21) to V4.1.3 (4.1.3) 46602: ALF-17953: Alfresco constantly running full GCs - Possible fix to TikaPoweredContentTransformer to make it wrap FileContentReaders as TikaInputStreams which can be cast to Files and appear not to need reading into memory in their entirety in uncompressed form! - Fix also required to TikaOfficeDetectParser to avoid it wrapping a TikaInputStream unnecessarily 46607: ALF-17953 Alfresco constantly running full GC's - some java.lang.threads holding around 9Gb of memory - Added transformation limits to the 8 TikaPoweredContentTransformer based transformers, so that the maxSourceSizeKBytes can be set for each transformer and for each source mimetype used by each transformer. - maxSourceSizeKBytes set to 40MB for the newer 2007 MS office types (4 char ext). 46619: ALF-17953 Alfresco constantly running full GC's - some java.lang.threads holding around 9Gb of memory - Changed maxSourceSizeKBytes values from 40MB back to -1 for the newer 2007 MS office types (4 char ext). 46636: Fix for ALF-13442 Tomcat memory leak warnings occur during the shutdown 46679: Merged DEV to V4.1-BUG-FIX (4.1.4) 46659: ALF-17631 : Errors/Exception during stress tests of CMIS GET children RetryingTransactionHelper has now ability to handle pre-configured exceptions as retriable in addition to default list of exceptions. 46683: Merge PATCHES/V4.1.3 to V4.1-BUG-FIX (4.1.4) 46637: Update the notice.txt and licenses with the latest modifications Add Microsoft Visual C++ 2008 Redistributable Package in the notice.txt 46693: RECORD ONLY Merged V3.4-BUG-FIX (3.4.13) to V4.1-BUG-FIX (4.1.4) 46692: ALF-17984: Merged V3.4.12 (3.4.12.2) to V3.4-BUG-FIX (3.4.13) 46680: MNT-307: DEV to V3.4.12 (3.4.12.2) 46659: ALF-17631 : Errors/Exception during stress tests of CMIS GET children RetryingTransactionHelper has now ability to handle pre-configured exceptions as retriable in addition to default list of exceptions. - Change to opencmis-context.xml on DEV (based on 4.1.4) was made to cmis-ws-context.xml on V3.4.12 46694: Merged DEV to V4.1-BUG-FIX (4.1.4) 46686: ALF-17631 : Errors/Exception during stress tests of CMIS GET children Unit test add for RetryingTransactionHelper to test extra exceptions are rertied correctly. 46724: create-site.css and create-site.js will be included in the header (share-config.xml) therefore there is no reason to include them in the freemarker templates. 46759: Merged DEV to V4.1-BUG-FIX (4.1.4) 46734: ALF-17873 Missing versionLabel property after Version2ServiceImpl.restore() 1. In Version2ServiceImpl.restore() to props Map was added ContentModel.PROP_VERSION_LABEL property. 2. In VersionServiceImplTest.testRestore() was added the check that ContentModel.PROP_VERSION_LABEL property is correct. 46760: Merged DEV to V4.1-BUG-FIX (4.1.4) 46433: ALF-16883: Incorrect message occurred when delete Workspace if document is locked. Not possible to change MS Office message - have improved alfresco log message 46782: ALF-17317 4.0.2.23 HOT FIX: OpenOffice server conversion failed 46783: ALF-17546 OOXMLThumbnailContentTransformer is not registered to handle special Office document types, such as templates and macro-enabled variants of document / template 46797: Restore missing mergeinfo accidentally removed in r46562 46799: ALF-17546 OOXMLThumbnailContentTransformer is not registered to handle special Office document types, such as templates and macro-enabled variants of document / template - typo in mimetype case 46916: ALF-17174 pdf2swf supports converting N first pages but alfresco does not support it via the pageLimit 46933: ALF-8144: Drastically improving performance using lazy-loaded WorklfowTask properties and path + improved the way share pages workflow-tasks to prevent building full model for unneeded tasks 46946: ALF-18000: Startup script depends on the working directory where it is run - Changed vti.properties to vti.server.ssl.keystore=${dir.keystore}/vti.ssl.keystore 46995: Improvement related to ALF-17380 Solr queries running slowly - reader -> acl cache is built on demand (and warmed via authority warming) - this will mean it is not eagerly built for the archive store where it would be little used, and could be configured off for this case 47032: ALF-17804: cmisatom URL (opencmis backed by Apache Chemistry OpenCMIS) does not support External authentication - Now it supports all kinds of authentication because it sits behind Alfresco's authentication filters - Fix researched by Alex Mukha 47033: Merged V3.4-BUG-FIX to V4.1-BUG-FIX 46453: ALF-18122 / ALF-17708: Incorrect behavior of "Show/Hide Breadcrumb" button when RM is installed - ContentService.getReader() now triggers a transaction retry if content is found to have disappeared under its feet due to eager content cleaning 46495: ALF-18122 / ALF-17708: Incorrect behavior of "Show/Hide Breadcrumb" button when RM is installed - lower impact fix will only throw retryable exception if stream is accessed 46822: ALF-18123: Merge Dev to V3.4-BUG-FIX ALF-17408 : Content is not displayed in imap folder after recovering 46823: ALF-18124 / ALF-18091: Fix for MNT-311 - authentication challenge not present when users open direct links below /share/proxy/alfresco/cmis/i 46927: ALF-18124 / ALF-18091: Merged PATCHES/V3.4.10 to V3.4-BUG-FIX 46925: Merged V3.4-BUG-FIX to PATCHES/V3.4.10 (with correction) 46823: Fix for MNT-311 - authentication challenge not present when users open direct links below /share/proxy/alfresco/cmis/*/content 46942: ALF-17990: Fix security descriptors for new FileFolderService isHidden setHidden methods 47021: ALF-18125: Merged DEV to V3.4-BUG-FIX 46825: ALF-17681 : Lucene Search queries with PATH doesn't work in tenants A JUnit test was implemented to show that the PATH Lucene indexes are not created correctly for tenants. 46968: ALF-17681 : Lucene Search queries with PATH doesn't work in tenants The creation of PATH indexes is now made in context of multi tenant System user to run the reindexing process correctly in unauthenticated threads. 47034: Merged V3.4-BUG-FIX to V4.1-BUG-FIX (RECORD ONLY) 47030: ALF-16102: Merged PATCHES/V3.4.10 to V3.4-BUG-FIX (RECORD ONLY) 41755: ALF-16013: Merged V4.1-BUG-FIX to PATCHES/V3.4.10 41539: ALF-15899: Inbound email does not support multiple recipient folders - Fix by Dmitry Vaserin 47031: ALF-18121: Merged PATCHES/V3.4.11 to V3.4-BUG-FIX 46978: MNT-320: Merged HEAD to PATCHES/V3.4.11: 36623: ALF-10243: form-service date-control now allows configuring only to send date-component of date-only formfields (timezone and time-component is reset server-side to prevent unnecesairy timezone-issues) 47035: Merged PATCHES/V4.1.3 to V4.1-BUG-FIX 46398: Fix for ALF-17889 Alfresco failing as constraint in extension model cannot be defined - use the namespace from the containing model and not the over-ridden property. 46426: Merged BRANCHES/DEV/V4.1-BUG-FIX to PATCHES/V4.1.3: 46421: Fix for ALF-17886. DeleteRenditionActionExecuter Acces is denied. 46446: ALF-17864: BM-0013: Soak: Run 05: SiteService.listSites(username, size) performance (=> via listSitesImpl) - isAuthorityContained made to prune its search drastically - it caches hits and misses speeding up the search in a deeply nested group hierarchy such as SAP's - To avoid huge memory impact with lots of duplicate copies of authority names a pool of authority names is shared across all threads - getContainingAuthoritesInZone reinstated for site listing as it warms the same caches as the ACLs - Derek's latest tests with the changes applied showed a good speed up 46501: ALF-17929: BM-0013: Soak: Run 06: /api/sites/{shortname}/memberships/{authorityname} / SiteServiceImpl.getMembersRoleInfo performance poor - Possible fix to regression caused by ALF-16254 - A very inefficient route was being taken towards checking a user's indirect site role 46502: ALF-17930: BM-0013: Soak: Run 06: ConcurrentModificationException in AuthorityDAOImpl - Don't try to mutate the set returned by getContainingAuthorities() 46503: ALF-17929: BM-0013: Soak: Run 06: /api/sites/{shortname}/memberships/{authorityname} / SiteServiceImpl.getMembersRoleInfo performance poor - Further optimizations to prevent unnecessary recursion in AuthorityDAOImpl.listAuthorities() 46506: ALF-17929: BM-0013: Soak: Run 06: /api/sites/{shortname}/memberships/{authorityname} / SiteServiceImpl.getMembersRoleInfo performance poor - Fixed typo producing invalid membership results 46627: ALF-17967: Error in org.alfresco.repo.workflow.WorkflowServiceImpl.getPooledTasks on StartUp. - Logic error in org.alfresco.repo.workflow.WorkflowServiceImpl.getPooledTasks() introduced in ALF-14861 / r45421 - Rather than fixing the screwy logic (which I think would cause a major performance hit) I'm reinstating the 4.1.2 "cut off after 100 groups" behaviour 46630: Merged 4.1-BUG-FIX to PATCHES/V4.1.3 46562: ALF-17917: Corrected internationalization of Imap Home folder - Unfinished business from ALF-15700 46565: ALF-17917: Correction to previous fix - Use distinct key spaces.imap_home.childname, because spaces.imapConfig.childname was already being used for other purposes 46779: ALF-17967: Error in org.alfresco.repo.workflow.WorkflowServiceImpl.getPooledTasks on StartUp. - Improved fix that uses the bridge table cache if it is available - Groups queried for pooled tasks still limited to 100 by default but can be configured with system.workflow.maxAuthoritiesForPooledTasks - Overall number of results can be cut off with system.workflow.maxPooledTasks 47013: Fix HiddenAspect to NOT use permission-checking NodeService - Should fix ALF-17605: CLONE - Severe performance problems with Group ACL checking under stress test 47018: (RECORD ONLY) Disabled EmailServiceImplTest.testEmailContributorsAuthority pending ALF-17979 47036: Merged PATCHES/V4.1.2 to V4.1-BUG-FIX 46180: Merged DEV to PATCHES/V4.1.2 46170: MNT-299 : CLONE - Activity feeds get not generated in private sites for added files if username in LDAP-AD contains uppercase letters Improved debug logging for Activity Feed and Activity Post DAOs. 47037: ALF-17973 (Incorrect name (title.single/title.multi) for "cloud target selection" window when RM is installed) 47042: RM-601 (Copy/Move dialog causes an error in firebug console) 47047: DE: Translation update based on EN r46507 47048: SPANISH: Translation update based on EN r46507 47049: FRENCH: Translation update based on EN r46507 47050: ITALIAN: Translation update based on EN r46507 47051: NORWEGIAN: Translation update based on EN r46507 47052: JAPANESE: Translation update based on EN r46507 47089: ALF-17089 (Displaying Url Name instead of site Name in Select form) 47102: New Norwegian translations from Gloria plus Bitrock configuration to enable them 47110: ALF-10243: Merged V3.4-BUG-FIX to V4.1-BUG-FIX 47105: ALF-18121: Merged PATCHES/V3.4.11 to V3.4-BUG-FIX 47040: MNT-323: Fixed issue with passing empty due date when starting workflow 47101: MNT-320: also applied fix to wcmquickstart module 47109: ALF-18121: Merged PATCHES/V3.4.11 to V3.4-BUG-FIX 47106: MNT-320: Merged V4.1-BUG-FIX to PATCHES/V3.4.11 41010: ALF-15697: Not possible to start workflow not specifying the Due Date - Regression caused by ALF-10243 47135: DUTCH: Translation update based on EN r46507 47137: RUSSIAN: Translation update based on EN r46507 47138: CHINESE: Translation update based on EN r46507 47141: Fix for ALF-17979 EmailServiceImplTest intermittently failing 47147: Part 2 of ALF-17979 EmailServiceImplTest intermittently failing - fix related cache to avoid any future issue 47148: ALF-17804: Fix NPE 47171: ALF-18060: removing obsolete expensive sorting and preventing too many variable-queries to be performed when listing COMPLETED WorkflowTask git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@47186 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
1772 lines
77 KiB
Java
1772 lines
77 KiB
Java
/*
|
||
* Copyright (C) 2005-2013 Alfresco Software Limited.
|
||
*
|
||
* This file is part of Alfresco
|
||
*
|
||
* Alfresco is free software: you can redistribute it and/or modify
|
||
* it under the terms of the GNU Lesser General Public License as published by
|
||
* the Free Software Foundation, either version 3 of the License, or
|
||
* (at your option) any later version.
|
||
*
|
||
* Alfresco is distributed in the hope that it will be useful,
|
||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||
* GNU Lesser General Public License for more details.
|
||
*
|
||
* You should have received a copy of the GNU Lesser General Public License
|
||
* along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
|
||
*/
|
||
package org.alfresco.repo.tenant;
|
||
|
||
import java.io.InputStream;
|
||
import java.io.PrintWriter;
|
||
import java.io.Serializable;
|
||
import java.io.StringWriter;
|
||
import java.util.ArrayList;
|
||
import java.util.Arrays;
|
||
import java.util.Collection;
|
||
import java.util.HashMap;
|
||
import java.util.HashSet;
|
||
import java.util.List;
|
||
import java.util.Map;
|
||
import java.util.Set;
|
||
|
||
import junit.framework.TestCase;
|
||
|
||
import org.alfresco.error.AlfrescoRuntimeException;
|
||
import org.alfresco.model.ApplicationModel;
|
||
import org.alfresco.model.ContentModel;
|
||
import org.alfresco.query.PagingRequest;
|
||
import org.alfresco.repo.content.MimetypeMap;
|
||
import org.alfresco.repo.management.subsystems.ChildApplicationContextFactory;
|
||
import org.alfresco.repo.model.Repository;
|
||
import org.alfresco.repo.node.archive.NodeArchiveService;
|
||
import org.alfresco.repo.node.archive.RestoreNodeReport;
|
||
import org.alfresco.repo.node.index.FullIndexRecoveryComponent;
|
||
import org.alfresco.repo.security.authentication.AuthenticationUtil;
|
||
import org.alfresco.repo.security.authentication.AuthenticationUtil.RunAsWork;
|
||
import org.alfresco.repo.security.permissions.impl.AccessPermissionImpl;
|
||
import org.alfresco.repo.tenant.TenantUtil.TenantRunAsWork;
|
||
import org.alfresco.repo.transaction.RetryingTransactionHelper.RetryingTransactionCallback;
|
||
import org.alfresco.service.cmr.admin.RepoAdminService;
|
||
import org.alfresco.service.cmr.coci.CheckOutCheckInService;
|
||
import org.alfresco.service.cmr.dictionary.ClassDefinition;
|
||
import org.alfresco.service.cmr.dictionary.DictionaryService;
|
||
import org.alfresco.service.cmr.model.FileFolderService;
|
||
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.InvalidNodeRefException;
|
||
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.search.CategoryService;
|
||
import org.alfresco.service.cmr.search.ResultSet;
|
||
import org.alfresco.service.cmr.search.SearchService;
|
||
import org.alfresco.service.cmr.security.AccessPermission;
|
||
import org.alfresco.service.cmr.security.AccessStatus;
|
||
import org.alfresco.service.cmr.security.AuthorityService;
|
||
import org.alfresco.service.cmr.security.AuthorityType;
|
||
import org.alfresco.service.cmr.security.MutableAuthenticationService;
|
||
import org.alfresco.service.cmr.security.OwnableService;
|
||
import org.alfresco.service.cmr.security.PermissionService;
|
||
import org.alfresco.service.cmr.security.PersonService;
|
||
import org.alfresco.service.cmr.security.PersonService.PersonInfo;
|
||
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.usage.UsageService;
|
||
import org.alfresco.service.namespace.NamespaceService;
|
||
import org.alfresco.service.namespace.QName;
|
||
import org.alfresco.service.transaction.TransactionService;
|
||
import org.alfresco.util.ApplicationContextHelper;
|
||
import org.apache.commons.logging.Log;
|
||
import org.apache.commons.logging.LogFactory;
|
||
import org.junit.FixMethodOrder;
|
||
import org.junit.runners.MethodSorters;
|
||
import org.springframework.context.ApplicationContext;
|
||
import org.springframework.context.support.ClassPathXmlApplicationContext;
|
||
|
||
/**
|
||
* @author janv
|
||
* since 3.0
|
||
*/
|
||
@FixMethodOrder(MethodSorters.NAME_ASCENDING)
|
||
public class MultiTDemoTest extends TestCase
|
||
{
|
||
private static Log logger = LogFactory.getLog(MultiTDemoTest.class);
|
||
|
||
private static ApplicationContext ctx = new ClassPathXmlApplicationContext(
|
||
new String[] {ApplicationContextHelper.CONFIG_LOCATIONS[0], "classpath:tenant/mt-*context.xml"}
|
||
);
|
||
|
||
private NodeService nodeService;
|
||
private NodeArchiveService nodeArchiveService;
|
||
private MutableAuthenticationService authenticationService;
|
||
private PersonService personService;
|
||
private SiteService siteService;
|
||
private SearchService searchService;
|
||
private ContentService contentService;
|
||
private PermissionService permissionService;
|
||
private OwnableService ownableService;
|
||
private TenantAdminService tenantAdminService;
|
||
private TenantService tenantService;
|
||
private AuthorityService authorityService;
|
||
private CategoryService categoryService;
|
||
private CheckOutCheckInService cociService;
|
||
private RepoAdminService repoAdminService;
|
||
private DictionaryService dictionaryService;
|
||
private UsageService usageService;
|
||
private TransactionService transactionService;
|
||
private FileFolderService fileFolderService;
|
||
private Repository repositoryHelper;
|
||
private FullIndexRecoveryComponent indexRecoverer;
|
||
|
||
public static int NUM_TENANTS = 2;
|
||
|
||
public static final String TEST_RUN = System.currentTimeMillis()+"";
|
||
public static final String TEST_TENANT_DOMAIN = TEST_RUN+".my.test";
|
||
public static final String TEST_TENANT_DOMAIN2 = TEST_TENANT_DOMAIN+"2";
|
||
|
||
public static List<String> tenants;
|
||
|
||
static
|
||
{
|
||
tenants = new ArrayList<String>(NUM_TENANTS);
|
||
for (int i = 1; i <= NUM_TENANTS; i++)
|
||
{
|
||
tenants.add(TEST_TENANT_DOMAIN+i);
|
||
}
|
||
}
|
||
|
||
public static final String ROOT_DIR = "./tenantstores";
|
||
|
||
public static final String DEFAULT_ADMIN_PW = "admin";
|
||
|
||
public static final String DEFAULT_GUEST_UN = "guest";
|
||
public static final String DEFAULT_GUEST_PW = "thiscanbeanything";
|
||
|
||
public static final String TEST_USER1 = "alice";
|
||
public static final String TEST_USER2 = "bob";
|
||
public static final String TEST_USER3 = "eve";
|
||
public static final String TEST_USER4 = "fred";
|
||
|
||
private static Set<StoreRef> DEFAULT_STORES = new HashSet<StoreRef>(Arrays.asList(new StoreRef[]
|
||
{
|
||
new StoreRef("workspace://lightWeightVersionStore"), new StoreRef("system://system"),
|
||
new StoreRef("workspace://version2Store"), new StoreRef("user://alfrescoUserStore"),
|
||
new StoreRef("workspace://SpacesStore"), new StoreRef("archive://SpacesStore")
|
||
}));
|
||
private static final int DEFAULT_STORE_COUNT = DEFAULT_STORES.size();
|
||
|
||
public static StoreRef SPACES_STORE = new StoreRef(StoreRef.PROTOCOL_WORKSPACE, "SpacesStore");
|
||
|
||
|
||
public MultiTDemoTest()
|
||
{
|
||
super();
|
||
}
|
||
|
||
|
||
@Override
|
||
protected void setUp() throws Exception
|
||
{
|
||
super.setUp();
|
||
|
||
nodeService = (NodeService) ctx.getBean("NodeService");
|
||
nodeArchiveService = (NodeArchiveService) ctx.getBean("nodeArchiveService");
|
||
authenticationService = (MutableAuthenticationService) ctx.getBean("AuthenticationService");
|
||
tenantAdminService = (TenantAdminService) ctx.getBean("tenantAdminService");
|
||
tenantService = (TenantService) ctx.getBean("tenantService");
|
||
personService = (PersonService) ctx.getBean("PersonService");
|
||
searchService = (SearchService) ctx.getBean("SearchService");
|
||
contentService = (ContentService) ctx.getBean("ContentService");
|
||
permissionService = (PermissionService) ctx.getBean("PermissionService");
|
||
ownableService = (OwnableService) ctx.getBean("OwnableService");
|
||
authorityService = (AuthorityService) ctx.getBean("AuthorityService");
|
||
categoryService = (CategoryService) ctx.getBean("CategoryService");
|
||
cociService = (CheckOutCheckInService) ctx.getBean("CheckoutCheckinService");
|
||
repoAdminService = (RepoAdminService) ctx.getBean("RepoAdminService");
|
||
dictionaryService = (DictionaryService) ctx.getBean("DictionaryService");
|
||
usageService = (UsageService) ctx.getBean("usageService");
|
||
transactionService = (TransactionService) ctx.getBean("TransactionService");
|
||
fileFolderService = (FileFolderService) ctx.getBean("FileFolderService");
|
||
ownableService = (OwnableService) ctx.getBean("OwnableService");
|
||
repositoryHelper = (Repository) ctx.getBean("repositoryHelper");
|
||
siteService = (SiteService) ctx.getBean("SiteService");
|
||
|
||
ChildApplicationContextFactory luceneSubSystem = (ChildApplicationContextFactory) ctx.getBean("lucene");
|
||
indexRecoverer = (FullIndexRecoveryComponent) luceneSubSystem.getApplicationContext().getBean("search.indexRecoveryComponent");
|
||
AuthenticationUtil.setFullyAuthenticatedUser(AuthenticationUtil.getAdminUserName()); // authenticate as super-admin
|
||
|
||
createTenants();
|
||
}
|
||
|
||
@Override
|
||
protected void tearDown() throws Exception
|
||
{
|
||
super.tearDown();
|
||
}
|
||
|
||
private void createTenants()
|
||
{
|
||
for (final String tenantDomain : tenants)
|
||
{
|
||
createTenant(tenantDomain);
|
||
}
|
||
}
|
||
|
||
public synchronized void test_ALF_17681() throws Exception
|
||
{
|
||
// The issue was found on Lucene
|
||
final String tenantDomain = TEST_RUN+".alf17681";
|
||
final String query = "PATH:\"/app:company_home/app:dictionary\"";
|
||
|
||
// Create tenant
|
||
createTenant(tenantDomain);
|
||
|
||
final String tenantAdminName = tenantService.getDomainUser(AuthenticationUtil.getAdminUserName(), tenantDomain);
|
||
// Search for Data dictionary by tenant admin
|
||
int count = searchForDataDictionary(tenantAdminName, query);
|
||
|
||
assertEquals("Data dictionary should be found for tenant. ", 1, count);
|
||
|
||
indexRecoverer.setRecoveryMode(FullIndexRecoveryComponent.RecoveryMode.FULL.name());
|
||
|
||
// reindex
|
||
Thread reindexThread = new Thread()
|
||
{
|
||
public void run()
|
||
{
|
||
indexRecoverer.reindex();
|
||
}
|
||
};
|
||
|
||
reindexThread.start();
|
||
|
||
// must allow the rebuild to complete or the test after this one will fail to validate their indexes
|
||
// - as they now will be deleted.
|
||
reindexThread.join();
|
||
|
||
// wait a bit and then terminate
|
||
wait(20000);
|
||
indexRecoverer.setShutdown(true);
|
||
wait(20000);
|
||
|
||
// Search for Data dictionary by tenant admin
|
||
int countAfter = searchForDataDictionary(tenantAdminName, query);
|
||
|
||
assertEquals("Data dictionary should be found for tenant after FULL reindex. ", 1, countAfter);
|
||
}
|
||
|
||
private int searchForDataDictionary(String tenantAdminName, final String query)
|
||
{
|
||
return AuthenticationUtil.runAs(new RunAsWork<Integer>()
|
||
{
|
||
public Integer doWork() throws Exception
|
||
{
|
||
ResultSet resultSet = searchService.query(SPACES_STORE, SearchService.LANGUAGE_LUCENE, query, null);
|
||
return resultSet.length();
|
||
}
|
||
}, tenantAdminName);
|
||
}
|
||
|
||
public void test01CreateTenants() throws Throwable
|
||
{
|
||
AuthenticationUtil.setFullyAuthenticatedUser(AuthenticationUtil.getAdminUserName()); // authenticate as super-admin
|
||
|
||
logger.info("Create tenants");
|
||
|
||
List<PersonInfo> persons = personService.getPeople(null, null, null, new PagingRequest(0, Integer.MAX_VALUE, null)).getPage();
|
||
//assertEquals(2, personRefs.size()); // super-tenant: admin, guest (note: checking for 2 assumes that this test is run in a fresh bootstrap env)
|
||
for (PersonInfo person : persons)
|
||
{
|
||
String userName = person.getUserName();
|
||
for (final String tenantDomain : tenants)
|
||
{
|
||
assertFalse("Unexpected (tenant) user: "+userName, userName.endsWith(tenantDomain));
|
||
}
|
||
}
|
||
}
|
||
|
||
|
||
private void deleteTestAuthoritiesForTenant(final String[] uniqueGroupNames, final String tenantName)
|
||
{
|
||
// Check deletion for tenant1
|
||
TenantUtil.runAsPrimaryTenant(new TenantRunAsWork<Object>()
|
||
{
|
||
public Object doWork() throws Exception
|
||
{
|
||
// find person
|
||
NodeRef personNodeRef = personService.getPerson(tenantName);
|
||
NodeRef homeSpaceRef = (NodeRef)nodeService.getProperty(personNodeRef, ContentModel.PROP_HOMEFOLDER);
|
||
assertNotNull(homeSpaceRef);
|
||
|
||
// Delete authorities
|
||
for (int i = 0; i < uniqueGroupNames.length; i++)
|
||
{
|
||
authorityService.deleteAuthority("GROUP_" + uniqueGroupNames[i]);
|
||
}
|
||
return null;
|
||
}
|
||
}, tenantName);
|
||
}
|
||
private void createTestAuthoritiesForTenant(final String[] uniqueGroupNames, final String tenantName)
|
||
{
|
||
// Create groups for tenant
|
||
TenantUtil.runAsPrimaryTenant(new TenantRunAsWork<Object>()
|
||
{
|
||
public Object doWork() throws Exception
|
||
{
|
||
// find person
|
||
NodeRef personNodeRef = personService.getPerson(tenantName);
|
||
NodeRef homeSpaceRef = (NodeRef)nodeService.getProperty(personNodeRef, ContentModel.PROP_HOMEFOLDER);
|
||
assertNotNull(homeSpaceRef);
|
||
|
||
for (int i = 0; i < uniqueGroupNames.length; i++)
|
||
{
|
||
authorityService.createAuthority(AuthorityType.GROUP, uniqueGroupNames[i]);
|
||
permissionService.setPermission(homeSpaceRef, "GROUP_" + uniqueGroupNames[i], "Consumer", true);
|
||
}
|
||
|
||
return null;
|
||
}
|
||
}, tenantName);
|
||
}
|
||
|
||
private void checkTestAuthoritiesPresence(final String[] uniqueGroupNames, final String tenantName, final boolean shouldPresent)
|
||
{
|
||
// Check that created permissions are not visible to tenant 2
|
||
TenantUtil.runAsPrimaryTenant(new TenantRunAsWork<Object>()
|
||
{
|
||
public Object doWork() throws Exception
|
||
{
|
||
NodeRef personNodeRef = personService.getPerson(tenantName);
|
||
NodeRef homeSpaceRef = (NodeRef)nodeService.getProperty(personNodeRef, ContentModel.PROP_HOMEFOLDER);
|
||
Set<AccessPermission> perms = permissionService.getAllSetPermissions(homeSpaceRef);
|
||
Set<String> auths = authorityService.getAllAuthorities(AuthorityType.GROUP);
|
||
|
||
for (int i = 0; i < uniqueGroupNames.length; i++)
|
||
{
|
||
AccessPermission toCheck = new AccessPermissionImpl("Consumer", AccessStatus.ALLOWED, "GROUP_" + uniqueGroupNames[i], 0);
|
||
if (shouldPresent)
|
||
{
|
||
assertTrue(auths.contains("GROUP_" + uniqueGroupNames[i]));
|
||
assertTrue(perms.contains(toCheck));
|
||
}
|
||
else
|
||
{
|
||
assertTrue(!auths.contains("GROUP_" + uniqueGroupNames[i]));
|
||
assertTrue(!perms.contains(toCheck));
|
||
}
|
||
}
|
||
|
||
return null;
|
||
}
|
||
}, tenantName);
|
||
}
|
||
|
||
// TODO fix CLOUD-1348
|
||
public void xtest02NonSharedGroupDeletion()
|
||
{
|
||
final String tenantDomain1 = TEST_RUN+".groupdel1";
|
||
final String tenantDomain2 = TEST_RUN+".groupdel2";
|
||
|
||
try
|
||
{
|
||
final String[] tenantUniqueGroupNames = new String[10];
|
||
final String[] superadminUniqueGroupNames = new String[10];
|
||
for (int i = 0; i < tenantUniqueGroupNames.length; i++)
|
||
{
|
||
tenantUniqueGroupNames[i] = TEST_RUN + "test_group" + i;
|
||
superadminUniqueGroupNames[i] = TEST_RUN + "test_group_sa" + i;
|
||
}
|
||
|
||
clearUsage(AuthenticationUtil.getAdminUserName());
|
||
|
||
createTenant(tenantDomain1);
|
||
createTenant(tenantDomain2);
|
||
|
||
final String tenantAdminName1 = tenantService.getDomainUser(AuthenticationUtil.getAdminUserName(), tenantDomain1);
|
||
final String tenantAdminName2 = tenantService.getDomainUser(AuthenticationUtil.getAdminUserName(), tenantDomain2);
|
||
final String superAdmin = "admin";
|
||
|
||
// Create test authorities that are visible only to tenant1
|
||
clearUsage(tenantDomain1);
|
||
createTestAuthoritiesForTenant(tenantUniqueGroupNames, tenantAdminName1);
|
||
// Check that tenant1's authorities are visible to tenant1
|
||
clearUsage(tenantDomain1);
|
||
checkTestAuthoritiesPresence(tenantUniqueGroupNames, tenantAdminName1, true);
|
||
// Check that tenant1's authorities are not visible to tenant2
|
||
clearUsage(tenantDomain2);
|
||
checkTestAuthoritiesPresence(tenantUniqueGroupNames, tenantAdminName2, false);
|
||
// Check that tenant1's authorities are not visible to super-admin
|
||
checkTestAuthoritiesPresence(tenantUniqueGroupNames, superAdmin, false);
|
||
|
||
|
||
// Create test authorities that are visible only to super-admin
|
||
createTestAuthoritiesForTenant(superadminUniqueGroupNames, superAdmin);
|
||
// Check that super-admin's authorities are not visible to tenant1
|
||
clearUsage(tenantDomain1);
|
||
checkTestAuthoritiesPresence(superadminUniqueGroupNames, tenantAdminName1, false);
|
||
// Check that super-admin's authorities are not visible to tenant2
|
||
clearUsage(tenantDomain2);
|
||
checkTestAuthoritiesPresence(superadminUniqueGroupNames, tenantAdminName2, false);
|
||
// Check that super-admin's authorities are visible to super-admin
|
||
checkTestAuthoritiesPresence(superadminUniqueGroupNames, superAdmin, true);
|
||
|
||
|
||
// Delete tenant1's authorities
|
||
clearUsage(tenantDomain1);
|
||
deleteTestAuthoritiesForTenant(tenantUniqueGroupNames, tenantAdminName1);
|
||
// Check that tenant1's authorities are not visible to tenant1
|
||
checkTestAuthoritiesPresence(tenantUniqueGroupNames, tenantAdminName1, false);
|
||
|
||
// Delete super-admin's authorities
|
||
deleteTestAuthoritiesForTenant(superadminUniqueGroupNames, superAdmin);
|
||
// Check that super-admin's authorities are not visible to super-admin
|
||
checkTestAuthoritiesPresence(superadminUniqueGroupNames, superAdmin, false);
|
||
}
|
||
finally
|
||
{
|
||
deleteTenant(tenantDomain1);
|
||
deleteTenant(tenantDomain2);
|
||
}
|
||
}
|
||
|
||
// TODO fix CLOUD-1348
|
||
public void xtest03SharedGroupDeletion()
|
||
{
|
||
final String tenantDomain1 = TEST_RUN+".groupdel3";
|
||
final String tenantDomain2 = TEST_RUN+".groupdel4";
|
||
|
||
try
|
||
{
|
||
final String[] commonTenantUniqueGroupNames = new String[10];
|
||
for (int i = 0; i < commonTenantUniqueGroupNames.length; i++)
|
||
{
|
||
commonTenantUniqueGroupNames[i] = TEST_RUN + "test_group" + i;
|
||
}
|
||
|
||
clearUsage(AuthenticationUtil.getAdminUserName());
|
||
|
||
createTenant(tenantDomain1);
|
||
createTenant(tenantDomain2);
|
||
|
||
final String tenantAdminName1 = tenantService.getDomainUser(AuthenticationUtil.getAdminUserName(), tenantDomain1);
|
||
final String tenantAdminName2 = tenantService.getDomainUser(AuthenticationUtil.getAdminUserName(), tenantDomain2);
|
||
final String superAdmin = "admin";
|
||
|
||
// Create test common authorities for tenant1
|
||
clearUsage(tenantDomain1);
|
||
createTestAuthoritiesForTenant(commonTenantUniqueGroupNames, tenantAdminName1);
|
||
// Create test common authorities for tenant2
|
||
clearUsage(tenantDomain2);
|
||
createTestAuthoritiesForTenant(commonTenantUniqueGroupNames, tenantAdminName2);
|
||
// Create test common authorities for super-admin
|
||
createTestAuthoritiesForTenant(commonTenantUniqueGroupNames, superAdmin);
|
||
|
||
// Check that authorities are visible to tenant1
|
||
clearUsage(tenantDomain1);
|
||
checkTestAuthoritiesPresence(commonTenantUniqueGroupNames, tenantAdminName1, true);
|
||
// Check that authorities are visible to tenant2
|
||
clearUsage(tenantDomain2);
|
||
checkTestAuthoritiesPresence(commonTenantUniqueGroupNames, tenantAdminName2, true);
|
||
// Check that authorities are visible to super-admin
|
||
checkTestAuthoritiesPresence(commonTenantUniqueGroupNames, superAdmin, true);
|
||
|
||
// Delete tenant1's authorities
|
||
clearUsage(tenantDomain1);
|
||
deleteTestAuthoritiesForTenant(commonTenantUniqueGroupNames, tenantAdminName1);
|
||
// Check that authorities are not visible to tenant1
|
||
clearUsage(tenantDomain1);
|
||
checkTestAuthoritiesPresence(commonTenantUniqueGroupNames, tenantAdminName1, false);
|
||
// Check that authorities are visible to tenant2
|
||
clearUsage(tenantDomain2);
|
||
checkTestAuthoritiesPresence(commonTenantUniqueGroupNames, tenantAdminName2, true);
|
||
// Check that authorities are visible to super-admin
|
||
checkTestAuthoritiesPresence(commonTenantUniqueGroupNames, superAdmin, true);
|
||
|
||
// Create test common authorities for tenant1
|
||
clearUsage(tenantDomain1);
|
||
createTestAuthoritiesForTenant(commonTenantUniqueGroupNames, tenantAdminName1);
|
||
// Delete tenant2's authorities
|
||
clearUsage(tenantDomain2);
|
||
deleteTestAuthoritiesForTenant(commonTenantUniqueGroupNames, tenantAdminName2);
|
||
// Check that authorities are visible to tenant1
|
||
clearUsage(tenantDomain1);
|
||
checkTestAuthoritiesPresence(commonTenantUniqueGroupNames, tenantAdminName1, true);
|
||
// Check that authorities are not visible to tenant2
|
||
clearUsage(tenantDomain2);
|
||
checkTestAuthoritiesPresence(commonTenantUniqueGroupNames, tenantAdminName2, false);
|
||
// Check that authorities are visible to super-admin
|
||
checkTestAuthoritiesPresence(commonTenantUniqueGroupNames, superAdmin, true);
|
||
|
||
// Create test common authorities for tenant2
|
||
clearUsage(tenantDomain2);
|
||
createTestAuthoritiesForTenant(commonTenantUniqueGroupNames, tenantAdminName2);
|
||
// Delete super-admin's authorities
|
||
deleteTestAuthoritiesForTenant(commonTenantUniqueGroupNames, superAdmin);
|
||
// Check that authorities are visible to tenant1
|
||
clearUsage(tenantDomain1);
|
||
checkTestAuthoritiesPresence(commonTenantUniqueGroupNames, tenantAdminName1, true);
|
||
// Check that authorities are visible to tenant2
|
||
clearUsage(tenantDomain2);
|
||
checkTestAuthoritiesPresence(commonTenantUniqueGroupNames, tenantAdminName2, true);
|
||
// Check that authorities are not visible to super-admin
|
||
checkTestAuthoritiesPresence(commonTenantUniqueGroupNames, superAdmin, false);
|
||
}
|
||
finally
|
||
{
|
||
AuthenticationUtil.setFullyAuthenticatedUser(AuthenticationUtil.getSystemUserName());
|
||
|
||
deleteTenant(tenantDomain1);
|
||
deleteTenant(tenantDomain2);
|
||
}
|
||
}
|
||
|
||
|
||
private void createTenant(final String tenantDomain)
|
||
{
|
||
// create tenants (if not already created)
|
||
TenantUtil.runAsPrimaryTenant(new TenantRunAsWork<Object>()
|
||
{
|
||
public Object doWork() throws Exception
|
||
{
|
||
if (! tenantAdminService.existsTenant(tenantDomain))
|
||
{
|
||
//tenantAdminService.createTenant(tenantDomain, DEFAULT_ADMIN_PW.toCharArray(), ROOT_DIR + "/" + tenantDomain);
|
||
tenantAdminService.createTenant(tenantDomain, (DEFAULT_ADMIN_PW+" "+tenantDomain).toCharArray(), null); // use default root dir
|
||
|
||
logger.info("Created tenant " + tenantDomain);
|
||
}
|
||
|
||
return null;
|
||
}
|
||
}, AuthenticationUtil.getSystemUserName());
|
||
}
|
||
|
||
private void deleteTenant(final String tenantDomain)
|
||
{
|
||
transactionService.getRetryingTransactionHelper().doInTransaction(new RetryingTransactionCallback<Object>()
|
||
{
|
||
public Object execute() throws Throwable
|
||
{
|
||
// delete tenant (if it exists)
|
||
TenantUtil.runAsPrimaryTenant(new TenantRunAsWork<Object>()
|
||
{
|
||
public Object doWork() throws Exception
|
||
{
|
||
if (tenantAdminService.existsTenant(tenantDomain))
|
||
{
|
||
tenantAdminService.deleteTenant(tenantDomain);
|
||
|
||
logger.info("Deleted tenant " + tenantDomain);
|
||
}
|
||
|
||
return null;
|
||
}
|
||
}, AuthenticationUtil.getSystemUserName());
|
||
return null;
|
||
}
|
||
});
|
||
}
|
||
|
||
public void test04_ETHREEOH_2015()
|
||
{
|
||
final String tenantDomain1 = TEST_RUN+".one.ethreeoh2015";
|
||
final String tenantDomain2 = TEST_RUN+".two.ethreeoh2015";
|
||
|
||
clearUsage(AuthenticationUtil.getAdminUserName());
|
||
|
||
createTenant(tenantDomain1);
|
||
|
||
String tenantAdminName = tenantService.getDomainUser(AuthenticationUtil.getAdminUserName(), tenantDomain1);
|
||
TenantUtil.runAsPrimaryTenant(new TenantRunAsWork<Object>()
|
||
{
|
||
public Object doWork() throws Exception
|
||
{
|
||
createUser(TEST_USER1, tenantDomain1, TEST_USER1+" "+tenantDomain1);
|
||
|
||
return null;
|
||
}
|
||
}, tenantAdminName);
|
||
|
||
createTenant(tenantDomain2);
|
||
}
|
||
|
||
private void clearUsage(String userName)
|
||
{
|
||
AuthenticationUtil.setFullyAuthenticatedUser(AuthenticationUtil.getAdminUserName()); // authenticate as super-admin
|
||
|
||
// find person
|
||
NodeRef personNodeRef = personService.getPerson(userName);
|
||
// clear user usage
|
||
nodeService.setProperty(personNodeRef, ContentModel.PROP_SIZE_CURRENT, null);
|
||
usageService.deleteDeltas(personNodeRef);
|
||
}
|
||
|
||
|
||
public void test05CreateUsers() throws Throwable
|
||
{
|
||
logger.info("Create demo users");
|
||
|
||
List<PersonInfo> persons = personService.getPeople(null, null, null, new PagingRequest(0, Integer.MAX_VALUE, null)).getPage();
|
||
//assertEquals(2, personRefs.size()); // super-tenant: admin, guest (note: checking for 2 assumes that this test is run in a fresh bootstrap env)
|
||
for (PersonInfo person : persons)
|
||
{
|
||
String userName = person.getUserName();
|
||
for (final String tenantDomain : tenants)
|
||
{
|
||
assertFalse("Unexpected (tenant) user: "+userName, userName.endsWith(tenantDomain));
|
||
}
|
||
}
|
||
|
||
try
|
||
{
|
||
for (final String tenantDomain : tenants)
|
||
{
|
||
String tenantAdminName = tenantService.getDomainUser(AuthenticationUtil.getAdminUserName(), tenantDomain);
|
||
|
||
TenantUtil.runAsPrimaryTenant(new TenantRunAsWork<Object>()
|
||
{
|
||
public Object doWork() throws Exception
|
||
{
|
||
createUser(TEST_USER1, tenantDomain, TEST_USER1+" "+tenantDomain);
|
||
createUser(TEST_USER2, tenantDomain, TEST_USER2+" "+tenantDomain);
|
||
|
||
if (tenantDomain.equals(TEST_TENANT_DOMAIN2))
|
||
{
|
||
createUser(TEST_USER3, tenantDomain, TEST_USER3+" "+tenantDomain);
|
||
}
|
||
|
||
return null;
|
||
}
|
||
}, tenantAdminName);
|
||
}
|
||
|
||
for (final String tenantDomain : tenants)
|
||
{
|
||
String tenantAdminName = tenantService.getDomainUser(AuthenticationUtil.getAdminUserName(), tenantDomain);
|
||
|
||
TenantUtil.runAsPrimaryTenant(new TenantRunAsWork<Object>()
|
||
{
|
||
public Object doWork() throws Exception
|
||
{
|
||
List<PersonInfo> persons = personService.getPeople(null, null, null, new PagingRequest(0, Integer.MAX_VALUE, null)).getPage();
|
||
|
||
for (PersonInfo person : persons)
|
||
{
|
||
NodeRef personRef = person.getNodeRef();
|
||
|
||
String userName = (String)nodeService.getProperty(personRef, ContentModel.PROP_USERNAME);
|
||
assertTrue(userName.endsWith(tenantDomain));
|
||
|
||
logger.info("Create users: get all people - found user: "+userName);
|
||
|
||
NodeRef homeSpaceRef = (NodeRef)nodeService.getProperty(personRef, ContentModel.PROP_HOMEFOLDER);
|
||
assertNotNull(homeSpaceRef);
|
||
}
|
||
|
||
if (tenantDomain.equals(TEST_TENANT_DOMAIN2))
|
||
{
|
||
assertEquals(5, persons.size()); // admin@tenant, guest@tenant, alice@tenant, bob@tenant, eve@tenant
|
||
}
|
||
else
|
||
{
|
||
assertEquals(4, persons.size()); // admin@tenant, guest@tenant, alice@tenant, bob@tenant
|
||
}
|
||
|
||
return null;
|
||
}
|
||
}, tenantAdminName);
|
||
}
|
||
}
|
||
catch (Throwable t)
|
||
{
|
||
StringWriter stackTrace = new StringWriter();
|
||
t.printStackTrace(new PrintWriter(stackTrace));
|
||
System.err.println(stackTrace.toString());
|
||
throw t;
|
||
}
|
||
}
|
||
|
||
public void test06LoginTenantUsers() throws Throwable
|
||
{
|
||
logger.info("Login tenant users");
|
||
|
||
try
|
||
{
|
||
AuthenticationUtil.clearCurrentSecurityContext();
|
||
|
||
for (final String tenantDomain : tenants)
|
||
{
|
||
loginLogoutUser(tenantService.getDomainUser(TEST_USER1, tenantDomain), TEST_USER1+" "+tenantDomain);
|
||
|
||
loginLogoutUser(tenantService.getDomainUser(TEST_USER2, tenantDomain), TEST_USER2+" "+tenantDomain);
|
||
|
||
if (tenantDomain.equals(TEST_TENANT_DOMAIN2))
|
||
{
|
||
loginLogoutUser(tenantService.getDomainUser(TEST_USER3, tenantDomain), TEST_USER3+" "+tenantDomain);
|
||
}
|
||
}
|
||
}
|
||
catch (Throwable t)
|
||
{
|
||
StringWriter stackTrace = new StringWriter();
|
||
t.printStackTrace(new PrintWriter(stackTrace));
|
||
System.err.println(stackTrace.toString());
|
||
throw t;
|
||
}
|
||
}
|
||
|
||
public void test07LoginTenantGuests() throws Throwable
|
||
{
|
||
logger.info("Login tenant guests");
|
||
|
||
try
|
||
{
|
||
AuthenticationUtil.clearCurrentSecurityContext();
|
||
|
||
for (final String tenantDomain : tenants)
|
||
{
|
||
loginLogoutUser(tenantService.getDomainUser(DEFAULT_GUEST_UN, tenantDomain), DEFAULT_GUEST_UN);
|
||
}
|
||
}
|
||
catch (Throwable t)
|
||
{
|
||
StringWriter stackTrace = new StringWriter();
|
||
t.printStackTrace(new PrintWriter(stackTrace));
|
||
System.err.println(stackTrace.toString());
|
||
throw t;
|
||
}
|
||
}
|
||
|
||
public void test08LoginTenantAdmin() throws Throwable
|
||
{
|
||
logger.info("Login tenant admins");
|
||
|
||
try
|
||
{
|
||
AuthenticationUtil.clearCurrentSecurityContext();
|
||
|
||
for (final String tenantDomain : tenants)
|
||
{
|
||
loginLogoutUser(tenantService.getDomainUser(AuthenticationUtil.getAdminUserName(), tenantDomain), DEFAULT_ADMIN_PW+" "+tenantDomain);
|
||
}
|
||
}
|
||
catch (Throwable t)
|
||
{
|
||
StringWriter stackTrace = new StringWriter();
|
||
t.printStackTrace(new PrintWriter(stackTrace));
|
||
System.err.println(stackTrace.toString());
|
||
throw t;
|
||
}
|
||
}
|
||
|
||
public void test09CreateGroups()
|
||
{
|
||
logger.info("Create demo groups");
|
||
|
||
assertTrue(tenants.size() > 0);
|
||
|
||
final int rootGrpsOrigCnt = TenantUtil.runAsPrimaryTenant(new TenantRunAsWork<Integer>()
|
||
{
|
||
public Integer doWork() throws Exception
|
||
{
|
||
return authorityService.getAllRootAuthorities(AuthorityType.GROUP).size();
|
||
}
|
||
}, tenantService.getDomainUser(AuthenticationUtil.getAdminUserName(), tenants.get(0)));
|
||
|
||
// create groups and add users
|
||
for (final String tenantDomain : tenants)
|
||
{
|
||
final String tenantAdminName = tenantService.getDomainUser(AuthenticationUtil.getAdminUserName(), tenantDomain);
|
||
|
||
TenantUtil.runAsPrimaryTenant(new TenantRunAsWork<Object>()
|
||
{
|
||
public Object doWork() throws Exception
|
||
{
|
||
createGroup("GrpA", null);
|
||
createGroup("SubGrpA", "GrpA");
|
||
|
||
createGroup("GrpB", null);
|
||
|
||
createGroup("GrpC", null);
|
||
|
||
if (tenantDomain.equals(TEST_TENANT_DOMAIN2))
|
||
{
|
||
createGroup("SubGrpC", "GrpC");
|
||
}
|
||
|
||
createGroup("GrpD", null);
|
||
addToGroup("GrpD", tenantAdminName);
|
||
|
||
return null;
|
||
}
|
||
}, tenantAdminName);
|
||
}
|
||
|
||
// check groups/users
|
||
for (final String tenantDomain : tenants)
|
||
{
|
||
final String tenantAdminName = tenantService.getDomainUser(AuthenticationUtil.getAdminUserName(), tenantDomain);
|
||
|
||
TenantUtil.runAsPrimaryTenant(new TenantRunAsWork<Object>()
|
||
{
|
||
public Object doWork() throws Exception
|
||
{
|
||
Set<String> rootGrps = authorityService.getAllRootAuthorities(AuthorityType.GROUP);
|
||
assertEquals(rootGrpsOrigCnt+4, rootGrps.size());
|
||
|
||
Set<String> auths = authorityService.getContainedAuthorities(null, "GROUP_GrpA", true);
|
||
assertEquals(1, auths.size());
|
||
|
||
auths = authorityService.getContainedAuthorities(null, "GROUP_GrpB", true);
|
||
assertEquals(0, auths.size());
|
||
|
||
auths = authorityService.getContainedAuthorities(null, "GROUP_GrpC", true);
|
||
if (tenantDomain.equals(TEST_TENANT_DOMAIN2))
|
||
{
|
||
assertEquals(1, auths.size());
|
||
}
|
||
else
|
||
{
|
||
assertEquals(0, auths.size());
|
||
}
|
||
|
||
auths = authorityService.getContainedAuthorities(null, "GROUP_GrpD", true);
|
||
assertEquals(1, auths.size());
|
||
assertTrue(auths.toArray()[0].equals(tenantAdminName));
|
||
|
||
return null;
|
||
}
|
||
}, tenantAdminName);
|
||
}
|
||
}
|
||
|
||
public void test10CreateCategories()
|
||
{
|
||
logger.info("Create demo categories");
|
||
|
||
// super admin
|
||
TenantUtil.runAsPrimaryTenant(new TenantRunAsWork<Object>()
|
||
{
|
||
public Object doWork() throws Exception
|
||
{
|
||
logger.info("Create demo categories - super tenant");
|
||
createCategoriesImpl("");
|
||
|
||
return null;
|
||
}
|
||
}, AuthenticationUtil.getAdminUserName());
|
||
|
||
for (final String tenantDomain : tenants)
|
||
{
|
||
String tenantAdminName = tenantService.getDomainUser(AuthenticationUtil.getAdminUserName(), tenantDomain);
|
||
|
||
TenantUtil.runAsPrimaryTenant(new TenantRunAsWork<Object>()
|
||
{
|
||
public Object doWork() throws Exception
|
||
{
|
||
logger.info("Create demo categories - "+tenantDomain);
|
||
|
||
createCategoriesImpl(tenantDomain);
|
||
|
||
return null;
|
||
}
|
||
}, tenantAdminName);
|
||
|
||
}
|
||
}
|
||
|
||
@SuppressWarnings("unchecked")
|
||
private void createCategoriesImpl(String tenantDomain)
|
||
{
|
||
if (tenantDomain.equals(TenantService.DEFAULT_DOMAIN))
|
||
{
|
||
Collection<ChildAssociationRef> childAssocs = categoryService.getRootCategories(SPACES_STORE, ContentModel.ASPECT_GEN_CLASSIFIABLE);
|
||
|
||
for (ChildAssociationRef childAssoc : childAssocs)
|
||
{
|
||
if (nodeService.getProperty(childAssoc.getChildRef(), ContentModel.PROP_NAME).equals("CatA"))
|
||
{
|
||
return; // re-runnable, else we need to delete the created categories
|
||
}
|
||
}
|
||
}
|
||
|
||
// Find all root categories
|
||
String query = "PATH:\"/cm:generalclassifiable/*\"";
|
||
ResultSet resultSet = searchService.query(SPACES_STORE, SearchService.LANGUAGE_LUCENE, query);
|
||
int cnt = resultSet.length();
|
||
|
||
NodeRef catA = createCategory(SPACES_STORE, null, "CatA", "CatA-"+tenantDomain);
|
||
createCategory(SPACES_STORE, catA, "SubCatA", "SubCatA-"+tenantDomain); // ignore return
|
||
|
||
NodeRef catB = createCategory(SPACES_STORE, null, "CatB", "CatB-"+tenantDomain);
|
||
createCategory(SPACES_STORE, catB, "SubCatB", "SubCatB-"+tenantDomain); // ignore return
|
||
|
||
cnt = cnt + 2;
|
||
|
||
if (tenantDomain.equals(TEST_TENANT_DOMAIN2))
|
||
{
|
||
NodeRef catC = createCategory(SPACES_STORE, null, "CatC", "CatC-"+tenantDomain);
|
||
createCategory(SPACES_STORE, catC, "SubCatC", "SubCatC-"+tenantDomain); // ignore return
|
||
|
||
cnt = cnt + 1;
|
||
}
|
||
resultSet.close();
|
||
|
||
// Find all root categories
|
||
resultSet = searchService.query(SPACES_STORE, SearchService.LANGUAGE_LUCENE, query);
|
||
assertEquals(cnt, resultSet.length());
|
||
resultSet.close();
|
||
|
||
String queryMembers = "PATH:\"/cm:generalclassifiable//cm:catA/member\"";
|
||
resultSet = searchService.query(SPACES_STORE, SearchService.LANGUAGE_LUCENE, queryMembers);
|
||
assertEquals(0, resultSet.length());
|
||
resultSet.close();
|
||
|
||
NodeRef homeSpaceRef = getHomeSpaceFolderNode(AuthenticationUtil.getRunAsUser());
|
||
NodeRef contentRef = addContent(homeSpaceRef, "tqbfjotld.txt", "The quick brown fox jumps over the lazy dog (tenant " + tenantDomain + ")", MimetypeMap.MIMETYPE_TEXT_PLAIN);
|
||
|
||
assertFalse(nodeService.hasAspect(contentRef, ContentModel.ASPECT_GEN_CLASSIFIABLE));
|
||
|
||
List<NodeRef> categories = (List<NodeRef>)nodeService.getProperty(contentRef, ContentModel.PROP_CATEGORIES);
|
||
assertNull(categories);
|
||
|
||
// Classify the node (ie. assign node to a particular category in a classification)
|
||
categories = new ArrayList<NodeRef>(1);
|
||
categories.add(catA);
|
||
|
||
HashMap<QName, Serializable> catProps = new HashMap<QName, Serializable>();
|
||
catProps.put(ContentModel.PROP_CATEGORIES, (Serializable)categories);
|
||
nodeService.addAspect(contentRef, ContentModel.ASPECT_GEN_CLASSIFIABLE, catProps);
|
||
|
||
assertTrue(nodeService.hasAspect(contentRef, ContentModel.ASPECT_GEN_CLASSIFIABLE));
|
||
|
||
categories = (List<NodeRef>)nodeService.getProperty(contentRef, ContentModel.PROP_CATEGORIES);
|
||
assertEquals(1, categories.size());
|
||
|
||
// test ETHREEOH-210
|
||
queryMembers = "PATH:\"/cm:generalclassifiable//cm:CatA/member\"";
|
||
resultSet = searchService.query(SPACES_STORE, SearchService.LANGUAGE_LUCENE, queryMembers);
|
||
assertEquals(1, resultSet.length());
|
||
resultSet.close();
|
||
}
|
||
|
||
public void test11CreateFolders()
|
||
{
|
||
logger.info("Create demo folders");
|
||
|
||
List<String> users = new ArrayList<String>(3);
|
||
users.add(TEST_USER1);
|
||
users.add(TEST_USER2);
|
||
users.add(TEST_USER3);
|
||
|
||
for (final String tenantDomain : tenants)
|
||
{
|
||
for (String baseUserName : users)
|
||
{
|
||
if ((! baseUserName.equals(TEST_USER3)) || (tenantDomain.equals(TEST_TENANT_DOMAIN2)))
|
||
{
|
||
final String tenantUserName = tenantService.getDomainUser(baseUserName, tenantDomain);
|
||
|
||
TenantUtil.runAsPrimaryTenant(new TenantRunAsWork<Object>()
|
||
{
|
||
public Object doWork() throws Exception
|
||
{
|
||
NodeRef homeSpaceRef = getHomeSpaceFolderNode(tenantUserName);
|
||
|
||
NodeRef folderRef = createFolderNode(homeSpaceRef, "myfolder1");
|
||
createFolderNode(folderRef, "mysubfolder1"); // ignore return
|
||
|
||
folderRef = createFolderNode(homeSpaceRef, "myfolder2");
|
||
createFolderNode(folderRef, "mysubfolder2"); // ignore return
|
||
|
||
if (tenantDomain.equals(TEST_TENANT_DOMAIN2))
|
||
{
|
||
folderRef = createFolderNode(homeSpaceRef, "myfolder3");
|
||
createFolderNode(folderRef, "mysubfolder3"); // ignore return
|
||
}
|
||
|
||
return null;
|
||
}
|
||
}, tenantUserName);
|
||
}
|
||
}
|
||
}
|
||
}
|
||
|
||
public void test12CreateVersionableUserContent()
|
||
{
|
||
logger.info("Create demo content");
|
||
|
||
List<String> users = new ArrayList<String>(3);
|
||
users.add(TEST_USER1);
|
||
users.add(TEST_USER2);
|
||
users.add(TEST_USER3);
|
||
|
||
for (final String tenantDomain : tenants)
|
||
{
|
||
for (String baseUserName : users)
|
||
{
|
||
if ((! baseUserName.equals(TEST_USER3)) || (tenantDomain.equals(TEST_TENANT_DOMAIN2)))
|
||
{
|
||
final String tenantUserName = tenantService.getDomainUser(baseUserName, tenantDomain);
|
||
|
||
TenantUtil.runAsPrimaryTenant(new TenantRunAsWork<Object>()
|
||
{
|
||
public Object doWork() throws Exception
|
||
{
|
||
NodeRef homeSpaceRef = getHomeSpaceFolderNode(tenantUserName);
|
||
|
||
NodeRef contentRef = addContent(homeSpaceRef, tenantUserName+" quick brown fox.txt", "The quick brown fox jumps over the lazy dog (tenant " + tenantDomain + ")", MimetypeMap.MIMETYPE_TEXT_PLAIN);
|
||
nodeService.addAspect(contentRef, ContentModel.ASPECT_VERSIONABLE, null);
|
||
|
||
if (tenantDomain.equals(TEST_TENANT_DOMAIN2))
|
||
{
|
||
contentRef = addContent(homeSpaceRef, tenantUserName+" quick brown fox ANO.txt", "The quick brown fox jumps over the lazy dog ANO (tenant " + tenantDomain + ")", MimetypeMap.MIMETYPE_TEXT_PLAIN);
|
||
nodeService.addAspect(contentRef, ContentModel.ASPECT_VERSIONABLE, null);
|
||
}
|
||
|
||
return null;
|
||
}
|
||
}, tenantUserName);
|
||
}
|
||
}
|
||
}
|
||
}
|
||
|
||
public void test13GetStores()
|
||
{
|
||
logger.info("Get tenant stores");
|
||
|
||
// system
|
||
TenantUtil.runAsPrimaryTenant(new TenantRunAsWork<Object>()
|
||
{
|
||
public Object doWork() throws Exception
|
||
{
|
||
for (StoreRef storeRef : nodeService.getStores())
|
||
{
|
||
System.out.println("StoreRef: "+storeRef);
|
||
}
|
||
|
||
assertTrue("System: "+nodeService.getStores().size()+", "+(tenants.size()+1), (nodeService.getStores().size() >= (DEFAULT_STORE_COUNT * (tenants.size()+1))));
|
||
return null;
|
||
}
|
||
}, AuthenticationUtil.getSystemUserName());
|
||
|
||
// super admin
|
||
TenantUtil.runAsPrimaryTenant(new TenantRunAsWork<Object>()
|
||
{
|
||
public Object doWork() throws Exception
|
||
{
|
||
assertTrue("Super admin: "+nodeService.getStores().size(), (nodeService.getStores().size() >= DEFAULT_STORE_COUNT));
|
||
return null;
|
||
}
|
||
}, AuthenticationUtil.getAdminUserName());
|
||
|
||
for (final String tenantDomain : tenants)
|
||
{
|
||
String tenantAdminName = tenantService.getDomainUser(AuthenticationUtil.getAdminUserName(), tenantDomain);
|
||
|
||
TenantUtil.runAsPrimaryTenant(new TenantRunAsWork<Object>()
|
||
{
|
||
public Object doWork() throws Exception
|
||
{
|
||
Set<StoreRef> stores = new HashSet<StoreRef>(nodeService.getStores());
|
||
assertEquals("Tenant: "+tenantDomain, DEFAULT_STORES, stores);
|
||
|
||
return null;
|
||
}
|
||
}, tenantAdminName);
|
||
}
|
||
}
|
||
|
||
public void test14GetProperty()
|
||
{
|
||
logger.info("Test get property");
|
||
|
||
for (final String tenantDomain : tenants)
|
||
{
|
||
String tenantAdminName = tenantService.getDomainUser(AuthenticationUtil.getAdminUserName(), tenantDomain);
|
||
|
||
TenantUtil.runAsPrimaryTenant(new TenantRunAsWork<Object>()
|
||
{
|
||
public Object doWork() throws Exception
|
||
{
|
||
NodeRef personNodeRef = createUser(TEST_USER4, tenantDomain, TEST_USER4+" "+tenantDomain);
|
||
|
||
// Test nodeRef property
|
||
NodeRef homeFolderNodeRef = (NodeRef)nodeService.getProperty(personNodeRef, ContentModel.PROP_HOMEFOLDER);
|
||
assertFalse(homeFolderNodeRef.toString().contains(tenantDomain));
|
||
|
||
Map<QName, Serializable> props = (Map<QName, Serializable>)nodeService.getProperties(personNodeRef);
|
||
assertFalse(props.get(ContentModel.PROP_HOMEFOLDER).toString().contains(tenantDomain));
|
||
|
||
// Test "store-identifier" property
|
||
String storeId = (String)nodeService.getProperty(personNodeRef, ContentModel.PROP_STORE_IDENTIFIER);
|
||
assertFalse(storeId.contains(tenantDomain));
|
||
|
||
assertFalse(props.get(ContentModel.PROP_STORE_IDENTIFIER).toString().contains(tenantDomain));
|
||
|
||
return null;
|
||
}
|
||
}, tenantAdminName);
|
||
}
|
||
}
|
||
|
||
public void test15COCIandSearch()
|
||
{
|
||
logger.info("Test checkout/checkin and search");
|
||
|
||
for (final String tenantDomain : tenants)
|
||
{
|
||
final String tenantAdminName = tenantService.getDomainUser(AuthenticationUtil.getAdminUserName(), tenantDomain);
|
||
|
||
TenantUtil.runAsPrimaryTenant(new TenantRunAsWork<Object>()
|
||
{
|
||
public Object doWork() throws Exception
|
||
{
|
||
// search for local copy of bootstrapped file 'invite_user_email.ftl' (see email_templates.acp)
|
||
String origText = "You have been invited to";
|
||
String query = "+PATH:\"/app:company_home/app:dictionary/app:email_templates/app:invite_email_templates/*\" +TEXT:\""+origText+"\"";
|
||
ResultSet resultSet = searchService.query(SPACES_STORE, SearchService.LANGUAGE_LUCENE, query);
|
||
assertEquals(1, resultSet.length());
|
||
|
||
NodeRef nodeRef = resultSet.getNodeRef(0);
|
||
resultSet.close();
|
||
|
||
// checkout, update and checkin
|
||
|
||
NodeRef workingCopyNodeRef = cociService.checkout(nodeRef);
|
||
|
||
ContentWriter writer = contentService.getWriter(workingCopyNodeRef, ContentModel.PROP_CONTENT, true);
|
||
|
||
writer.setMimetype(MimetypeMap.MIMETYPE_TEXT_PLAIN);
|
||
writer.setEncoding("UTF-8");
|
||
|
||
String updateText = "Updated by "+tenantAdminName;
|
||
writer.putContent(updateText);
|
||
|
||
cociService.checkin(workingCopyNodeRef, null);
|
||
|
||
query = "+PATH:\"/app:company_home/app:dictionary/app:email_templates/app:invite_email_templates/*\" +TEXT:\""+origText+"\"";
|
||
resultSet = searchService.query(SPACES_STORE, SearchService.LANGUAGE_LUCENE, query);
|
||
assertEquals(0, resultSet.length());
|
||
resultSet.close();
|
||
|
||
query = "+PATH:\"/app:company_home/app:dictionary/app:email_templates/app:invite_email_templates/*\" +TEXT:\""+updateText+"\"";
|
||
resultSet = searchService.query(SPACES_STORE, SearchService.LANGUAGE_LUCENE, query);
|
||
assertEquals(1, resultSet.length());
|
||
resultSet.close();
|
||
|
||
return null;
|
||
}
|
||
}, tenantAdminName);
|
||
}
|
||
}
|
||
|
||
public void test16DeleteArchiveAndRestoreContent()
|
||
{
|
||
logger.info("test delete/archive & restore content");
|
||
|
||
// note: CLOUD-1349 - ownership is based on fully authenticated user (else restoreNode fails for non-Admin user)
|
||
AuthenticationUtil.clearCurrentSecurityContext();
|
||
|
||
final String superAdmin = AuthenticationUtil.getAdminUserName();
|
||
|
||
AuthenticationUtil.runAs(new RunAsWork<Void>()
|
||
{
|
||
public Void doWork() throws Exception
|
||
{
|
||
// super tenant - admin user
|
||
deleteArchiveAndRestoreContent(superAdmin, TenantService.DEFAULT_DOMAIN);
|
||
return null;
|
||
}
|
||
|
||
}, superAdmin);
|
||
|
||
final String superAnoUser = "superAnoUser";
|
||
|
||
AuthenticationUtil.runAs(new RunAsWork<Void>()
|
||
{
|
||
public Void doWork() throws Exception
|
||
{
|
||
createUser(superAnoUser, TenantService.DEFAULT_DOMAIN, superAnoUser);
|
||
return null;
|
||
}
|
||
}, superAdmin);
|
||
|
||
AuthenticationUtil.runAs(new RunAsWork<Void>()
|
||
{
|
||
public Void doWork() throws Exception
|
||
{
|
||
// super tenant - ano user
|
||
deleteArchiveAndRestoreContent(superAnoUser, TenantService.DEFAULT_DOMAIN);
|
||
|
||
return null;
|
||
}
|
||
}, superAnoUser);
|
||
|
||
for (final String tenantDomain : tenants)
|
||
{
|
||
final String tenantUserName = tenantService.getDomainUser(TEST_USER1, tenantDomain);
|
||
|
||
TenantUtil.runAsPrimaryTenant(new TenantRunAsWork<Object>()
|
||
{
|
||
public Object doWork() throws Exception
|
||
{
|
||
deleteArchiveAndRestoreContent(tenantUserName, tenantDomain);
|
||
|
||
return null;
|
||
}
|
||
}, tenantUserName);
|
||
}
|
||
}
|
||
|
||
private void deleteArchiveAndRestoreContent(String userName, String tenantDomain)
|
||
{
|
||
NodeRef homeSpaceRef = getHomeSpaceFolderNode(userName);
|
||
NodeRef contentRef = addContent(homeSpaceRef, userName+" "+System.currentTimeMillis()+" tqbfjotld.txt", "The quick brown fox jumps over the lazy dog (tenant " + tenantDomain + ")", MimetypeMap.MIMETYPE_TEXT_PLAIN);
|
||
|
||
assertEquals(userName, ownableService.getOwner(contentRef));
|
||
permissionService.hasPermission(contentRef, PermissionService.DELETE_NODE);
|
||
|
||
NodeRef storeArchiveNode = nodeService.getStoreArchiveNode(contentRef.getStoreRef());
|
||
|
||
nodeService.deleteNode(contentRef);
|
||
|
||
// deduce archived nodeRef
|
||
StoreRef archiveStoreRef = storeArchiveNode.getStoreRef();
|
||
NodeRef archivedContentRef = new NodeRef(archiveStoreRef, contentRef.getId());
|
||
|
||
assertEquals(userName, ownableService.getOwner(archivedContentRef));
|
||
permissionService.hasPermission(archivedContentRef, PermissionService.DELETE_NODE);
|
||
|
||
//nodeService.restoreNode(archivedContentRef, null, null, null);
|
||
RestoreNodeReport report = nodeArchiveService.restoreArchivedNode(archivedContentRef);
|
||
assertNotNull(report);
|
||
|
||
NodeRef restoredNodeRef = report.getRestoredNodeRef();
|
||
assertNotNull(restoredNodeRef);
|
||
|
||
archivedContentRef = new NodeRef(archiveStoreRef, restoredNodeRef.getId());
|
||
|
||
nodeService.deleteNode(restoredNodeRef);
|
||
|
||
nodeArchiveService.purgeArchivedNode(archivedContentRef);
|
||
}
|
||
|
||
public void test17CustomModels()
|
||
{
|
||
logger.info("test custom models");
|
||
|
||
final int defaultModelCnt = dictionaryService.getAllModels().size();
|
||
|
||
for (final String tenantDomain : tenants)
|
||
{
|
||
final String tenantAdminName = tenantService.getDomainUser(AuthenticationUtil.getAdminUserName(), tenantDomain);
|
||
|
||
TenantUtil.runAsPrimaryTenant(new TenantRunAsWork<Object>()
|
||
{
|
||
public Object doWork() throws Exception
|
||
{
|
||
// no custom models should be deployed yet (note: will fail if re-run)
|
||
assertEquals(0, repoAdminService.getModels().size());
|
||
assertEquals(defaultModelCnt, dictionaryService.getAllModels().size());
|
||
assertNull(dictionaryService.getClass(QName.createQName("{my.new.model}sop")));
|
||
|
||
// deploy custom model
|
||
InputStream modelStream = getClass().getClassLoader().getResourceAsStream("tenant/exampleModel.xml");
|
||
repoAdminService.deployModel(modelStream, "exampleModel.xml");
|
||
|
||
assertEquals(1, repoAdminService.getModels().size());
|
||
assertEquals(defaultModelCnt+1, dictionaryService.getAllModels().size());
|
||
|
||
ClassDefinition myType = dictionaryService.getClass(QName.createQName("{my.new.model}sop"));
|
||
assertNotNull(myType);
|
||
assertEquals(QName.createQName("{my.new.model}mynewmodel"),myType.getModel().getName());
|
||
|
||
// deactivate model
|
||
repoAdminService.deactivateModel("exampleModel.xml");
|
||
|
||
assertEquals(1, repoAdminService.getModels().size()); // still deployed, although not active
|
||
assertEquals(defaultModelCnt, dictionaryService.getAllModels().size());
|
||
assertNull(dictionaryService.getClass(QName.createQName("{my.new.model}sop")));
|
||
|
||
// re-activate model
|
||
repoAdminService.activateModel("exampleModel.xml");
|
||
|
||
assertEquals(1, repoAdminService.getModels().size());
|
||
assertEquals(defaultModelCnt+1, dictionaryService.getAllModels().size());
|
||
|
||
myType = dictionaryService.getClass(QName.createQName("{my.new.model}sop"));
|
||
assertNotNull(myType);
|
||
assertEquals(QName.createQName("{my.new.model}mynewmodel"),myType.getModel().getName());
|
||
|
||
return null;
|
||
}
|
||
}, tenantAdminName);
|
||
}
|
||
}
|
||
|
||
public void test18AddCustomWebClient()
|
||
{
|
||
// note: add as demo files - need to re-start Alfresco to see custom web client config / messages
|
||
logger.info("test add custom web client config");
|
||
|
||
for (final String tenantDomain : tenants)
|
||
{
|
||
final String tenantAdminName = tenantService.getDomainUser(AuthenticationUtil.getAdminUserName(), tenantDomain);
|
||
|
||
TenantUtil.runAsPrimaryTenant(new TenantRunAsWork<Object>()
|
||
{
|
||
public Object doWork() throws Exception
|
||
{
|
||
NodeRef webClientExtFolder = getWebClientExtensionNodeRef(SPACES_STORE);
|
||
|
||
InputStream is = getClass().getClassLoader().getResourceAsStream("tenant/webclient.properties");
|
||
addContent(webClientExtFolder, "webclient.properties", is, MimetypeMap.MIMETYPE_TEXT_PLAIN);
|
||
|
||
is = getClass().getClassLoader().getResourceAsStream("tenant/web-client-config-custom.xml");
|
||
addContent(webClientExtFolder, "web-client-config-custom.xml", is, MimetypeMap.MIMETYPE_XML);
|
||
|
||
return null;
|
||
}
|
||
}, tenantAdminName);
|
||
}
|
||
}
|
||
|
||
public void test19FileFolder()
|
||
{
|
||
logger.info("test file/folder list");
|
||
|
||
AuthenticationUtil.setFullyAuthenticatedUser(AuthenticationUtil.getAdminUserName());
|
||
|
||
for (final String tenantDomain : tenants)
|
||
{
|
||
final String tenantUserName = tenantService.getDomainUser(TEST_USER1, tenantDomain);
|
||
|
||
TenantUtil.runAsPrimaryTenant(new TenantRunAsWork<Object>()
|
||
{
|
||
public Object doWork() throws Exception
|
||
{
|
||
List<String> pathElements = new ArrayList<String>(2);
|
||
pathElements.add("Data Dictionary");
|
||
pathElements.add("Presentation Templates");
|
||
|
||
NodeRef chRef = repositoryHelper.getCompanyHome();
|
||
NodeRef ddRef = fileFolderService.resolveNamePath(chRef, pathElements).getNodeRef();
|
||
|
||
assertTrue(fileFolderService.list(ddRef).size() > 0);
|
||
|
||
return null;
|
||
}
|
||
}, tenantUserName);
|
||
}
|
||
}
|
||
|
||
// TODO fix CLOUD-1348
|
||
// pseudo cleanup - if this test runs last
|
||
public void xtest20DeleteAllTenants()
|
||
{
|
||
logger.info("test delete tenants");
|
||
|
||
AuthenticationUtil.setFullyAuthenticatedUser(AuthenticationUtil.getAdminUserName());
|
||
|
||
List<Tenant> allTenants = tenantAdminService.getAllTenants();
|
||
for (final Tenant tenant : allTenants)
|
||
{
|
||
deleteTenant(tenant.getTenantDomain());
|
||
}
|
||
}
|
||
|
||
// TODO pending CLOUD-1350 fix
|
||
public void xtest21_ALF_12732()
|
||
{
|
||
final String tenantDomain1 = TEST_RUN+".one.alf12732";
|
||
|
||
createTenant(tenantDomain1);
|
||
|
||
String tenantAdminName = tenantService.getDomainUser(AuthenticationUtil.getAdminUserName(), tenantDomain1);
|
||
|
||
try
|
||
{
|
||
AuthenticationUtil.setFullyAuthenticatedUser(tenantAdminName); // note: since SiteServiceImpl.setupSitePermissions currently uses getCurrentUserName (rather than runAs)
|
||
|
||
TenantUtil.runAsPrimaryTenant(new TenantRunAsWork<Object>()
|
||
{
|
||
public Object doWork() throws Exception
|
||
{
|
||
createSite("site1");
|
||
|
||
NodeRef docLib1Ref = siteService.getContainer("site1", SiteService.DOCUMENT_LIBRARY);
|
||
NodeRef contentRef = addContent(docLib1Ref, "tqbfjotld.txt", "The quick brown fox jumps over the lazy dog", MimetypeMap.MIMETYPE_TEXT_PLAIN);
|
||
|
||
createSite("site2");
|
||
|
||
NodeRef docLib2Ref = siteService.getContainer("site2", SiteService.DOCUMENT_LIBRARY);
|
||
|
||
nodeService.moveNode(contentRef, docLib2Ref, ContentModel.ASSOC_CONTAINS, QName.createQName("tqbfjotld.txt"));
|
||
|
||
// for Share, called via "move-to.post.json.js" -> ScriptSiteService.cleanSitePermissions
|
||
siteService.cleanSitePermissions(contentRef, null);
|
||
|
||
return null;
|
||
}
|
||
}, tenantAdminName);
|
||
}
|
||
finally
|
||
{
|
||
AuthenticationUtil.clearCurrentSecurityContext();
|
||
}
|
||
}
|
||
|
||
public void test22_ALF_14354()
|
||
{
|
||
final String tenantDomain1 = TEST_RUN+".one.alf14354";
|
||
final String tenantDomain2 = TEST_RUN+".two.alf14354";
|
||
|
||
createTenant(tenantDomain1);
|
||
createTenant(tenantDomain2);
|
||
|
||
String tenantAdminName = tenantService.getDomainUser(AuthenticationUtil.getAdminUserName(), tenantDomain1);
|
||
TenantUtil.runAsPrimaryTenant(new TenantRunAsWork<Object>()
|
||
{
|
||
public Object doWork() throws Exception
|
||
{
|
||
NodeRef rootNodeRef = repositoryHelper.getRootHome();
|
||
|
||
assertTrue(nodeService.exists(rootNodeRef));
|
||
|
||
return null;
|
||
}
|
||
}, tenantAdminName);
|
||
|
||
tenantAdminName = tenantService.getDomainUser(AuthenticationUtil.getAdminUserName(), tenantDomain2);
|
||
TenantUtil.runAsPrimaryTenant(new TenantRunAsWork<Object>()
|
||
{
|
||
public Object doWork() throws Exception
|
||
{
|
||
NodeRef rootNodeRef = repositoryHelper.getRootHome();
|
||
|
||
assertTrue(nodeService.exists(rootNodeRef));
|
||
|
||
return null;
|
||
}
|
||
}, tenantAdminName);
|
||
}
|
||
|
||
private void createGroup(String shortName, String parentShortName)
|
||
{
|
||
// create new Group using authority Service
|
||
String groupName = this.authorityService.getName(AuthorityType.GROUP, shortName);
|
||
if (this.authorityService.authorityExists(groupName) == false)
|
||
{
|
||
String parentGroupName = null;
|
||
if (parentShortName != null)
|
||
{
|
||
parentGroupName = this.authorityService.getName(AuthorityType.GROUP, parentShortName);
|
||
if (this.authorityService.authorityExists(parentGroupName) == false)
|
||
{
|
||
logger.warn("Parent group does not exist: " + parentShortName);
|
||
return;
|
||
}
|
||
}
|
||
|
||
this.authorityService.createAuthority(AuthorityType.GROUP, shortName);
|
||
|
||
if (parentGroupName != null)
|
||
{
|
||
addToGroup(parentShortName, groupName);
|
||
}
|
||
}
|
||
else
|
||
{
|
||
logger.warn("Group already exists: " + shortName);
|
||
}
|
||
}
|
||
|
||
private void addToGroup(String parentGroupShortName, String authorityName)
|
||
{
|
||
String parentGroupName = this.authorityService.getName(AuthorityType.GROUP, parentGroupShortName);
|
||
authorityService.addAuthority(parentGroupName, authorityName);
|
||
}
|
||
|
||
private NodeRef createUser(String baseUserName, String tenantDomain, String password)
|
||
{
|
||
String userName = tenantService.getDomainUser(baseUserName, tenantDomain);
|
||
|
||
NodeRef personNodeRef = null;
|
||
|
||
if (! this.authenticationService.authenticationExists(userName))
|
||
{
|
||
NodeRef baseHomeFolder = getUserHomesNodeRef(SPACES_STORE);
|
||
|
||
// Create the users home folder
|
||
NodeRef homeFolder = createHomeSpaceFolderNode(
|
||
baseHomeFolder,
|
||
baseUserName,
|
||
userName);
|
||
|
||
// Create the authentication
|
||
this.authenticationService.createAuthentication(userName, password.toCharArray());
|
||
|
||
// Create the person
|
||
Map<QName, Serializable> personProperties = new HashMap<QName, Serializable>();
|
||
personProperties.put(ContentModel.PROP_USERNAME, userName);
|
||
personProperties.put(ContentModel.PROP_HOMEFOLDER, homeFolder);
|
||
personProperties.put(ContentModel.PROP_FIRSTNAME, baseUserName);
|
||
personProperties.put(ContentModel.PROP_LASTNAME, baseUserName+"-"+tenantDomain); // add domain suffix here for demo only
|
||
personProperties.put(ContentModel.PROP_EMAIL, userName);
|
||
|
||
personNodeRef = this.personService.createPerson(personProperties);
|
||
|
||
// ensure the user can access their own Person object
|
||
this.permissionService.setPermission(personNodeRef, userName, permissionService.getAllPermission(), true);
|
||
|
||
NodeRef checkHomeSpaceRef = (NodeRef)nodeService.getProperty(personNodeRef, ContentModel.PROP_HOMEFOLDER);
|
||
assertNotNull(checkHomeSpaceRef);
|
||
|
||
logger.info("Created user " + userName);
|
||
}
|
||
else
|
||
{
|
||
personNodeRef = personService.getPerson(userName);
|
||
|
||
logger.info("Found existing user " + userName);
|
||
}
|
||
|
||
return personNodeRef;
|
||
}
|
||
|
||
private void loginLogoutUser(String username, String password)
|
||
{
|
||
// authenticate via the authentication service
|
||
authenticationService.authenticate(username, password.toCharArray());
|
||
|
||
// set the user name as stored by the back end
|
||
username = authenticationService.getCurrentUserName();
|
||
|
||
NodeRef personRef = personService.getPerson(username);
|
||
NodeRef homeSpaceRef = (NodeRef)nodeService.getProperty(personRef, ContentModel.PROP_HOMEFOLDER);
|
||
|
||
// check that the home space node exists - else user cannot login
|
||
if (nodeService.exists(homeSpaceRef) == false)
|
||
{
|
||
throw new InvalidNodeRefException(homeSpaceRef);
|
||
}
|
||
|
||
// logout
|
||
authenticationService.clearCurrentSecurityContext();
|
||
}
|
||
|
||
private NodeRef getUserHomesNodeRef(StoreRef storeRef)
|
||
{
|
||
// get the "User Homes" location
|
||
return findFolderNodeRef(storeRef, "/app:company_home/app:user_homes");
|
||
}
|
||
|
||
private NodeRef getWebClientExtensionNodeRef(StoreRef storeRef)
|
||
{
|
||
// get the "Web Client Extensions" location
|
||
return findFolderNodeRef(storeRef, "/app:company_home/app:dictionary/app:webclient_extension");
|
||
}
|
||
|
||
private NodeRef findFolderNodeRef(StoreRef storeRef, String folderXPath)
|
||
{
|
||
ResultSet rs = this.searchService.query(storeRef, SearchService.LANGUAGE_XPATH, folderXPath);
|
||
|
||
NodeRef folderNodeRef = null;
|
||
if (rs.length() != 1)
|
||
{
|
||
throw new AlfrescoRuntimeException("Cannot find folder location: " + folderXPath);
|
||
}
|
||
else
|
||
{
|
||
folderNodeRef = rs.getNodeRef(0);
|
||
}
|
||
rs.close();
|
||
return folderNodeRef;
|
||
}
|
||
|
||
private NodeRef createFolderNode(NodeRef parentFolderNodeRef, String nameValue)
|
||
{
|
||
if (nameValue != null)
|
||
{
|
||
Map<QName, Serializable> folderProps = new HashMap<QName, Serializable>();
|
||
folderProps.put(ContentModel.PROP_NAME, nameValue);
|
||
|
||
return this.nodeService.createNode(
|
||
parentFolderNodeRef,
|
||
ContentModel.ASSOC_CONTAINS,
|
||
QName.createQName(NamespaceService.CONTENT_MODEL_1_0_URI, nameValue),
|
||
ContentModel.TYPE_FOLDER,
|
||
folderProps).getChildRef();
|
||
}
|
||
|
||
return null;
|
||
}
|
||
|
||
private NodeRef createCategory(StoreRef storeRef, NodeRef parentCategoryRef, String name, String description)
|
||
{
|
||
// create category using categoryservice
|
||
NodeRef ref;
|
||
if (parentCategoryRef == null)
|
||
{
|
||
ref = this.categoryService.createRootCategory(storeRef, ContentModel.ASPECT_GEN_CLASSIFIABLE, name);
|
||
}
|
||
else
|
||
{
|
||
ref = categoryService.createCategory(parentCategoryRef, name);
|
||
}
|
||
|
||
// apply the titled aspect - for description
|
||
Map<QName, Serializable> titledProps = new HashMap<QName, Serializable>(1, 1.0f);
|
||
titledProps.put(ContentModel.PROP_DESCRIPTION, description);
|
||
this.nodeService.addAspect(ref, ContentModel.ASPECT_TITLED, titledProps);
|
||
|
||
return ref;
|
||
}
|
||
|
||
private NodeRef createHomeSpaceFolderNode(NodeRef folderNodeRef, String spaceName, String userName)
|
||
{
|
||
if (spaceName != null)
|
||
{
|
||
Map<QName, Serializable> folderProps = new HashMap<QName, Serializable>();
|
||
folderProps.put(ContentModel.PROP_NAME, spaceName);
|
||
|
||
NodeRef nodeRef = this.nodeService.createNode(
|
||
folderNodeRef,
|
||
ContentModel.ASSOC_CONTAINS,
|
||
QName.createQName(NamespaceService.SYSTEM_MODEL_1_0_URI, spaceName),
|
||
ContentModel.TYPE_FOLDER,
|
||
folderProps).getChildRef();
|
||
|
||
// apply the uifacets aspect - icon and title props
|
||
Map<QName, Serializable> uiFacetsProps = new HashMap<QName, Serializable>(3);
|
||
uiFacetsProps.put(ApplicationModel.PROP_ICON, "space-icon-default");
|
||
uiFacetsProps.put(ContentModel.PROP_TITLE, spaceName);
|
||
this.nodeService.addAspect(nodeRef, ApplicationModel.ASPECT_UIFACETS, uiFacetsProps);
|
||
|
||
setupHomeSpacePermissions(nodeRef, userName);
|
||
|
||
return nodeRef;
|
||
}
|
||
|
||
return null;
|
||
}
|
||
|
||
private void setupHomeSpacePermissions(NodeRef homeSpaceRef, String userName)
|
||
{
|
||
// Admin Authority has full permissions by default (automatic - set in the permission config)
|
||
// give full permissions to the new user
|
||
this.permissionService.setPermission(homeSpaceRef, userName, permissionService.getAllPermission(), true);
|
||
|
||
// by default other users will only have GUEST access to the space contents
|
||
String permission = "Consumer";
|
||
|
||
if (permission != null && permission.length() != 0)
|
||
{
|
||
this.permissionService.setPermission(homeSpaceRef, permissionService.getAllAuthorities(), permission, true);
|
||
}
|
||
|
||
// the new user is the OWNER of their own space and always has full permissions
|
||
this.ownableService.setOwner(homeSpaceRef, userName);
|
||
this.permissionService.setPermission(homeSpaceRef, permissionService.getOwnerAuthority(), permissionService.getAllPermission(), true);
|
||
|
||
// now detach (if we did this first we could not set any permissions!)
|
||
this.permissionService.setInheritParentPermissions(homeSpaceRef, false);
|
||
}
|
||
|
||
private NodeRef getHomeSpaceFolderNode(String userName)
|
||
{
|
||
return (NodeRef)this.nodeService.getProperty(personService.getPerson(userName), ContentModel.PROP_HOMEFOLDER);
|
||
}
|
||
|
||
private NodeRef addContent(NodeRef spaceRef, String name, String textData, String mimeType)
|
||
{
|
||
Map<QName, Serializable> contentProps = new HashMap<QName, Serializable>();
|
||
contentProps.put(ContentModel.PROP_NAME, name);
|
||
|
||
ChildAssociationRef association = nodeService.createNode(spaceRef,
|
||
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);
|
||
|
||
return content;
|
||
}
|
||
|
||
private NodeRef addContent(NodeRef spaceRef, String name, InputStream is, String mimeType)
|
||
{
|
||
Map<QName, Serializable> contentProps = new HashMap<QName, Serializable>();
|
||
contentProps.put(ContentModel.PROP_NAME, name);
|
||
|
||
ChildAssociationRef association = nodeService.createNode(spaceRef,
|
||
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(is);
|
||
|
||
return content;
|
||
}
|
||
|
||
private SiteInfo createSite(String siteId)
|
||
{
|
||
SiteInfo siteInfo = siteService.createSite(null, siteId, "title - "+siteId, "description - "+siteId, SiteVisibility.PRIVATE);
|
||
|
||
// 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 result = siteService.getContainer(siteId, SiteService.DOCUMENT_LIBRARY);
|
||
if (result == null)
|
||
{
|
||
result = siteService.createContainer(siteId, SiteService.DOCUMENT_LIBRARY, ContentModel.TYPE_FOLDER, null);
|
||
}
|
||
|
||
return siteInfo;
|
||
}
|
||
|
||
/*
|
||
public static void main(String args[])
|
||
{
|
||
System.out.println(new Date());
|
||
junit.textui.TestRunner.run(MultiTDemoTest.class);
|
||
System.out.println(new Date());
|
||
}
|
||
*/
|
||
}
|