Commit Graph

648 Commits

Author SHA1 Message Date
Ana Bozianu
664a2a766d Merged HEAD (5.1) to 5.1.N (5.1.1)
114288 sglover: ACE-4347 "5.1 Build has had three transient failures related to locking"
   Increase the logging for the failing tests to DEBUG so that we can see what's happening during the next failure


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@114402 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-10-15 08:43:40 +00:00
Ancuta Morarasu
59251d836b Merged HEAD (5.1) to 5.1.N (5.1.1)
114219 jvonka: ACE-4250: Revert r110119 (except keep 2 out of 4 unit tests)
   - note: related to ACE-4421/MNT-13836


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@114317 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-10-14 09:21:11 +00:00
Ancuta Morarasu
f9525f7723 Merged HEAD (5.1) to 5.1.N (5.1.1)
114044 ahind: Fix for     ACE-4412    Dynamic shard registration should be an enterprise only feature


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@114313 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-10-14 09:17:16 +00:00
Ana Bozianu
55787b6687 Merged HEAD (5.1) to 5.1.N (5.1.1)
113855 aowian: Merged SHA-SIMP-2 (5.1.0) to HEAD (5.1)
      113531 ragauss: ACE-4268: Added Users' Activiti Tasks Remain Active After Invitation Accepted
        - Added check for no in-progress tasks to *disabled and broken* integration test


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@114050 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-10-09 11:56:39 +00:00
Alex Mukha
036183cf2f MNT-14901 MNT-13871: 4.2.5 User Auth code merged to 5.1.N caused 2 build failures
- Removed the hardcoded value in the test.

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@114046 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-10-09 11:49:38 +00:00
Ancuta Morarasu
998ebb98de Merged 5.0.N (5.0.3) to 5.1.N (5.1.1)
113684 adavis: Merged V4.2-BUG-FIX (4.2.6) to 5.0.N (5.0.3) (PARTIAL MERGE)
      113603 cturlica: Merged DEV to V4.2-BUG-FIX (4.2.6)
         113602 cturlica: MNT-14504: Cloud pull process not working after large delete


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@113727 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-10-06 08:58:59 +00:00
Ancuta Morarasu
98f27883be MNT-14901 MNT-13871: 4.2.5 User Auth code merged to 5.1.N caused 2 build failures
- Fixed the test SiteServiceImplTest.testListSiteMemberships that failed after testGroupMembership was fixed, but didn't delete the created site.

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@113647 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-10-02 16:44:04 +00:00
Alan Davis
519bb0e42b Merged HEAD (5.1) to 5.1.N (5.1.1)
113492 ahind: 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/BRANCHES/DEV/5.1.N/root@113642 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-10-02 15:56:04 +00:00
Alan Davis
8a84410b5a Merged HEAD (5.1) to 5.1.N (5.1.1)
113336 ahind: 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/BRANCHES/DEV/5.1.N/root@113640 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-10-02 15:55:45 +00:00
Ancuta Morarasu
27f95f25b6 MNT-14901 MNT-13871: 4.2.5 User Auth code merged to 5.1.N caused 2 build failures
- Fixed the test SiteServiceImplTest.testGroupMembership 

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@113578 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-10-02 09:23:14 +00:00
Alan Davis
c18aed4f7e Merged 5.0.N (5.0.3) to 5.1.N (5.1.1)
113201 vshikunets: MNT-11220: Access Denied thrown if model is missing
      - Fixed build failure. 


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@113252 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-09-28 21:48:45 +00:00
Alan Davis
159ecc46fb Merged 5.0.N (5.0.3) to 5.1.N (5.1.1)
113035 adavis: Merged V4.2-BUG-FIX (4.2.6) to 5.0.N (5.0.3)
      112991 pyurkevich: MNT-11220 : Access Denied thrown if model is missing
         - Fixed build failure.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@113249 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-09-28 21:48:18 +00:00
