Commit Graph

171 Commits

Author SHA1 Message Date
Derek Hulley
5682ef0c34 Undo fix for REPO-1022: MNT-16271. Tests working locally but race conditions are possible.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@133098 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-11-24 21:05:13 +00:00
Derek Hulley
b6358642e4 REPO-1022: MNT-16271 SiteGroups of existing sites are deleted if site of the same name exists in the Trashcan.
- It is not possible to create a site if a same-named site has not been deleted and purged
 - Before this change came in, there were cases where sites had been created while same-named sites existed in the trashcan
 - Purging those sites was detrimental to the live sites
 - Added the workaround and associated test as suggested by Andrea on MNT-16271


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@133079 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-11-24 13:13:22 +00:00
Derek Hulley
529834ebad Bring imports into line during investigation
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@133073 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-11-24 11:42:51 +00:00
Ramona Neamtu
7691ae0bee Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)
128834 rneamtu: MNT-16565 : [Site Activities] Group identifier appears instead of group name when changing the group's role
      - Fixed activity dashlet display in case of role changed for group.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@128864 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-07-21 11:09:20 +00:00
Ramona Neamtu
49f9e3d0e8 Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)
128509 rneamtu: MNT-16488 : CLONE - Activities dashlet displays group indentifier instead of group name
      - Added activiti for add/remove group to the site with autorityDisplayName instead of authorityName


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@128529 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-07-04 10:51:19 +00:00
Cristian Turlica
3cb8d094ef Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)
127134 cturlica: Merged 5.0.N (5.0.4) to 5.1.N (5.1.2)
      127102 rmunteanu: MNT-15614 : Site with name "IT" cannot be managed properly
         - Changed the way the role name is striped out.
         - Implemented tests.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@127160 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-05-17 14:13:46 +00:00
Raluca Munteanu
6afb44e712 Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)
125606 rmunteanu: Merged 5.1.1 (5.1.1) to 5.1.N (5.1.2)
      125515 slanglois: MNT-16155 Update source headers - add new Copyrights for Java and JSP source files + automatic check in the build


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@125788 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-04-26 13:45:01 +00:00
Raluca Munteanu
8674e2bfc8 Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)
125603 rmunteanu: Merged 5.1.1 (5.1.1) to 5.1.N (5.1.2)
      125484 slanglois: MNT-16155 Update source headers - remove old Copyrights from Java and JSP dource files


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@125781 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-04-26 12:48:49 +00:00
Ancuta Morarasu
2de22b5ec5 Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)
125335 rneamtu: Merged 5.1.1 (5.1.1) to 5.1.N (5.1.2)
      125223 amukha: MNT-15743: documentlibrary generation anomaly in Share
         - Added a check to ensure that a proper doc lib container would be created.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@125442 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-04-15 12:16:07 +00:00
