Commit Graph

5998 Commits

Author SHA1 Message Date
Ahmed Owian
a1a53bc3de Merged SHA-SIMP-2 (5.1.0) to HEAD (5.1)
113487 ragauss: ACE-4268: Added Users' Activiti Tasks Remain Active After Invitation Accepted
     - Removed user task step from add-direct workflow
     - Added check for completed start task in InvitationServiceImpl to avoid error throwing


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@113854 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-10-07 20:10:40 +00:00
Andrew Hind
faf109d9af Fix for ACE-4210 SOLR 4 - sharded - Dynamic shard information is not exposed via JMX
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@113664 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-10-05 09:04:41 +00:00
Andrew Hind
17bcd50769 Fix tests broken by 113336 Fix for ACE-4209 SOLR 4 - sharded - registered shards can not be cleared out or aged out
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@113492 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-09-30 21:07:51 +00:00
Andrew Hind
4a1d936680 Fix for ACE-4209 SOLR 4 - sharded - registered shards can not be cleared out or aged out
- shards age out, shards can be cleared out, index slices selected based on information volumne

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@113336 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-09-29 10:23:30 +00:00
Alan Davis
0ccc05a0c6 Merged 5.1.N (5.1.1) to HEAD (5.1)
113251 adavis: Merged 5.0.N (5.0.3) to 5.1.N (5.1.1)
      113194 abalmus: Merged DEV to 5.0.N (5.0.3)
         113149: MNT-13706 : Admin console unusable after we set any  busy port in Port Number Value for subsystem
            - Fixed issue that caused ACE-4194


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@113287 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-09-29 06:00:22 +00:00
Gethin James
410c24d2d1 Better Null handling, ACE-4246
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@112631 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-09-22 15:29:30 +00:00
Gethin James
d6b3f5acd3 Removed the use of Locale.setDefault(locale) ACE-4246
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@112630 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-09-22 15:29:28 +00:00
Jan Vonka
6394574c09 Merged HEAD_ACE198_MNT14743 (5.1) to HEAD (5.1)
111889: ACE-4189 (MNT-14743 / ACE-198): Perf boost when listing/sorting large folders (CMIS GetChildren / Share DocLib)
   - trivial: follow-on fix to r111851 to remove spurious (dead) code


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@112467 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-09-18 16:12:13 +00:00
Jan Vonka
976abc0de8 Merged HEAD_ACE198_MNT14743 (5.1) to HEAD (5.1)
111851: ACE-4189 (MNT-14743 / ACE-198): Perf boost when listing/sorting large folders (CMIS GetChildren / Share DocLib)


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@112466 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-09-18 16:10:51 +00:00
Andrew Hind
73530439fb Build fix - missed test class
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@111470 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-09-03 21:21:44 +00:00
Andrew Hind
10ac359c01 Build fix - moved unit test from enterprise to repository
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@111468 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-09-03 20:51:09 +00:00
Alex Mukha
b66cdbed12 ACE-979: WebDav MT RepositoryAuthenticationDao.getUserFolderLocation() seems to be no tenant-safe
- Fixed the solution and failed tests.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@111408 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-09-03 12:05:26 +00:00
Andrew Hind
357b273a8b Fix for ACE-4089 SOLR 4 - sharded - Remove the requirement for shard configuration on the Alfresco One Platform
- vanilla support - currently not enterprise only and does not support slave shards

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@111384 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-09-03 10:39:15 +00:00
Andrew Hind
a1e7a4fc17 Fix for ACE-4089 SOLR 4 - sharded - Remove the requirement for shard configuration on the Alfresco One Platform
- vanilla support - currently not enterprise only and does not support slave shards

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@111383 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-09-03 10:38:02 +00:00
Andrew Hind
d6e7d6be06 Fix for ACE-4089 SOLR 4 - sharded - Remove the requirement for shard configuration on the Alfresco One Platform
- vanilla support - currently not enterprise only and does not support slave shards

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@111382 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-09-03 10:37:33 +00:00
Andrew Hind
c61295f633 Fix for ACE-4140 BC - Public API - R109683 introduces an incompatibility change to the public API
- reverted the return type, deprecated the method and added a new one.

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@111359 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-09-03 06:53:20 +00:00
Derek Hulley
9391963510 Code standards found during ACE-198 investigation
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@111358 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-09-03 03:37:08 +00:00
Alan Davis
0157dc4eb4 Merged 5.0.N (5.0.3) to HEAD (5.1)
111285: Fix Build error from merge of
      Merged V4.2-BUG-FIX (4.2.6) to 5.0.N (5.0.3)
         111099: Merged V4.2.5 (4.2.5) to V4.2-BUG-FIX (4.2.6)
            110999: Merged DEV to V4.2.5 (4.2.5)
               MNT-10537 : BPM Models are filtered for CMIS getTypeDefinition
                  - As for DictionaryModelType we should destroy dictionary when new model is deployed from classpath.
                  - Unit test added.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@111333 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-09-02 17:54:15 +00:00
