Commit Graph

5706 Commits

Author SHA1 Message Date
Derek Hulley
bcf40c1b72 Fix leaked 'MLPropertyInterceptor.setMLAware' in data load API implementation (ACE-4552)
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@116895 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-11-10 10:39:07 +00:00
Ahmed Owian
5bcbdef83c Merged SHA-SIMP-2 (5.1.0) to HEAD (5.1)
116654 aowian: ACE-4500: Updating links to the help from within Alfresco
      - Code formatting according to Alfresco standards. No functionality changes.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@116662 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-11-10 06:03:28 +00:00
Ahmed Owian
3adb8621ac Merged SHA-SIMP-2 (5.1.0) to HEAD (5.1)
116550 aowian: ACE-4500: Updating links to the help from within Alfresco
      - Updated error message to include correct version of the docs.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@116661 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-11-10 06:03:09 +00:00
Alex Mukha
cdefbd2bf1 Merged 5.1.N (5.1.1) to HEAD (5.1)
116289 amukha: ACE-4513: Merged 5.0.N (5.0.3) to 5.1.N (5.1.1)
      116284 amukha: MNT-15091: Merged V4.2-BUG-FIX (4.2.6) to 5.0.N (5.0.3)
         116280 amukha: MNT-15090: Merged DEV to V4.2-BUG-FIX (4.2.6)
            115799: MNT-15075 : [Pentest 121015] ZIP extraction code execution
               Fix and test


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@116583 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-11-09 11:51:52 +00:00
Andrew Hind
b745f8464f Fix for ACE-4038 SOLR 4 - Sharded - Suggestor fails
- sharded and unsharded suggestion behave the same

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@116423 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-11-06 14:32:27 +00:00
Mark Rogers
7e546d5ba0 ACE-4523 - Binary File mimetype is set to files edited via CIFS/FTP
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@116418 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-11-06 14:13:58 +00:00
Gavin Cornwell
69dd91ff31 ACE-4570: RatingService is currently not marked with @AlfrescoPublicApi
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@116394 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-11-06 13:03:34 +00:00
Michael Gardner
f65f6790dd ACE-4317 parse emailed potential dbid as a long before using as a solr query parameter
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@115803 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-11-02 21:29:57 +00:00
Alan Davis
80118cac2d Merged 5.1-MNT1 (5.1.0) to HEAD (5.1)
115580 adavis: Merged 5.1.N (5.1.1) to 5.1-MNT1 (5.1.0)
      115535 adavis: Merged 5.0.N (5.0.3) to 5.1.N (5.1.1)
         115533 adavis: Merged 5.0.2-CLOUD (Cloud ) to 5.0.N (5.0.3)
            115531 adavis: Merged 5.0.2-PLUS (5.0.2-PLUS) to 5.0.2-CLOUD (Cloud )
               115517 abozianu: Merged DEV to 5.0.2-PLUS (5.0.2-PLUS)
                  115450 abozianu: MNT-15064 : [Cloud Upgrade] Errors apear in alfresco.log after Stop & Start upgrade Alfresco Cloud 39.6.5 to 40 on DP


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@115710 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-10-30 00:19:46 +00:00
Alan Davis
9fe8315e16 Merged 5.1-MNT1 (5.1.0) to HEAD (5.1)
115578 adavis: Merged 5.1.N (5.1.1) to 5.1-MNT1 (5.1.0)
      115292 adragoi: Merged 5.0.N (5.0.3) to 5.1.N (5.1.1)
         115032 adavis: Merged 5.0.2-CLOUD (Cloud ) to 5.0.N (5.0.3)
            115030 adavis: Merged 5.0.2-PLUS (5.0.2-PLUS) to 5.0.2-CLOUD (Cloud )
               114982 gcornwell: RA-608: Cloud repo fails to startup following successful bootstrap


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@115708 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-10-30 00:19:32 +00:00
Alan Davis
aaa621c981 Merged 5.1-MNT1 (5.1.0) to HEAD (5.1)
115572 adavis: Merged 5.1.N (5.1.1) to 5.1-MNT1 (5.1.0)
      114988 rmunteanu: Merged 5.0.N (5.0.3) to 5.1.N (5.1.1) (PARTIAL MERGE)
         114790 amorarasu: MNT-15007: CLONE - String values when migrating from MySQL to other DBs
            Merged V4.2-BUG-FIX (4.2.6) to 5.0.N (5.0.3)
               114311 amorarasu: Merged V4.1-BUG-FIX (4.1.11) to V4.2-BUG-FIX (4.2.6)
                  114245 tvalkevych: Merged V4.1.9 (4.1.9.13) to V4.1-BUG-FIX (4.1.11)
                     113717 dhulley: MNT-14911: String values when migrating from MySQL to other DBs
                      - Add a new job that allows node string values to be re-persisted according to the current 'system.maximumStringLength' value
                      - Job is unscheduled by default
                      - Set the 'system.maximumStringLength' and the 'system.maximumStringLength.jobCronExpression'
                      - Various touched code format fixes, method naming fixes, etc


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@115702 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-10-30 00:18:31 +00:00
Alan Davis
113f170a22 Merged 5.1-MNT1 (5.1.0) to HEAD (5.1)
115569 adavis: Merged 5.1.N (5.1.1) to 5.1-MNT1 (5.1.0)
      113040 adavis: Merged 5.0.N (5.0.3) to 5.1.N (5.1.1) (PARTIAL MERGE)
         112938 adavis: Merged V4.2-BUG-FIX (4.2.6) to 5.0.N (5.0.3)
            112693 nsmintanca: Merged NESS/4.2.N-2015-09-17 (4.2.6) to V4.2-BUG-FIX (4.2.6)
               112598: MNT-13331 : Unfriendly error displayed to user while trying to complete a task once more
                  - added check on task status in workflow/TaskFormPersister.java;
                  - added localization for the error message in workflow/workflow-messages.properties;
                  - added condition to display a friendly error message in alfresco.js
                  - referenced  current object to access its properties in task-edit-header.js
                  - added noCache parameter to the URL to ensure that requests are always made to the server to update data at back action in data-loader.js


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@115699 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-10-30 00:18:06 +00:00
Alan Davis
77434f1795 Merged 5.1-MNT1 (5.1.0) to HEAD (5.1)
115568 adavis: Merged 5.1.N (5.1.1) to 5.1-MNT1 (5.1.0)
      112922 adavis: 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/HEAD/root@115698 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-10-30 00:17:59 +00:00