Alan Davis
47464aa8c2 Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)
124237 amorarasu: Merged 5.0.N (5.0.4) to 5.1.N (5.1.2)
      124191 amorarasu: Merged V4.2-BUG-FIX (4.2.7) to 5.0.N (5.0.4)
         124133 arebegea: MNT-14671 : Site with document locked for Edit Offline cannot be deleted
            - disabled the ASPECT_LOCKABLE when deleting a site
            - added tests for delete and restore site


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@124278 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-21 11:06:14 +00:00
Alan Davis
d505abcf14 Merged 5.1-MNT1 (5.1.0) to HEAD (5.1)
115473 adavis: Merged 5.1.N (5.1.1) to 5.1-MNT1 (5.1.0)
      114742 rmunteanu: Merged 5.0.N (5.0.3) to 5.1.N (5.1.1)
         114701 amorarasu: Merged V4.2-BUG-FIX (4.2.6) to 5.0.N (5.0.3)
            114590 amorarasu: Merged V4.2.5 (4.2.5) to V4.2-BUG-FIX (4.2.6)
               114466 abozianu: MNT-14994 : CLONE - Alfresco Mobile: All Sites is throwing error when listing sites


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@115682 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-10-30 00:15:02 +00:00
Gethin James
6c186639fb Merge Sabre4 to HEAD
111081: Extracted duplicate code, provided a test. RA-528


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@111204 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-09-01 13:07:05 +00:00
Gethin James
d5475c55a5 Merge Sabre4 to HEAD
111026: Adding additional test coverage to SiteServiceImplTest RA-528


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@111199 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-09-01 13:06:28 +00:00
Alan Davis
009d4ff6d1 Merged 5.0.N (5.0.3) to HEAD (5.1)
109438: Merged V4.2-BUG-FIX (4.2.6) to 5.0.N (5.0.3)
      109264: Merged V4.2.5 (4.2.5) to V4.2-BUG-FIX (4.2.6)
         109214: Merged DEV to V4.2.5-PATCHES
            109105: MNT-14452: Permissions not amended correctly when changing a site from private to public
              - Return inheritance to the site containers when site becomes public.  
            109213: MNT-14452: Permissions not amended correctly when changing a site from private to public
              - Unit test for change visibility


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@109800 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-08-08 07:59:52 +00:00
Tatyana Valkevych
7dd2291753 Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
107541: Merged 5.0.N (5.0.3) to HEAD-BUG-FIX (5.1/Cloud) (PARTIAL MERGE)
      107413: Merged DEV to 5.0.N (5.0.3)
         106858 : MNT-13545: JavaDoc : Inconsistencies between the Java doc and the actual code
            - Cleaning of Javadoc,
   107565: MNT-13545 Fix compilation after merge of Javadoc


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@107633 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-07-02 16:13:03 +00:00
Alan Davis
62565e913d Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
105785: Work around for ACE-3943: SiteService assumes java.lang.String for cm:title and cm:description


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@105944 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-06-11 13:25:01 +00:00
Alan Davis
95a81a4fe7 Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
104818: Merged 5.0.N (5.0.2) to HEAD-BUG-FIX (5.1/Cloud)
      104759: Merged V4.2-BUG-FIX (4.2.5) to 5.0.N (5.0.2)
         104650: Merged DEV to V4.2-BUG-FIX (4.2.5)
            104535 : MNT-13522: Remove unused SitesCannedQuery
               - Removed unused classes


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@104876 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-05-26 21:54:03 +00:00
Alan Davis
7078474695 Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
102708: Merged 5.0.N (5.0.2) to HEAD-BUG-FIX (5.1/Cloud)
      102489: Merged V4.2-BUG-FIX (4.2.5) to 5.0.N (5.0.2)
         102284: Merged DEV to V4.2-BUG-FIX
            101812 : MNT-13710 : User cannot change site role if its current role contains an underscore
               - Added new unit test. Corrected some code.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@103538 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-05-02 07:17:53 +00:00
Tatyana Valkevych
b01990e92f Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
101747: Merged 5.0.N (5.0.2) to HEAD-BUG-FIX (5.1/Cloud)
      101635: Merged V4.2-BUG-FIX (4.2.5) to 5.0.N (5.0.2)
         101289: Reverse merged V4.2-BUG-FIX (4.2.5)
            << Brought back the changes >>
            98889: Reverse merged V4.1-BUG-FIX (4.1.10)
               << Caused a performance problem found in 5.0.1 testing >>
               Merged V4.1-BUG-FIX (4.1.10) to V4.2-BUG-FIX (4.2.5)
                  93762: Fix for MNT-13198 BM-0012: Run v420b1494_01: (CMIS) GetSites is Slow
                  - use the bridge table to list sites.
                  93802: Fix for MNT-13198 BM-0012: Run v420b1494_01: (CMIS) GetSites is Slow
                  - use hasSite to check for existence and fix person lookup case sensitivity configuration
            98886: Reverse merged V4.1-BUG-FIX (4.1.10)
               << Original commits for this issue caused a performance problem found in 5.0.1 testing >>
               98334: Merged DEV (4.2.5) to V4.2-BUG-FIX (4.2.5)
                  98326: MNT-13198: BM-0012: Run v420b1494_01: (CMIS) GetSites is Slow
                    - Changed the PersonSitesRelation to use a faster API (SiteServiceImpl.listSiteMemberships(String, int)).
               98452: MNT-13198: BM-0012: Run v420b1494_01: (CMIS) GetSites is Slow
                  - Corrected the solution to fix the build failures.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@101849 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-04-14 16:11:50 +00:00