Alan Davis
4135061942 Merged 5.0.N (5.0.3) to HEAD (5.1)
111249: Merged V4.2-BUG-FIX (4.2.6) to 5.0.N (5.0.3)
      111099: Merged V4.2.5 (4.2.5) to V4.2-BUG-FIX (4.2.6)
         110999: Merged DEV to V4.2.5 (4.2.5)
            MNT-10537 : BPM Models are filtered for CMIS getTypeDefinition
               - As for DictionaryModelType we should destroy dictionary when new model is deployed from classpath.
               - Unit test added.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@111331 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-09-02 17:53:53 +00:00
Gavin Cornwell
465df6aae2 Added space between colon and version number in MMT error message.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@111312 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-09-02 14:22:57 +00:00
Alex Mukha
bb47289edf Merged DEV to HEAD (5.1)
110726: ACE-979: WebDav MT RepositoryAuthenticationDao.getUserFolderLocation() seems to be no tenant-safe
      - Implemented a JUnit test.
      - Fixed RepositoryAuthenticationDAO.getUserFolderLocation() to use cache keys with tenant domain and use the domain to find correct user store.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@111250 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-09-02 07:17:48 +00:00
Derek Hulley
74fa0b7da5 Help a bit with ACE-198 by removing unnecessary NPE in CMIS node info gathering
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@111217 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-09-01 13:45:11 +00:00
Gethin James
2c7773100b Merge Sabre4 to HEAD
111131: Removed unneeded assertion for SiteServiceImplTest RA-528


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@111209 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-09-01 13:07:43 +00:00
Gethin James
f4c0e36758 Merge Sabre4 to HEAD
111130: Adding additional test coverage to PersonService RA-525


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@111208 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-09-01 13:07:36 +00:00
Gethin James
8d583ab498 Merge Sabre4 to HEAD
111084: Copied the log4j.properties from core. Added additional DEBUG


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@111207 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-09-01 13:07:27 +00:00
Gethin James
4a792769ec Merge Sabre4 to HEAD
111083: Adding additional test coverage to SiteServiceImplMoreTest RA-528


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


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@111205 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-09-01 13:07:14 +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
001097cc83 Merge Sabre4 to HEAD
111068: Moved ActionServiceImpl2Test to the end of the suite RA-507


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@111203 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-09-01 13:06:56 +00:00
Gethin James
5524d399d0 Merge Sabre4 to HEAD
111051: Adding additional test coverage to PersonService RA-525


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@111202 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-09-01 13:06:50 +00:00
Gethin James
63a6b3b6ba Merge Sabre4 to HEAD
111028: Adding additional test coverage to SiteServiceImplTest RA-528


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@111201 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-09-01 13:06:43 +00:00
Gethin James
a5f79d69f5 Merge Sabre4 to HEAD
111027: Added a log4j.properties for the repo tests. Primarily to exercise code in ActionServiceImpl which is debug only RA-507


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@111200 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-09-01 13:06:36 +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
Gethin James
204df6a3c3 Merge Sabre4 to HEAD
111016: Added ActionServiceImpl2Test to the test suite RA-507


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@111198 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-09-01 13:06:22 +00:00
Gethin James
d9b7a774fd Merge Sabre4 to HEAD
110985: Adding additional test coverage to PersonService RA-525


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@111197 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-09-01 13:06:15 +00:00
Gethin James
90e47f2f13 Merge Sabre4 to HEAD
110956: Adding additional test coverage to ActionService RA-507


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@111196 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-09-01 13:06:08 +00:00
Gethin James
e1bbb452c8 Merge Sabre4 to HEAD
110954: Adding additional test coverage to PersonService RA-525


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@111195 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-09-01 13:06:01 +00:00
Gethin James
43416b6f11 Merge Sabre4 to HEAD
110900: Making public because they are part of the AlfrescoPublicApi RA-553


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


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@111193 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-09-01 13:05:46 +00:00
Gethin James
156937fe92 Merge Sabre4 to HEAD
110749: Additional Public apis. RA-553


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@111192 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-09-01 13:05:22 +00:00
Gethin James
876fce75a4 Merge Sabre4 to HEAD
110660: New ModulePackages api endpoint for RA-370


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@111187 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-09-01 13:04:38 +00:00
Greg Melahn
eae59798ba Fixed Typo reported by Community ACE-2525
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@111168 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-08-31 16:39:30 +00:00
Tatyana Valkevych
188e1ac194 Merged 5.0.N (5.0.3) to HEAD (5.1)
111037: Merged V4.2-BUG-FIX (4.2.6) to 5.0.N (5.0.3)
      110885: MNT-14532: Revert changes for MNT-14474 and MNT-12849: Merged V4.2.2 (4.2.2.24) to V4.2-BUG-FIX (4.2.6): Merged V4.2.5 (4.2.5) to V4.2-BUG-FIX (4.2.6)
         110477: MNT-14532 : Revert changes for MNT-14474 and MNT-12849
            -reverted revision 93098 done for MNT-12849 My Sites public API is not returning the expected list of sites


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@111102 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-08-28 13:18:41 +00:00
Andrew Hind
2c250be45b Fix for ACE-2004 SOLR 4 - Support filtering of query results
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@111060 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-08-27 20:35:23 +00:00
Tatyana Valkevych
271ce04935 Merged 5.0.N (5.0.3) to HEAD (5.1)
110822: Merged V4.2-BUG-FIX (4.2.6) to 5.0.N (5.0.3)
      110619: Merged V4.2.5 (4.2.5) to V4.2-BUG-FIX (4.2.6)
         110422: Merged DEV to V4.2.5 (4.2.5)
            110332: MNT-14151 : CMIS Upload/Create in 4.2 adds the sys:hidden and cm:indexControl Aspect to documents starting with a period
               - added system property in order to enable/disable cmis hidden behavior
               


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@110935 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-08-26 13:42:25 +00:00
Tatyana Valkevych
5814865fc8 Merged 5.0.N (5.0.3) to HEAD (5.1)
110768: Merged V4.2-BUG-FIX (4.2.6) to 5.0.N (5.0.3)
      110604: Merged V4.1-BUG-FIX (4.1.11) to V4.2-BUG-FIX (4.2.6)
         110200: Merged DEV to V4.1-BUG-FIX (4.1.11)
            109557: MNT-6350: 'New Rule' page: 'Deep Copy' check-box is not localized
               - Caching mechanism for the actions' parameters labels has been implemented. Labels for action's parameters will be loaded into RAM for the configured set of locales for each parameter of each definition of the action. Affected tests have been changed.,
         110327: MNT-6350: 'New Rule' page: 'Deep Copy' check-box is not localized
            - Changed locale setting to fix build failure.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@110913 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-08-26 13:11:16 +00:00