Alan Davis
349ad866a5 Merged 5.1-MNT1 (5.1.0) to HEAD (5.1)
115567 adavis: Merged 5.1.N (5.1.1) to 5.1-MNT1 (5.1.0)
      112920 adavis: 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/HEAD/root@115697 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-10-30 00:17:51 +00:00
Alan Davis
aee9e920ed Merged 5.1-MNT1 (5.1.0) to HEAD (5.1)
115566 adavis: Merged 5.1.N (5.1.1) to 5.1-MNT1 (5.1.0)
      112558 adavis: Merged 5.0.N (5.0.3) to 5.1.N (5.1.1)
         112545: Merged V4.2-BUG-FIX (4.2.6) to 5.0.N (5.0.3)
            112271: Merged DEV to V4.2-BUG-FIX (4.2.6)
               111087: MNT-11957 - move approveModeratedInvitation to InvitationService so its auditable
               111792: MNT-11957: Approving a request to join site not available for auditing
                  - move rejectModeratedInvitation to InvitationService so its auditable
               111854: MNT-11957: Approving a request to join site not available for auditing
                  - move acceptNominatedInvitation and cancelInvitation to InvitationService so its auditable
               111890: MNT-11957: Approving a request to join site not available for auditing
                  - Removed obsolete methods from InviteHelper
               111991: MNT-11957: Approving a request to join site not available for auditing
                  - move deleteAuthenticationIfUnused and sendNominatedInvitationto InvitationService so its auditable. Excluded InviteHelper.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@115696 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-10-30 00:17:43 +00:00
Alan Davis
89d9a2b55a Merged 5.1-MNT1 (5.1.0) to HEAD (5.1)
115558 adavis: Merged 5.1.N (5.1.1) to 5.1-MNT1 (5.1.0)
      111896 adavis: Merged 5.0.N (5.0.3) to 5.1.N (5.1.0)
         111501: Merged DEV to 5.0.N (5.0.3)
            110986: MNT-14221 : CMIS aclCapability.getPermissionMappings() returns permissions that are not returned in aclCapability.getPermissions()
               - Changed getRepositoryPermissions() to returned all repository permissions not only the exposed ones.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@115688 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-10-30 00:16:33 +00:00