Alan Davis
a4a7c5f8e7 Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
99981: Merged 5.0.N (5.0.2) to HEAD-BUG-FIX (5.1/Cloud) (PARTIAL MERGE)
      99482: Merged DEV to 5.0.N (5.0.1)
         99198 : MNT-13545: JavaDoc : Inconsistencies between the Java doc and the actual code
            - Changed Javadoc typo in project alfresco-jlan
         99413 : MNT-13545: JavaDoc : Inconsistencies between the Java doc and the actual code
            - Changed Javadoc parameters inconsistence in project alfresco-jlan
         99205 : MNT-13545: JavaDoc : Inconsistencies between the Java doc and the actual code
            - Changed Javadoc parameters inconsistence in project core
         99415 : MNT-13545: JavaDoc : Inconsistencies between the Java doc and the actual code
            - Changed Javadoc parameters inconsistence in project data-model
         99227 : MNT-13545: JavaDoc : Inconsistencies between the Java doc and the actual code
            - Changed Javadoc parameters inconsistence in project file-transfer-receiver
         99416 : MNT-13545: JavaDoc : Inconsistencies between the Java doc and the actual code
            - Changed Javadoc parameters inconsistence in project legacy-lucene
         99417 : MNT-13545: JavaDoc : Inconsistencies between the Java doc and the actual code
            - Changed Javadoc parameters inconsistence in project qa-share
         99418 : MNT-13545: JavaDoc : Inconsistencies between the Java doc and the actual code
            - Changed Javadoc parameters inconsistence in project remote-api
         99427 : MNT-13545: JavaDoc : Inconsistencies between the Java doc and the actual code
            - Changed Javadoc in project Repository, letters S..Z
         99433 : MNT-13545: JavaDoc : Inconsistencies between the Java doc and the actual code
            - Changed Javadoc in project Repository, letters A..R
         99421 : MNT-13545: JavaDoc : Inconsistencies between the Java doc and the actual code
            - Changed Javadoc parameters inconsistence in project share-po
         99247 : MNT-13545: JavaDoc : Inconsistencies between the Java doc and the actual code
            - Changed Javadoc typo in project slingshot
         99248 : MNT-13545: JavaDoc : Inconsistencies between the Java doc and the actual code
            - Changed Javadoc parameters inconsistence in project slingshot
         99424 : MNT-13545: JavaDoc : Inconsistencies between the Java doc and the actual code
            - Changed Javadoc parameters inconsistence in project solr
         99426 : MNT-13545: JavaDoc : Inconsistencies between the Java doc and the actual code
            - Changed Javadoc parameters inconsistence in project solr4
         99253 : MNT-13545: JavaDoc : Inconsistencies between the Java doc and the actual code
            - Changed Javadoc parameters inconsistence in project solr-client
         99259 : MNT-13545: JavaDoc : Inconsistencies between the Java doc and the actual code
            - Changed Javadoc parameters inconsistence in project web-client
         99260 : MNT-13545: JavaDoc : Inconsistencies between the Java doc and the actual code
            - Changed Javadoc parameters inconsistence in project web-framework-commons


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@100501 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-03-27 23:00:01 +00:00
Alan Davis
a330f85a38 Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
98900: Merged 5.0.N (5.0.2) to HEAD-BUG-FIX (5.1/Cloud)
      98891: Merged V4.2-BUG-FIX (4.2.5) to 5.0.N (5.0.2)
         98889: Reverse merged V4.1-BUG-FIX (4.1.10)
            << Caused a performance problem found in 5.0.1 testing >>
            Merged V4.1-BUG-FIX (4.1.10) to V4.2-BUG-FIX (4.2.5)
               93762: Fix for     MNT-13198    BM-0012: Run v420b1494_01: (CMIS) GetSites is Slow 
               - use the bridge table to list sites.
               93802: Fix for     MNT-13198    BM-0012: Run v420b1494_01: (CMIS) GetSites is Slow 
               - use hasSite to check for existence and fix person lookup case sensitivity configuration


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@98956 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-03-06 22:37:09 +00:00
Alan Davis
0c51454940 Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
98899: Merged 5.0.N (5.0.2) to HEAD-BUG-FIX (5.1/Cloud)
      98890: Merged V4.2-BUG-FIX (4.2.5) to 5.0.N (5.0.2)
         98886: Reverse merged V4.1-BUG-FIX (4.1.10)
            << Original commits for this issue caused a performance problem found in 5.0.1 testing >>
            98334: Merged DEV (4.2.5) to V4.2-BUG-FIX (4.2.5)
               98326: MNT-13198: BM-0012: Run v420b1494_01: (CMIS) GetSites is Slow
                 - Changed the PersonSitesRelation to use a faster API (SiteServiceImpl.listSiteMemberships(String, int)).
            98452: MNT-13198: BM-0012: Run v420b1494_01: (CMIS) GetSites is Slow
               - Corrected the solution to fix the build failures.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@98955 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-03-06 22:36:57 +00:00