Alan Davis
a584404a7e Merged 5.0.N (5.0.3) to 5.1.N (5.1.1)
113032 adavis: Merged V4.2-BUG-FIX (4.2.6) to 5.0.N (5.0.3)
      112701 vshikunets: Merged DEV to V4.2-BUG-FIX (4.2.6).
         112128: MNT-11220: Access Denied thrown if model is missing. 


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@113248 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-09-28 21:48:06 +00:00
Alan Davis
45226dc03f MNT-13871 : Count authorised users as those who've logged in, not total # of person objects
- Try to fix one of the two build errors on 5.1.N as a result of r113101

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@113246 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-09-28 20:16:10 +00:00
Alan Davis
be1414ecde Merged 5.0.N (5.0.3) to 5.1.N (5.1.1)
112930: Merged V4.2-BUG-FIX (4.2.6) to 5.0.N (5.0.3)
      112707 adavis: Merged V4.2.5 (4.2.5) to V4.2-BUG-FIX (4.2.6)
         112677 dvaserin: MNT-14780 (MNT-13871): Licence Error message when in overage
          - Place overage buffer information into License MBean and use it in admin license ftl.
         112634 adavis: MNT-13871: Merged DEV (V4.2.5-MNT-13871-LATEST) to V4.2.5 (4.2.5)
            111550: Merged DEV (4.1.11) to DEV (4.2.5)
               MNT-13871 : Count authorised users as those who've logged in, not total # of person objects
                  - Merged all made changes in core alfresco projects as single commit to fresh dev branch forked from V4.1-BUG-FIX.
               MNT-13871 : Count authorised users as those who've logged in, not total # of person objects
                  - added try/finally approach to reset show delete users flag to default value.,
            111574: MNT-13871: Count authorised users as those who've logged in, not total # of person objects
               - Added V4.2.5 specific changes.,
            111582: MNT-13871: Count authorised users as those who've logged in, not total # of person objects
               - Updated the jar to correspond with the latest changes in authorised-users/4.2,
            111751: MNT-13871: Count authorised users as those who've logged in, not total # of person objects
               - Removed unnecessary configuration.,
            111752: Merged DEV (V4.1.11) to DEV (V4.2.5)
               111632: MNT-13871 : Count authorised users as those who've logged in, not total # of person objects
                  - Fixed unit tests for build plan: https://bamboo.alfresco.com/bamboo/browse/DEV-ENT414-1,
            111753: Merged DEV (4.1.11) to DEV (V4.2.5)
               111719: MNT-13871 : Count authorised users as those who've logged in, not total # of person objects
                  - Updated authorization related icons with ones provided by Mark Howarth.
                  - Information message in Deauthorize Dialog was changed to the on provided by Mark Howarth.,
            111754: MNT-13871 : Count authorised users as those who've logged in, not total # of person objects
               - Updated to the latest authorised-users lib.,
            111761: MNT-13871: Count authorised users as those who've logged in, not total # of person objects
               - Fix for the SchemaReferenceFileTest.,
            111800: MNT-13871: Count authorised users as those who've logged in, not total # of person objects
               - Modified the test to create a tenant in a retrying transaction to solve the DataIntegrityViolationException.,
            111801: Megred DEV (4.1.11) to DEV (4.2.5)
               111795: MNT-13871 : Count authorised users as those who've logged in, not total # of person objects
                  - Updated Deleted column to display text instead of tick icon.
                  - Added name for actions column.,
            111813: MNT-13871: Count authorised users as those who've logged in, not total # of person objects
               - Updated to the latest authorisation jar to fix the Scema Reference test.,
            112020: MNT-14775: De-authorisation pop-up has similar title to first line of text
              - Remove the duplicated text from the pop-up body
              - Updated link to point the 4.2 documentation,
            112134: MNT-14763: [UserAuth] New entries are added in the authorization table for each different username case
             - Update authorization jar,
            112144: MNT-13871: Optimized strings in users.get.properties,
            112184: MNT-14762 : [UserAuth]Users from the ALFRESCO_ADMINISTRATORS LDAP group are not pre-authorized
               - Updated authorized-users jar with fix for ldap administrators pre-authorization.,
            112196: MNT-14729 : [UserAuth] The column header for the Deauthorize and Reauthorize button should have a name
               - Updated name for re/de-authorize actions column.,
            112202: MNT-14763: [UserAuth] New entries are added in the authorization table for each different username case
             - Add new authorization jar to fix null errors,
            112203: MNT-14779: System behaviour when system set read only due to licence exception
             - Force read-write transaction for LoginPost script.,
            112225: MNT-14763: [UserAuth] New entries are added in the authorization table for each different username case
             - Add new authorization jar after unit test fixing.,
            112226: MNT-14740 : [UserAuth] The message for the failed re authorization is not displayed onIE
               - Code for reloading page was wrapped with YAHOO.lang.later() function.,
            112247: MNT-14747 : [UserAuth]The Autorization State isn't change when the user logs via FTP.
               - Updated authorization jar with fix for kerberos unit test.,
            112259: MNT-14776: Heading banner text when using all allowed authorised users.
               - Changed the message.
               - Updated the authorised-users jar.,
            112269: MNT-13871: Count authorised users as those who've logged in, not total # of person objects
             - Wrap methods that uses 'authenticationComponent.setCurrentUser' into RetryingTransaction for retrying on DataIntegrityViolationException.,
            112285: MNT-14747 : [UserAuth]The Autorization State isn't change when the user logs via FTP.
               - Updated version for authorized-users jar.,
            112388: MNT-14809: [UserAuth] On a cluster setup after running the hourly job only one node goes into R/O mode
               - Updated the authorised-users.jar,
            112439: MNT-14815 : Wrong documentation link used in the deauthorize message window
               - Corrected link to documentation.,
            112445: MNT-14818 : [UserAuth] Missing quotation mark in the user reauthorization window message
               - Corrected message for reauthorization dialog.,
            112450: MNT-14802: [UserAuth] License warning message displayed for all the users
               - Updated the authorised-users jar.,
            112454: MNT-14780: Licence Error message when in overage
             - Make license warn messages on admin console the same as banner warn messages.,
            112471: MNT-14773 : Sort state not persisted after authorisation action
               - Sorting/paging state is now persists in sessionStorage.,
            112478: MNT-14773 : Sort state not persisted after authorisation action
               - Corrected previous fix.,
            112483: MNT-14814: [UserAuth] System goes into R/O mode after running the hourly job
               - Updated the authorised-users jar to the latest version.,
            112512: MNT-14833: [UserAuth] User cannot login on both nodes (cluster env.)
             - Update authorization jar.,
            112556: MNT-14787: [UserAuth] Login via NFS works when the license limit exceed
               - Modified the exception handling of setCurrentUser method. Now all the exceptions are rethrown.,
            112570: MNT-14838: Correct the Max Users string in the Admin Console License Screen
               - Corrected the string, remove the incorrect translations from the bundle.,
            112572: REVERSE MERGED  <<code is not worth to implement>>
               112471 : MNT-14773 : Sort state not persisted after authorisation action
                  - Sorting/paging state is now persists in sessionStorage. 
               112478 : MNT-14773 : Sort state not persisted after authorisation action
                  - Corrected previous fix. ,
            112610: MNT-14837 : Report license overage to the log files on authorization/deauthorization of users
               - Updated users authorization jar file.,
            112627: MNT-14839: [UserAuth]Alfresco goes in read -only after reauthorize a user from LDAP ALFESCO_ADMINISTRATORS group
               - Updated the authorised-users jar to the latest version.
   Merged DEV (V5.0.2-MNT-13871) to 5.0.N (5.0.3)
      111954: MNT-13871: Count authorised users as those who've logged in, not total # of person objects
         - Removed context reference to authorization.,
      112003: MNT-13871: Count authorised users as those who've logged in, not total # of person objects
         -  Added copying of sources and configuration from authorised-users to the output directory during build.,
      112014: MNT-13871: Count authorised users as those who've logged in, not total # of person objects
         - Modified the build configuration to unpack the resources to the test folders.,
      112027: MNT-13871: Count authorised users as those who've logged in, not total # of person objects
         - Added unpacking of authorisation resources to repoitory-crypto project.,
      112067: MNT-13871: Count authorised users as those who've logged in, not total # of person objects
         - Removed unpacking of resources, changed the context imports to point to authorization.,
   112952: Merged DEV (V5.0.2-MNT-13871) to 5.0.N (5.0.3)
      111887: MNT-13871: Count authorised users as those who've logged in, not total # of person objects
         - Corrected the authorised-users version to correspond to 5.0.,
   113060: Merged V4.2-BUG-FIX (4.2.6) to 5.0.N (5.0.3)
      113059 adavis: Merged V4.2.5 (4.2.5) to V4.2-BUG-FIX (4.2.6)
         113058 adavis: MNT-13871: Count authorised users as those who've logged in, not total # of person objects
            - Version dependency for alfresco-authorised-users moved to top level pom


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@113101 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-09-25 13:42:39 +00:00
Alan Davis
dfe03d979b Merged 5.0.N (5.0.3) to 5.1.N (5.1.1)
112968 mrogers: Merged V4.2-BUG-FIX (4.2.6) to 5.0.N (5.0.3)
      112583: MNT-14817 - Alfresco keeps file handlers on deleted temporary files created by CIFSContentComparator


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@113042 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-09-24 20:03:57 +00:00
Alan Davis
2ebd8f7074 Merged 5.0.N (5.0.3) to 5.1.N (5.1.1)
112636 abozianu: MNT-14687 : Creating a document as checkedout and then canceling the checkout should delete the document
      - reverted fix due to test failure


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@112922 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-09-23 20:36:28 +00:00
Alan Davis
bf40bd0c26 Merged 5.0.N (5.0.3) to 5.1.N (5.1.1)
112568 abozianu: MNT-14687 : Creating a document as checkedout and then canceling the checkout should delete the document


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@112920 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-09-23 20:35:38 +00:00
Alan Davis
9f209f804b Merged HEAD (5.1) to 5.1.N (5.1.1)
112631 gjames: Better Null handling, ACE-4246


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@112682 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-09-23 10:56:22 +00:00
Alan Davis
612a9de0fa Merged 5.0.N (5.0.3) to 5.1.N (5.1.0)
112260: MNT-14526 : JobLockService add getLock with refresh callback variant


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@112342 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-09-18 08:24:19 +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
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
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
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
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
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
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
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
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
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
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
Ray Gauss
aee14f6158 Merged SHA-SIMP-1 (5.1.0) to HEAD (5.1)
105016: SHA-935: Repository Invite Flow Changes
     - Added new invitation-add-direct.bpmn20.xml workflow
     - Added bootstrapping of new workflow
     - Changed InvitationServiceImpl to allow setting of workflows used
     - Added configuration of workflows used in invitationService bean
     - Added repository properties for default workflows
     - Changed InvitationServiceImpl.getWorkflowDefinition to take an enum argument
     - Changed abstract testNominatedInvitationExistingUser to accommodate both current and new invite flows
     - Added test of new flow to Activiti test


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