Ray Gauss
3550148307 Merged SHA-SIMP-1 (5.1.0) to HEAD (5.1)
106201: SHA-1021: Add Leave Site Link to Email Template
     - Added siteLeaveLink to properties for email generation in InviteSender
     - Added link and styling to email template
     - Updated InviteSenderTest


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@110796 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-08-25 14:03:06 +00:00
Ray Gauss
d04367fc9c Merged SHA-SIMP-1 (5.1.0) to HEAD (5.1)
106196: SHA-993: Create Site Link in Email
     - Modified InviteSender to add siteDashboardLink as a property being sent to the email generation
     - Updated email template with siteDashboardLink
     - Updated InviteSenderTest


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@110794 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-08-25 14:02:29 +00:00
Ray Gauss
f288825e2e Merged SHA-SIMP-1 (5.1.0) to HEAD (5.1)
105366: SHA-957: Create New Email Template
     - Fixed InviteSenderTest


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@110792 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-08-25 14:01:49 +00:00
Ray Gauss
39a3ac65fd Merged SHA-SIMP-1 (5.1.0) to HEAD (5.1)
105365: SHA-957: Create New Email Template
     - Changed InviteHelper and InviteSender methods to accept emailTemplateXpath and emailSubjectKey rather than using hardcoded defaults
     - Changed existing email send delegates to declare their respective emailTemplateXpath and emailSubjectKey
     - Added SendNominatedInviteAddDirectDelegate with new emailTemplateXpath and emailSubjectKey
     - Added SendNominatedInviteAddDirectDelegate bean definition
     - Added localization messages for subject and space
     - Changed sendInvite in workflow to use SendNominatedInviteAddDirectDelegate
     - Updated InviteSenderTest


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@110791 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-08-25 14:01:33 +00:00