Alan Davis
e99737fc8b Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
98720: Merged 5.0.N (5.0.2) to HEAD-BUG-FIX (5.1/Cloud)
      98568: Merged V4.2-BUG-FIX (4.2.5) to 5.0.N (5.0.2)
         98334: Merged DEV (4.2.5) to V4.2-BUG-FIX (4.2.5)
            98326: MNT-13198: BM-0012: Run v420b1494_01: (CMIS) GetSites is Slow
              - Changed the PersonSitesRelation to use a faster API (SiteServiceImpl.listSiteMemberships(String, int)).
         98452: MNT-13198: BM-0012: Run v420b1494_01: (CMIS) GetSites is Slow
            - Corrected the solution to fix the build failures.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@98811 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-03-06 08:05:06 +00:00
Alan Davis
d2273e4b98 Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
93983: Merged 5.0.N (5.0.1) to HEAD-BUG-FIX (5.1/Cloud)
      93851: Merged V4.2-BUG-FIX (4.2.5) to 5.0.N (5.0.1)
         93802: Fix for     MNT-13198    BM-0012: Run v420b1494_01: (CMIS) GetSites is Slow 
         - use hasSite to check for existence and fix person lookup case sensitivity configuration


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@95023 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-01-31 15:27:55 +00:00
Alan Davis
8deeb85349 Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
93981: Merged 5.0.N (5.0.1) to HEAD-BUG-FIX (5.1/Cloud)
      93849: Merged V4.2-BUG-FIX (4.2.5) to 5.0.N (5.0.1)
         93762: Fix for     MNT-13198    BM-0012: Run v420b1494_01: (CMIS) GetSites is Slow 
         - use the bridge table to list sites.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@95021 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-01-31 15:27:34 +00:00
Neil McErlean
e46f48b586 Fixing a dodgy line of code in SiteServiceImpl which I don't believe can cause a bug today, but exposes us to a bug in the future.
A java.util.Comparator.compare result was being compared to 1, which worked because the Comparator implementation we ship returns -1, 0 or 1. But the method contract is actually -ve, 0, +ve - so I've changed the comparison to that, which is safer.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@88056 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-10-14 13:46:36 +00:00
Alan Davis
afcee48923 Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
84025: Merged V4.2-BUG-FIX (4.2.4) to HEAD-BUG-FIX (5.0/Cloud)
      82649: Merged DEV to V4.2-BUG-FIX (4.2.4)
         82512: MNT-12282 : Site manager's avatar overrides others in Activities dashlet
         Changed the removeMembership activity generation to be done on behalf of the removed user.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@84616 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-09-18 17:20:31 +00:00