Alan Davis
3434a81b7d Merged 5.1-MNT1 (5.1.0) to HEAD (5.1)
115548 adavis: Merged 5.1.N (5.1.1) to 5.1-MNT1 (5.1.0)
      112342 adavis: 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/HEAD/root@115685 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-10-30 00:16:08 +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
Alan Davis
d00e8e6a83 Merged 5.1-MNT1 (5.1.0) to HEAD (5.1)
115467 adavis: Merged 5.1.N (5.1.1) to 5.1-MNT1 (5.1.0)
      114588 amorarasu: Merged 5.0.N (5.0.3) to 5.1.N (5.1.1)
         114484 amorarasu: Merged V4.2-BUG-FIX (4.2.6) to 5.0.N (5.0.3)
            114312 amorarasu: Merged V4.1-BUG-FIX (4.1.11) to V4.2-BUG-FIX (4.2.6)
               114244 tvalkevych: Merged V4.1.9 (4.1.9.13) to V4.1-BUG-FIX (4.1.11)
                  113716 dhulley: MNT-14911: Fix formatting during bug fix


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@115676 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-10-30 00:11:52 +00:00
Alan Davis
b29ff05f77 Merged 5.1-MNT1 (5.1.0) to HEAD (5.1)
115461 adavis: Merged 5.1.N (5.1.1) to 5.1-MNT1 (5.1.0)
      113729 amorarasu: Merged 5.0.N (5.0.3) to 5.1.N (5.1.1)
         113704 adavis: Fix build error after
            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/HEAD/root@115671 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-10-30 00:10:38 +00:00
Alan Davis
4165e47032 Merged 5.1-MNT1 (5.1.0) to HEAD (5.1)
115460 adavis: Merged 5.1.N (5.1.1) to 5.1-MNT1 (5.1.0)
      113727 amorarasu: 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/HEAD/root@115670 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-10-30 00:10:30 +00:00
Alan Davis
4948a79966 Merged 5.1-MNT1 (5.1.0) to HEAD (5.1)
115455 adavis: Merged 5.1.N (5.1.1) to 5.1-MNT1 (5.1.0)
      113248 adavis: 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/HEAD/root@115665 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-10-30 00:09:47 +00:00