Erik Winlof
214e1ea9d8 Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
82339: Merged WAT2 (5.0/Cloud) to HEAD-BUG-FIX (5.0/Cloud)
      75270: Added event generation for site creation


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@83204 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-09-04 06:30:54 +00:00
Erik Winlof
e94f8f8351 Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
78429: Merged EOL (5.0/Cloud) to HEAD-BUG-FIX (5.0/Cloud)
      75801: ACE-2149: EOL AVM / WCM
       - Thorough sweep of 'avm' and 'wcm' references
       - Picked up on many 'deployment' and related classes and configuration
       - Repo starts


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@82558 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-09-03 12:13:50 +00:00
Mark Rogers
b42296da1c Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
77131: Merged PLATFORM1 (5.0/Cloud) to HEAD-BUG-FIX (5.0/Cloud)
      73478: Formatting fixed during investigations


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@77986 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-07-23 15:44:57 +00:00
Mark Rogers
b139656620 Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
76028: Merged V4.2-BUG-FIX (4.2.3) to HEAD-BUG-FIX (5.0/Cloud)
      75739: Merged DEV to V4.2-BUG-FIX (4.2.3)
         71980 : MNT-11362 : Cloud - Manage Sites feature not showing results if a site in the list is corrupt 
            - Check if containing authority exists 


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@77549 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-07-22 13:51:39 +00:00
Will Abson
1b64f0c442 Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
75083: Merged WAT2 (5.0/Cloud) to HEAD-BUG-FIX (5.0/Cloud)
      73270: Added Site creation event


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@75411 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-07-01 15:31:10 +00:00
Will Abson
c155d62f06 Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (4.3/Cloud)
73691: Merged V4.2-BUG-FIX (4.2.3) to HEAD-BUG-FIX (4.3/Cloud)
      73613: Merged V4.1-BUG-FIX (4.1.10) to V4.2-BUG-FIX (4.2.3)
         73399: Merged DEV to V4.1-BUG-FIX (4.1.10)
            70066: MNT-2229 Wrong user role is displayed in site members dashlet. 
            72036: MNT-2229 Wrong user role is displayed in site members dashlet.
                     - In SiteServiceImplTest was added testUserRoleInGroups() test.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@74806 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-06-25 16:07:45 +00:00
Alan Davis
81d2356496 Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
69948: Merged V4.2-BUG-FIX (4.2.3) to HEAD-BUG-FIX (4.3/Cloud)
      69866: Merged V4.2.2 to V4.2-BUG-FIX (V4.2.3)
         69863: Fix edge-case read-only server browsing of sites that require the tagscope aspect (MNT-11310)
         69864 (RECORD-ONLY): Removed deep svn:mergeinfo
         69865 (RECORD-ONLY): Undo r69863 (MNT-11310) as incorrect branch


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@70464 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-05-16 20:08:47 +00:00
Alan Davis
f38ddabb2d Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
69765: Merged V4.2-BUG-FIX (4.2.3) to HEAD-BUG-FIX (4.3/Cloud)
      69685: Merged V4.1-BUG-FIX (4.1.9) to V4.2-BUG-FIX (4.2.3)
         68638: Merged DEV to V4.1-BUG-FIX (4.1.9)
            68070 : MNT-11289 : Sites deleted in 2013 cannot be restored in 2014
               - Recreate groups when a site is restored on condition that the groups are missing. Make current user site manager if there is no site managers. Fix related test


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@70448 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-05-16 17:47:59 +00:00
Gethin James
f7ce3590b6 findSites() catches LuceneQueryParserException, logs it but supresses it from the user. ACE-1513
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@68308 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-04-30 10:00:58 +00:00
Gethin James
ff9cbfba1f Fix for ACE-1513, ACE-1428 cm:title is tokenized and ANDed together
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@68164 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-04-28 11:38:39 +00:00
Gethin James
798e3af1a0 For ACE-1513, additional fix for cm:name to hopefully benefit from default site creation behaviour
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@68120 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-04-28 10:24:51 +00:00
Gethin James
e6e3814951 Added a new findSites() method for use by live-search and Site Finder (sites.get.js) for ACE-1513
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@68092 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-04-26 16:20:13 +00:00
Alan Davis
fd031bcee8 Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
64434: Merged WAT1 (4.3/Cloud) to HEAD-BUG-FIX (4.3/Cloud)
      62644: Fixed the CloudInvitationServiceImplTest test failures in the build. Also changed the Mange Sites required APIs which were wrapped in runAs System user (committed in r62555), to Admin.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@64580 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-03-15 01:49:05 +00:00
Alan Davis
d8e85072a4 Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
64429: Merged WAT1 (4.3/Cloud) to HEAD-BUG-FIX (4.3/Cloud)
      62555: ACE-493, ACE-503 and ACE-511: Modified sites service APIs to support Manage Sites feature.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@64575 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-03-15 01:43:38 +00:00
Alan Davis
eac1a27791 Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
64428: Merged WAT1 (4.3/Cloud) to HEAD-BUG-FIX (4.3/Cloud)
      62552: Fixed SubscriptionServiceActivitiesTest failure in the build.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@64574 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-03-15 01:42:31 +00:00
Alan Davis
20e1ef2059 Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
64416: Merged WAT1 (4.3/Cloud) to HEAD-BUG-FIX (4.3/Cloud)
      61735: ACE-493: Made Sites Public REST API Get method callable by Admins or by users that are made members of the new "Site Admin" group.
      ACE-503: Created a new PUT method in Sites Public REST API, such that it is possible to modify the visibility of a site.
      ACE-511: Created a new DELETE method in Sites Public REST API, such that it is possible to delete a site.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@64562 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-03-15 01:29:23 +00:00
Alan Davis
9a1bb97a0c Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
63904: Merged V4.2-BUG-FIX (4.2.2) to HEAD-BUG-FIX (4.3.0.BF)
      63830: Merged V4.1-BUG-FIX (4.1.9) to V4.2-BUG-FIX (4.2.2)
         63743: Merged V4.1.8 (4.1.8) to V4.1-BUG-FIX (4.1.9)
            63678: Merged DEV to PATCHES/V4.1.8 (4.1.8)
               63659 : MNT-10836 : Created site isn't present on My Sites dashlet
                  - We should make additional check for site existence while listing user's sites as ACL may still exists while site was removed (in trashcan).


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@64333 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-03-14 17:06:49 +00:00
Alan Davis
9dca412a8c Merged HEAD-BUG-FIX (Cloud33/4.3) to HEAD (Cloud33/4.3)
62931: Merged PLATFORM1 (Cloud33) to HEAD-BUG-FIX (Cloud33/4.3)
      62696: ACE-480  Split Data-Model into Lucene Independent and Legacy Lucene Project


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@62986 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-02-20 14:59:18 +00:00
Alan Davis
0144810a6d Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
59269: Merged V4.2-BUG-FIX (4.2.1) to HEAD-BUG-FIX (Cloud/4.3)
      59268: Merged V4.1-BUG-FIX (4.1.8) to V4.2-BUG-FIX (4.2.1)
         59264: MNT-10237: Merged V4.1.6 (4.1.6.4) to V4.1-BUG-FIX (4.1.8) AGAIN!
            58707: MNT-10109: Merged DEV to PATCHES/V4.1.6 (4.1.6.4)
               58676: MNT-10109: Permissions are not restored when a deleted site is recovered from the trashcan
                  - Delete associated groups on callback when archived site is purged. Add unit test for case.
            58895: MNT-10109: Merged DEV to PATCHES/V4.1.6 (4.1.6.4)
               58855: MNT-10109: Permissions are not restored when a deleted site is recovered from the trashcan
                  - Fix unit tests failure by purging archived sites. Forbid new site creation if site group already exists.
               58871: MNT-10109: Permissions are not restored when a deleted site is recovered from the trashcan
                  - Return beforePurgeNode callback binding to Site class.
            58947: MNT-10109: PATCHES/V4.1.6 (4.1.6.4)
               58946: MNT-10109: Permissions are not restored when a deleted site is recovered from the trashcan
                  - Fix test failures by purging deleted sites from trashcan so that sitename can be reused. Change SiteServiceImplTest to avoid database deadlock.
            58949: MNT-10109: PATCHES/V4.1.6 (4.1.6.4)
               58948: MNT-10109: Permissions are not restored when a deleted site is recovered from the trashcan
                  - Fix test failures by purging deleted sites from trashcan so that sitename can be reused.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@62125 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-02-12 01:24:08 +00:00