Alan Davis
1bf5fb2b73 Merged 5.1-MNT1 (5.1.0) to HEAD (5.1)
115426 adavis: ACE-4520: Merged 5.1.N (5.1.1) to 5.1-MNT1 (5.1.0)
      << All the MNT-13871 commits at the end of phase 2 testing of 4.2.5 >>
      111899: Merged 5.0.N (5.0.3) to 5.1.N (5.1.0) (PARTIAL MERGE)
         111834: Merged V4.2-BUG-FIX (4.2.6) to 5.0.N (5.0.3)
            111589: Merged V4.1-BUG-FIX (4.1.11) to V4.2-BUG-FIX (4.2.6)
               111531: MNT-13871: Count authorised users as those who've logged in, not total # of person objects
                  -  Added small changes required for compilation of authorization module.,
      111901: Merged 5.0.N (5.0.3) to 5.1.N (5.1.0) (PARTIAL MERGE)
         111836: Merged V4.2-BUG-FIX (4.2.6) to 5.0.N (5.0.3)
            111765: Merged V4.2.5 (4.2.5) to V4.2-BUG-FIX (4.2.6)
               111600: Merged V4.1-BUG-FIX (4.1.11) to PATCHES/V4.2.5 (4.2.5)
                  MNT-13871 : Count authorised users as those who've logged in, not total # of person objects
                     - Extra changes that are required to make authorization module build green.,
      112553: Merged 5.0.N (5.0.3) to 5.1.N (5.1.1)
         112540: Merged V4.2-BUG-FIX (4.2.6) to 5.0.N (5.0.3)
            112447: MNT-13871: Count authorised users as those who've logged in, not total # of person objects
               - Added configuration required to compile authorised-users module.,
      113101: 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,
      113103: Merged 5.0.N (5.0.3) to 5.1.N (5.1.1)
         113036 adavis: Merged V4.2-BUG-FIX (4.2.6) to 5.0.N (5.0.3)
            113030 adavis: Merged V4.2.5 (4.2.5) to V4.2-BUG-FIX (4.2.6)
               113019 amukha: MNT-14862 MNT-13871: [UserAuth] Login via FTP works when the license limit exceed
                  - Corrected the AlfrescoFtpAuthenticator to rollback teh transaction if an exception was thrown.,
      113215: Merged 5.0.N (5.0.3) to 5.1.N (5.1.1)
         113213 adavis: Merged V4.2-BUG-FIX (4.2.6) to 5.0.N (5.0.3) (PARTIAL MERGE)
            113209 adavis: Merged V4.2.5 (4.2.5) to V4.2-BUG-FIX (4.2.6)
               113124: MNT-13871: MNT-14875: The table creation code for authorised-user (MNT-13871) need to be moved back into the main Alfresco code base
                  - Added the scripts to the main code base.
                  - Updated the authorised-users.jar,
               113203: MNT-13871: MNT-14875: The table creation code for authorised-user (MNT-13871) need to be moved back into the main Alfresco code base
                  - Moved the patch to the main code.
                  - Updated the authorised-users.jar
               113128: MNT-14867 (MNT-13871) : [UserAuth] License user limit exceeded by adding users to ALFRESCO_ADMINISTRATORS LDAP group
                  - Updated auhtorised-users jar.,,
      113246: 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,
      113578: MNT-14901 MNT-13871: 4.2.5 User Auth code merged to 5.1.N caused 2 build failures
         - Fixed the test SiteServiceImplTest.testGroupMembership ,
      113647: 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.,
      113935: MNT-13871: Merged 5.0.N (5.0.3) to 5.1.N (5.1.1) (PARTIAL MERGE)
         113924 adavis: Merged V4.2-BUG-FIX (4.2.6) to 5.0.N (5.0.3)
            113914 adavis: Merged V4.2.5 (4.2.5) to V4.2-BUG-FIX (4.2.6)
               113903 gbroadbent: GERMAN: Updated bundle based on EN-rev112938,
      113936: MNT-13871: Merged 5.0.N (5.0.3) to 5.1.N (5.1.1) (PARTIAL MERGE)
         113925 adavis: Merged V4.2-BUG-FIX (4.2.6) to 5.0.N (5.0.3)
            113915 adavis: Merged V4.2.5 (4.2.5) to V4.2-BUG-FIX (4.2.6)
               113904 gbroadbent: SPANISH: Updated bundle based on EN-rev112938,
      113937: MNT-13871: Merged 5.0.N (5.0.3) to 5.1.N (5.1.1) (PARTIAL MERGE)
         113926 adavis: Merged V4.2-BUG-FIX (4.2.6) to 5.0.N (5.0.3)
            113916 adavis: Merged V4.2.5 (4.2.5) to V4.2-BUG-FIX (4.2.6)
               113905 gbroadbent: FRENCH: Updated bundle based on EN-rev112938,
      113939: MNT-13871: Merged 5.0.N (5.0.3) to 5.1.N (5.1.1) (PARTIAL MERGE)
         113927 adavis: Merged V4.2-BUG-FIX (4.2.6) to 5.0.N (5.0.3)
            113917 adavis: Merged V4.2.5 (4.2.5) to V4.2-BUG-FIX (4.2.6)
               113906 gbroadbent: ITALIAN: Updated bundle based on EN-rev112938,
      113940: MNT-13871: Merged 5.0.N (5.0.3) to 5.1.N (5.1.1) (PARTIAL MERGE)
         113928 adavis: Merged V4.2-BUG-FIX (4.2.6) to 5.0.N (5.0.3)
            113918 adavis: Merged V4.2.5 (4.2.5) to V4.2-BUG-FIX (4.2.6)
               113907 gbroadbent: JAPANESE: Updated bundle based on EN-rev112938,
      113941: MNT-13871: Merged 5.0.N (5.0.3) to 5.1.N (5.1.1) (PARTIAL MERGE)
         113929 adavis: Merged V4.2-BUG-FIX (4.2.6) to 5.0.N (5.0.3)
            113919 adavis: Merged V4.2.5 (4.2.5) to V4.2-BUG-FIX (4.2.6)
               113908 gbroadbent: NORWEGIAN Bokmal: Updated bundle based on EN-rev112938,
      113942: MNT-13871: Merged 5.0.N (5.0.3) to 5.1.N (5.1.1) (PARTIAL MERGE)
         113930 adavis: Merged V4.2-BUG-FIX (4.2.6) to 5.0.N (5.0.3)
            113920 adavis: Merged V4.2.5 (4.2.5) to V4.2-BUG-FIX (4.2.6)
               113909 gbroadbent: DUCTH: Updated bundle based on EN-rev112938,
      113943: MNT-13871: Merged 5.0.N (5.0.3) to 5.1.N (5.1.1) (PARTIAL MERGE)
         113931 adavis: Merged V4.2-BUG-FIX (4.2.6) to 5.0.N (5.0.3)
            113921 adavis: Merged V4.2.5 (4.2.5) to V4.2-BUG-FIX (4.2.6)
               113910 gbroadbent: BRAZILIAN PORTUGUESE: Updated bundle based on EN-rev112938,
      113944: MNT-13871: Merged 5.0.N (5.0.3) to 5.1.N (5.1.1) (PARTIAL MERGE)
         113932 adavis: Merged V4.2-BUG-FIX (4.2.6) to 5.0.N (5.0.3)
            113922 adavis: Merged V4.2.5 (4.2.5) to V4.2-BUG-FIX (4.2.6)
               113911 gbroadbent: SIMPLIFIED Chinese: Updated bundle based on EN-rev112938,
      113945: MNT-13871: Merged 5.0.N (5.0.3) to 5.1.N (5.1.1) (PARTIAL MERGE)
         113933 adavis: Merged V4.2-BUG-FIX (4.2.6) to 5.0.N (5.0.3)
            113923 adavis: Merged V4.2.5 (4.2.5) to V4.2-BUG-FIX (4.2.6)
               113912 gbroadbent: RUSSIAN: Updated bundle based on EN-rev112938,
      114046: 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.,
      114589: Merged 5.0.N (5.0.3) to 5.1.N (5.1.1)
         114485 amorarasu: Merged V4.2-BUG-FIX (4.2.6) to 5.0.N (5.0.3)
            114335 amukha: Merged V4.1-BUG-FIX (4.1.11) to V4.2-BUG-FIX (4.2.6)
               114334 amukha: MNT-14984 MNT-13871: Modification to the User Authentication Warning wording.
                  - Changed the warning message.,
      114828: Merged 5.0.N (5.0.3) to 5.1.N (5.1.1)
         114749 rmunteanu: Merged V4.2-BUG-FIX (4.2.6) to 5.0.N (5.0.3)
            114703 amorarasu: Merged V4.2.5 (4.2.5) to V4.2-BUG-FIX (4.2.6)
               114574 gbroadbent: GERMAN: Updated file based on EN-rev114472. Fix for MNT-14984 MNT-13871,
      114829: Merged 5.0.N (5.0.3) to 5.1.N (5.1.1)
         114750 rmunteanu: Merged V4.2-BUG-FIX (4.2.6) to 5.0.N (5.0.3)
            114704 amorarasu: Merged V4.2.5 (4.2.5) to V4.2-BUG-FIX (4.2.6)
               114575 gbroadbent: SPANISH: Updated file based on EN-rev114472. Fix for MNT-14984 MNT-13871,
      114830: Merged 5.0.N (5.0.3) to 5.1.N (5.1.1)
         114751 rmunteanu: Merged V4.2-BUG-FIX (4.2.6) to 5.0.N (5.0.3)
            114705 amorarasu: Merged V4.2.5 (4.2.5) to V4.2-BUG-FIX (4.2.6)
               114576 gbroadbent: FRENCH: Updated file based on EN-rev114472. Fix for MNT-14984 MNT-13871,
      114831: Merged 5.0.N (5.0.3) to 5.1.N (5.1.1)
         114752 rmunteanu: Merged V4.2-BUG-FIX (4.2.6) to 5.0.N (5.0.3)
            114706 amorarasu: Merged V4.2.5 (4.2.5) to V4.2-BUG-FIX (4.2.6)
               114577 gbroadbent: ITALIAN: Updated file based on EN-rev114472. Fix for MNT-14984 MNT-13871,
      114832: Merged 5.0.N (5.0.3) to 5.1.N (5.1.1)
         114753 rmunteanu: Merged V4.2-BUG-FIX (4.2.6) to 5.0.N (5.0.3)
            114708 amorarasu: Merged V4.2.5 (4.2.5) to V4.2-BUG-FIX (4.2.6)
               114578 gbroadbent: JAPANESE: Updated file based on EN-rev114472. Fix for MNT-14984 MNT-13871,
      114833: Merged 5.0.N (5.0.3) to 5.1.N (5.1.1)
         114754 rmunteanu: Merged V4.2-BUG-FIX (4.2.6) to 5.0.N (5.0.3)
            114709 amorarasu: Merged V4.2.5 (4.2.5) to V4.2-BUG-FIX (4.2.6)
               114579 gbroadbent: DUTCH: Updated file based on EN-rev114472. Fix for MNT-14984 MNT-13871,
      114834: Merged 5.0.N (5.0.3) to 5.1.N (5.1.1)
         114755 rmunteanu: Merged V4.2-BUG-FIX (4.2.6) to 5.0.N (5.0.3)
            114710 amorarasu: Merged V4.2.5 (4.2.5) to V4.2-BUG-FIX (4.2.6)
               114580 gbroadbent: RUSSIAN: Updated file based on EN-rev114472. Fix for MNT-14984 MNT-13871,
      114835: Merged 5.0.N (5.0.3) to 5.1.N (5.1.1)
         114756 rmunteanu: Merged V4.2-BUG-FIX (4.2.6) to 5.0.N (5.0.3)
            114711 amorarasu: Merged V4.2.5 (4.2.5) to V4.2-BUG-FIX (4.2.6)
               114593 gbroadbent: SIMP CHINESE: Updated file based on EN-rev114472. Fix for MNT-14984 MNT-13871,
      114836: Merged 5.0.N (5.0.3) to 5.1.N (5.1.1)
         114757 rmunteanu: Merged V4.2-BUG-FIX (4.2.6) to 5.0.N (5.0.3)
            114712 amorarasu: Merged V4.2.5 (4.2.5) to V4.2-BUG-FIX (4.2.6)
               114594 gbroadbent: NORWEGIAN Bokmal: Updated file based on EN-rev114472. Fix for MNT-14984 MNT-13871


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@115664 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-10-30 00:09:37 +00:00
Derek Hulley
b6aa21f5f0 CachingContentStore handles "spoof://" content URLs (ACE-4516:DataLoad file spoofing fails with S3 connector)
- Any store can now be used with the spoofed data load by wrapping it in the CachingContentStore (see S3 Connector)
 - Will work with S3 Connector against Alfresco 5.1


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@115382 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-10-27 18:28:04 +00:00
Derek Hulley
1876a85ba7 More formatting during investigation of ACE-4510
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@115346 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-10-27 11:10:13 +00:00
Gavin Cornwell
1043ecfdb4 ACE-4465: PolicyComponent is part of the public API for Spring injection, but getter is not available via ServiceRegistry
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@114774 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-10-20 11:28:32 +00:00
David Webster
dbf5134422 ACE-4174: Add concept of hidden channels to ChannelService and mark old core social publishing channels as hidden by default.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@114759 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-10-20 09:11:29 +00:00
Steven Glover
90512a33c7 ACE-4436 "[Upgrade]Wrong username displayed for the site's creator name after upgrade"
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@114730 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-10-19 19:55:45 +00:00
Steven Glover
66157b10db ACE-3542 "server.maxusers count does not work correctly - TicketCountAll can be greater MaxUsers"
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@114666 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-10-19 11:10:00 +00:00
Andrew Hind
d79d0def14 Fix for ACE-4420 SOLR 4 - sharded - rename and move operations will not update descendants and add incorrect nodes to the shard
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@114654 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-10-19 09:24:52 +00:00
Kevin Roast
54257dfdb6 ACE-4474 - ImageMagick typo in the Admin Console Summary
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@114653 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-10-19 09:15:52 +00:00
Jan Vonka
30f8e49239 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/HEAD/root@114219 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-10-12 22:15:03 +00:00
Andrew Hind
fd740adefc Fix for ACE-4417 Search by Aspect within a site returns results from all sites
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@114218 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-10-12 20:41:01 +00:00
Andrew Hind
1af13154bd Fix for ACE-4412 Dynamic shard registration should be an enterprise only feature
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@114044 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-10-09 11:30:47 +00:00
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
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
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
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