Alan Davis
dd04a7ebfa Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
59267: Merged V4.2-BUG-FIX (4.2.1) to HEAD-BUG-FIX (4.3/Cloud)
      59266: Reverse Merge attempt at merging from V4.1-BUG-FIX (will do it again)
         AND record only merge the original commits 59231,59239 and reverse merge 59262 that took place on V4.1-BUG-FIX   
         59237: Merged V4.1-BUG-FIX (4.1.8) to V4.2-BUG-FIX (4.2.1)
            59231: MNT-10237: Merged V4.1.6 (4.1.6.4) to V4.1-BUG-FIX (4.1.8)
               58895: MNT-10109: Merged DEV to PATCHES/V4.1.6 (4.1.6.4)
                  58855: MNT-10109: Permissions are not restored when a deleted site is recovered from the trashcan
                     - Fix unit tests failure by purging archived sites. Forbid new site creation if site group already exists.
                  58871: MNT-10109: Permissions are not restored when a deleted site is recovered from the trashcan
                     - Return beforePurgeNode callback binding to Site class.
               58947: MNT-10109: PATCHES/V4.1.6 (4.1.6.4)
                  58946: MNT-10109: Permissions are not restored when a deleted site is recovered from the trashcan
                     - Fix test failures by purging deleted sites from trashcan so that sitename can be reused. Change SiteServiceImplTest to avoid database deadlock.
               58949: MNT-10109: PATCHES/V4.1.6 (4.1.6.4)
                  58948: MNT-10109: Permissions are not restored when a deleted site is recovered from the trashcan
                     - Fix test failures by purging deleted sites from trashcan so that sitename can be reused.
         59240: Merged V4.1-BUG-FIX (4.1.8) to V4.2-BUG-FIX (4.2.1)
            59239: MNT-10237: Permissions are not restored when a deleted site is recovered from the trashcan
               - The merge of the HF commit on 4.1.6 removed a variable that was not being used, but
                 was being used in later versions.
         59241: MNT-10237: Permissions are not restored when a deleted site is recovered from the trashcan
            - Correct error in merge from V4.1-BUG-FIX to V4.2-BUG-FIX


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@62124 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-02-12 01:23:12 +00:00
Alan Davis
b5e03702c7 Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
59258: Merged V4.2-BUG-FIX (4.2.1) to HEAD-BUG-FIX (Cloud/4.3)
      59240: Merged V4.1-BUG-FIX (4.1.8) to V4.2-BUG-FIX (4.2.1)
         59239: MNT-10237: Permissions are not restored when a deleted site is recovered from the trashcan
            - The merge of the HF commit on 4.1.6 removed a variable that was not being used, but
              was being used in later versions.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@62122 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-02-12 01:21:30 +00:00
Alan Davis
8d76c8edf7 Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
59256: Merged V4.2-BUG-FIX (4.2.1) to HEAD-BUG-FIX (Cloud/4.3)
      59237: Merged V4.1-BUG-FIX (4.1.8) to V4.2-BUG-FIX (4.2.1)
         59231: MNT-10237: Merged V4.1.6 (4.1.6.4) to V4.1-BUG-FIX (4.1.8)
            58895: MNT-10109: Merged DEV to PATCHES/V4.1.6 (4.1.6.4)
               58855: MNT-10109: Permissions are not restored when a deleted site is recovered from the trashcan
                  - Fix unit tests failure by purging archived sites. Forbid new site creation if site group already exists.
               58871: MNT-10109: Permissions are not restored when a deleted site is recovered from the trashcan
                  - Return beforePurgeNode callback binding to Site class.
            58947: MNT-10109: PATCHES/V4.1.6 (4.1.6.4)
               58946: MNT-10109: Permissions are not restored when a deleted site is recovered from the trashcan
                  - Fix test failures by purging deleted sites from trashcan so that sitename can be reused. Change SiteServiceImplTest to avoid database deadlock.
            58949: MNT-10109: PATCHES/V4.1.6 (4.1.6.4)
               58948: MNT-10109: Permissions are not restored when a deleted site is recovered from the trashcan
                  - Fix test failures by purging deleted sites from trashcan so that sitename can be reused.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@62120 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-02-12 01:19:54 +00:00
Brian Remmington
ed839dcbe0 Merged BRANCHES/V4.2 to HEAD:
55206: Branch created for 4.2.x releases.
   55209: Merged HEAD to BRANCHES/V4.2:
        55208: Added Sharepoint config to unit test classpath to fix VtiRequestDispatcherTest.
   55222: Merged HEAD-BUG-FIX to V4.2
        55220: Merged V4.1-BUG-FIX (4.1.7) to HEAD-BUG-FIX (4.2)
           55218: Fix for ALF-19894 Site is not displayed after restoring from Trashcan
             This bug was reported on 4.2, but the bug is also present on 4.1.
             I have added a testcase to reproduce the bug along with a fix.
             The problem was in SiteServiceImpl.delete where the code was writing an empty property value into the {}memberships property
             and therefore there was no record of which users had been members of the deleted site.
   55245: Fixed javadoc while checking that ALF-19055 was fixed.  ActivityService no longer uses 'format
   55246: CLOUD-2050 -Content changes are not synced from Cloud to On-Premise (errors in the logs)
   55249: Hazelcast: Added ability to create cache with 'read-backup-data' via property *.readBackupData
   55250: Hazelcast cache builder now accepts 'async-backup-count' value and any error in setting a value logs the full exception
   55251: Asynchronous cache: Better logging of in- and after-transaction processes
   55252: Asynchronous cache: Better logging of in- and after-transaction processes
   55266: Workflow REST API fix for variable retrieval
   55276: Merged HEAD to BRANCHES/V4.2:
        55274: Disabling Sharepoint unit tests until we can make them run properly in the build.
   55278: ALF-19889 - String for Brazilian Portuguese
   55279: Merged DEV to 4.2
        ALF-17464 : Replication jobs aren't displayed until sorting by some characteristic
           - Changing not exact equals (!==) to not euqals (!=)
   55280: Fix for ALF-19865 - Forgot password link redirects to Login page. Also cleaned up the mess that is the 'Sign in to Alfresco in the cloud' dialog.
   55281: Probable fix for ALF-19225 Intermittent test failures in SubscriptionServiceActivitiesTest
   55282: ALF-19865 - Cloud Sync profile area now looks like the rest of profile area.
   55285: Merged BRANCHES/DEV/BELARUS/HEAD-2013_08_27 to BRANCHES/V4.2:
        55068: ALF-19915 : MT and WebDAV: Content is lost when uploading non-empty document
   55286: Merged BRANCHES/DEV/BELARUS/HEAD-2013_08_29 to BRANCHES/V4.2:
        55207: ALF-19915 : MT and WebDAV: Content is lost when uploading non-empty document
        55210: ALF-19915 : MT and WebDAV: Content is lost when uploading non-empty document
   55297: As part of prep work for fixing ALF-20023 Recent Sites and Favorite Sites in copy/move pickers empty,
   55299: ALF-19556: IE10 specific fix for file upload browse (impressive how IE finds more and more innovative ways to spoil things for itself)
   55300: Fixed date issue when creating a new process instance
   55308: Resync to HEAD@55302


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@55309 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2013-09-15 15:00:13 +00:00