Commit Graph

5555 Commits

Author SHA1 Message Date
Tatyana Valkevych
5cd7deadec Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
104023: Merged 5.0.N (5.0.2) to HEAD-BUG-FIX (5.1/Cloud)
      103943: Merged V4.2-BUG-FIX (4.2.5) to 5.0.N (5.0.2)
         103908: Merged DEV to V4.2-BUG-FIX (4.2.5)
            103901 : MNT-13575 : Incorrect behaviour in org.alfresco.rep.i18n.MessageServiceImpl.java
               - Fixed getMessage(messageKey,locale) method according to the locale being passed
               - Added test


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@104118 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-05-13 16:23:04 +00:00
Tatyana Valkevych
192e5353c0 Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
104022: Merged 5.0.N (5.0.2) to HEAD-BUG-FIX (5.1/Cloud)
      103942: Merged V4.2-BUG-FIX (4.2.5) to 5.0.N (5.0.2)
         103858: Merged V4.1-BUG-FIX (4.1.11) to V4.2-BUG-FIX (4.2.5)
            103770: Merged V4.1.10 (4.1.10) to V4.1-BUG-FIX (4.1.11)
               103711: Merged DEV to V4.1.10-PATCHES
                  103047: MNT-13839: [CMIS Webservices] "invalidArgument: Version Series does not exist" error appears when creating any content
                   - Use versionSeriesId when objectId is null
                   - Return versionSeries for PWC if objectId is null and provided node has working copy. 


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@104117 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-05-13 16:21:43 +00:00
Tatyana Valkevych
dee9fdcf00 Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
103947: Merged 5.0.N (5.0.2) to HEAD-BUG-FIX (5.1/Cloud)
      103926: Merged NESS/5.0.N-2015_03_23 (5.0.2) to 5.0.N (5.0.2)
         103902: MNT-13205 - hide the cancel exception from the log, small refactoring of the exception logging


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@104034 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-05-12 15:32:40 +00:00
Tatyana Valkevych
04916eb008 Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
103946: Merged 5.0.N (5.0.2) to HEAD-BUG-FIX (5.1/Cloud)
      103861: Merged V4.2-BUG-FIX (4.2.5) to 5.0.N (5.0.2)
         103837: MNT-13867: Merged V4.1-BUG-FIX to V4.2-BUG-FIX (4.2.5).
            101406: MNT-12454: Deletion behaviour of LDAP user does NOT work as documented.
                       - was added synchronization.syncDelete property.
            101558: MNT-12454: Deletion behaviour of LDAP user does NOT work as documented.
                       - If allowDeletions=true then authority need move to AuthorityService.ZONE_AUTH_ALFRESCO. ChainingUserRegistrySynchronizerTest.testForcedUpdateWithoutDeletions test was corrected. 


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@104033 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-05-12 15:32:27 +00:00
Tatyana Valkevych
7280363ce8 Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
103945: Merged 5.0.N (5.0.2) to HEAD-BUG-FIX (5.1/Cloud)
      103860: Merged V4.2-BUG-FIX (4.2.5) to 5.0.N (5.0.2)
         103793: MNT-12462: Merged DEV to V4.2-BUG-FIX (4.2.5)
            103764: MNT-12462: Can no space restriction on Alfresco installation directory be now removed?
               - Encode spaces in OpenOffice URI


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@104032 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-05-12 15:30:41 +00:00
Alan Davis
011d0a8fa9 Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
103533: Merged 5.0.N (5.0.2) to HEAD-BUG-FIX (5.1/Cloud)
      103466: Merged V4.2-BUG-FIX (4.2.5) to 5.0.N (5.0.2)
         103256: MNT-13682 Add multilanguage support to FileExistsException.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@103640 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-05-02 07:53:07 +00:00
Alan Davis
24a50408e5 Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
103506: Replace 'updateContentUrl' with more useful 'getOrCreateContentUrl'


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@103634 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-05-02 07:46:47 +00:00
Alan Davis
73bea317f5 Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
103503: Rearrange protected methods in line with previous layout


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@103633 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-05-02 07:46:32 +00:00
Alan Davis
fba0e07a62 Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
103441: Merged 5.0.N (5.0.2) to HEAD-BUG-FIX (5.1/Cloud)
      103246: Merged V4.2-BUG-FIX (4.2.5) to 5.0.N (5.0.2)
         103035: Merged NESS/4.2.N-2015_03_12 (4.2.5) to V4.2-BUG-FIX (4.2.5)
            102240: MNT-13531: EMLTransformer ignoring multipart emails
               - used htmlparser to extract text from html mail part
               - added test to check if html special chars appear in transformation result
            102375: MNT-13531: EMLTransformer ignoring multipart emails
               - use plain/text representation if present, prior to html representation on multipart/alternative parts


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@103625 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-05-02 07:44:41 +00:00
Alan Davis
c9d5efcef6 Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
103439: Fix ACE-3948: BM-0004: Factor out select on alf_content_url table during file creation
    - A plain file creation had 9 inserts and 1 select ... now it only has 9 inserts.
    - Switch to an optimistic insert during alf_content_url creation
    - Operations that reuse content URLs (copy, version) now get the redundant statement in the form of a snapshot-wrapped insert


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@103623 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-05-02 07:44:14 +00:00
Alan Davis
2758df8308 Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
103438: Working towards a fix for ACE-3948: BM-0004: Factor out select on alf_content_url table during file creation
    - Complement the 'getOrCreate' EntityCache calls with 'createOrGet'
    - Cleanup of ContentDataDAOImpl code before further changes: tabs, @Override, unused code, etc


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@103622 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-05-02 07:44:01 +00:00
Alan Davis
93ba7015d1 Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
103437: Clean up empty Javadoc tags


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@103621 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-05-02 07:43:49 +00:00
Alan Davis
efbc3648d0 Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
103436: Use newer API package for TransactionListenerAdapter


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@103620 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-05-02 07:43:36 +00:00
Alan Davis
62bcdd54f9 Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
102879: Merged 5.0.N (5.0.2) to HEAD-BUG-FIX (5.1/Cloud)
      102769: MNT-13947: Merged DEV to 5.0.N (5.0.2)
         102637: MNT-13947: Java API: ServiceRegistry has incorrect bean ids
            - Fix ServiceRegistry to return beans by correct ids. Add unit test that checks ServiceRegistry getters.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@103571 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-05-02 07:32:28 +00:00
Alan Davis
f38566ccf1 Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
102712: Merged 5.0.N (5.0.2) to HEAD-BUG-FIX (5.1/Cloud)
      102493: Merged V4.2-BUG-FIX (4.2.5) to 5.0.N (5.0.2)
         102367: Merged DEV to V4.2-BUG-FIX (4.2.5).
            101783: MNT-13625: Not all users receive notification emails.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@103542 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-05-02 07:18:49 +00:00
Alan Davis
69e180c4dc Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
102709: Merged 5.0.N (5.0.2) to HEAD-BUG-FIX (5.1/Cloud)
      102490: Merged V4.2-BUG-FIX (4.2.5) to 5.0.N (5.0.2)
         102292: Merged DEV to V4.2-BUG-FIX (4.2.5)
            101892: MNT-13670 : Description is not displayed for content type D:lnk:link
               - Added mapping cmis:description for Cmis 1.0. 


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@103539 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-05-02 07:18:07 +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
Alan Davis
800f4c1eea Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
102706: Merged 5.0.N (5.0.2) to HEAD-BUG-FIX (5.1/Cloud)
      102487: Merged V4.2-BUG-FIX (4.2.5) to 5.0.N (5.0.2)
         101885: Merged DEV to V4.2-BUG-FIX (4.2.5)
            101133: MNT-13531: EMLTransformer ignoring multipart emails
               - updated transfer in order to identify multiparts and correctly process them
               - added tests


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@103536 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-05-02 07:17:26 +00:00
Alan Davis
ed5f1f4803 Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
102258: Support for     ACE-1021 SOLR 4 - Sharding/Replication/Cluster/CloudACE-3827    SOLR 4 - Shard based on ACL hash
   - the code to support index sharding by ACL ID and query execution


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@102534 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-04-24 11:02:58 +00:00
Tatyana Valkevych
0fd57371bf Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
102238: Merged 5.0.N (5.0.2) to HEAD-BUG-FIX (5.1/Cloud)
      102178: Merged V4.2-BUG-FIX (4.2.5) to 5.0.N (5.0.2)
         102050: Merged DEV to V4.2-BUG-FIX (4.2.5)
            101782: MNT-13751: MNT-12196 may corrupt node property values when auditing pre-call data 
               - Changes provided by customer and unit test.
            102011: MNT-13751: MNT-12196 may corrupt node property values when auditing pre-call data
               - Corrected unit test.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@102285 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-04-22 09:20:12 +00:00
Tatyana Valkevych
c5d15c4146 Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
102180: Merged 5.0.N (5.0.2) to HEAD-BUG-FIX (5.1/Cloud)
      102046: Merged V4.2-BUG-FIX (4.2.5) to 5.0.N (5.0.2)
         101946: Merged DEV to V4.2-BUG-FIX (4.2.5)
            101416: MNT-13781: ModuleService is not available via a ServiceRegistry getter
            101888: checkstyle fix


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@102244 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-04-21 13:29:39 +00:00
Tatyana Valkevych
761a92b2cc Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
102053: Merged 5.0.N (5.0.2) to HEAD-BUG-FIX (5.1/Cloud)
      101917: Merged DEV to 5.0.N (5.0.2)
         101898 : MNT-13826: Activiti engine throwing NPE when changing a long String (>4000 characters) to a normal String (<4000 characters))
            - Replaced deprecated methods


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@102199 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-04-20 14:12:13 +00:00
Tatyana Valkevych
9509f5b6af Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
101930: Merged 5.0.N (5.0.2) to HEAD-BUG-FIX (5.1/Cloud)
      101819: Merged V4.2-BUG-FIX (4.2.5) to 5.0.N (5.0.2)
         101764: MNT-13697: Merged V4.2.4 (4.2.4.7)  to V4.2-BUG-FIX (4.2.5)
            101112: MNT-13736 : CLONE - bad LDAP connection management: connections maintained IDLE unnecessarily
               - Added possibility to configure ldap connection pool parameters through the standard alfresco properties file.
               - Pooling may be disabled completely.
               - Updated logic of LDAPUserRegistry.java for better handling of unused objects (mainly by calling close() method).,
            101119: MNT-13736 : CLONE - bad LDAP connection management: connections maintained IDLE unnecessarily
               - Corrected the way of applying pool properties. They should be set as system properties (not environment!).


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@102072 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-04-17 09:57:42 +00:00
Tatyana Valkevych
6a2ca9fd73 Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
101750: Merged 5.0.N (5.0.2) to HEAD-BUG-FIX (5.1/Cloud)
      101639: Merged V4.2-BUG-FIX (4.2.5) to 5.0.N (5.0.2)
         101402: MNT-10032 : CMIS: "delete" action with unchecked "delete all version" checkbox.
            - Revert document to previous version on deleteObject with AllVersions unchecked.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@101852 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-04-14 16:13:25 +00:00
Tatyana Valkevych
c50e23e065 Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
101749: Merged 5.0.N (5.0.2) to HEAD-BUG-FIX (5.1/Cloud)
      101638: Merged V4.2-BUG-FIX (4.2.5) to 5.0.N (5.0.2)
         101401: Merged V4.1-BUG-FIX (4.1.11) to V4.2-BUG-FIX (4.2.5)
            101241: Merged DEV to V4.1-BUG-FIX (4.1.11)
               101120 : MNT-13769: 'org.alfresco.authenticationTransactionalCache' is full (100)
                  - Logging level was changed


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@101851 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-04-14 16:12:54 +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
Tatyana Valkevych
c6ad302873 Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
101658: Merged 5.0.N (5.0.2) to HEAD-BUG-FIX (5.1/Cloud)
      101404: Merged V4.2-BUG-FIX (4.2.5) to 5.0.N (5.0.2)
         101273: Merged DEV to V4.2-GUB-FIX (4.2.5)
            100792 : MNT-13722 : CLONE - Ghost versions when Document is created with CheckinType CHECKOUT
               - Added init-method for CMISConnector. Test is added,
      101597: Merged DEV to 5.0.N (5.0.2)
         101560 : MNT-13813 : CLONE - Ghost versions when Document is created with CheckinType CHECKOUT
            - Fix to test failure


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@101705 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-04-10 21:18:10 +00:00
Tatyana Valkevych
1ad8293a8c Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
101651: Merged 5.0.N (5.0.2) to HEAD-BUG-FIX (5.1/Cloud)
      101403: Merged V4.2-BUG-FIX (4.2.5) to 5.0.N (5.0.2)
         101245: Merged V4.1-BUG-FIX (4.1.11) to V4.2-BUG-FIX (4.2.5)
            101157: Merged V4.1.10 (4.1.10) to V4.1-BUG-FIX (4.1.11)
               101099: MNT-13607: Merged DEV to PATCHES/V4.1.10
                  101029: MNT-13607: Sending two emails to inbound server at the same time & same subject causes error
                     - Rethrow DuplicateChildNodeNameException which occurred during message processing as ConcurrencyFailureException to force retry. Add unit test for case.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@101698 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-04-10 21:05:36 +00:00
Tatyana Valkevych
f18d18099f Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
101647: Merged 5.0.N (5.0.2) to HEAD-BUG-FIX (5.1/Cloud)
      101286: Merged NESS/5.0.N-2015_03_23 (5.0.2) to 5.0.N (5.0.2)
         100798: MNT-13628 : No matching ACE found to remove" error when removing all the ACLs with removeAcl method and 1.1 Browser implementation
            - Filter inherited permissions before try to remove them
            - Added unit test for case using jetty


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@101696 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-04-10 21:03:26 +00:00
Tatyana Valkevych
97be1b1243 Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
101643: Merged 5.0.N (5.0.2) to HEAD-BUG-FIX (5.1/Cloud)
      101252: Merged V4.2-BUG-FIX (4.2.5) to 5.0.N (5.0.2)
         101207: Merged DEV to V4.2-BUG-FIX (4.2.5)
            100710: MNT-13479 : Attempting to start IMAP service on port 143 from non-priveledged user fails quietly.
               - added code to throw exception if imap server fails at startup


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@101692 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-04-10 20:59:49 +00:00
Tatyana Valkevych
fa2b5569db Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
101332: Merge RA-SPRINT2 to HEAD-BUG-FIX (5.1)
      100713: RA-55 - Move Slingshot JS Extension to Share enablement project


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@101473 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-04-08 16:24:03 +00:00
Tatyana Valkevych
7252dc8f76 Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
101331: Merge RA-SPRINT2 to HEAD-BUG-FIX (5.1)
      100711: RA-86, RA-87 & RA-88 (sub-tasks of RA-56): Move wiki service back-end classes to share services project.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@101472 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-04-08 16:23:14 +00:00
Alan Davis
9235a87b44 Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
101037: ALF-21310


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@101065 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-04-01 15:18:51 +00:00
Alan Davis
15b8c8f625 Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
100991: Merged 5.0.N (5.0.2) to HEAD-BUG-FIX (5.1/Cloud)
      100837: Fix another merge issue as a result of a re factor that has taken place in 5.0
         Merged V4.2-BUG-FIX (4.2.5) to 5.0.N (5.0.2)
            100184: Merged V4.1-BUG-FIX (4.1.10) to V4.2-BUG-FIX (4.2.5)
               100131 : Merged DEV to V4.1-BUG-FIX (4.1.10)
                  99521 : MNT-9088 : Ghost versions when Document is created with CheckinType CHECKOUT
                     - Don't include PWC in a version series
                  99824 : MNT-9088 : Ghost versions when Document is created with CheckinType CHECKOUT
                     - Return PWC as a part of version series. Fixes to pass TCK


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@101006 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-04-01 01:28:15 +00:00
Alan Davis
f70dc05311 Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
100990: Merged 5.0.N (5.0.2) to HEAD-BUG-FIX (5.1/Cloud)
      100834: Merged V4.2-BUG-FIX (4.2.5) to 5.0.N (5.0.2)
         100784: Merged DEV to V4.2-BUG-FIX (4.2.5)
            100732: MNT-13655 : Just first keyword of the IPTC keywords list is extracted as metadata and put into description field of an image
               - Added special way for handling multi-valued meta-data properties retrieved from parser.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@101005 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-04-01 01:27:45 +00:00
Alan Davis
fd90fbf2a7 Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
100988: Merged 5.0.N (5.0.2) to HEAD-BUG-FIX (5.1/Cloud)
      100831: Merged V4.2-BUG-FIX (4.2.5) to 5.0.N (5.0.2)
         100731: MNT-13682 Reverting 100341 which caused a test failure.
         The failure was DocumentDetailsPageTest.addLikeDislike and it failed in
         https://bamboo.alfresco.com/bamboo/browse/ALF-ENTERPRISEV42BUGFIX-912/


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@101003 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-04-01 01:26:40 +00:00
Alan Davis
a0874952a2 Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
100985: Merged 5.0.N (5.0.2) to HEAD-BUG-FIX (5.1/Cloud)
      100828: Merged V4.2-BUG-FIX (4.2.5) to 5.0.N (5.0.2)
         100341: MNT-13682 Add multilanguage support to FileExistsException.
         +review CR


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@101000 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-04-01 01:25:23 +00:00
Alan Davis
6dcac7796e Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
100983: Merged 5.0.N (5.0.2) to HEAD-BUG-FIX (5.1/Cloud)
      100824: Merged V4.2-BUG-FIX (4.2.5) to 5.0.N (5.0.2)
         100184: Merged V4.1-BUG-FIX (4.1.10) to V4.2-BUG-FIX (4.2.5)
            100131 : Merged DEV to V4.1-BUG-FIX (4.1.10)
               99521 : MNT-9088 : Ghost versions when Document is created with CheckinType CHECKOUT
                  - Don't include PWC in a version series
               99824 : MNT-9088 : Ghost versions when Document is created with CheckinType CHECKOUT
                  - Return PWC as a part of version series. Fixes to pass TCK


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@100998 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-04-01 01:24:34 +00:00
Alan Davis
448868345c Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
100870: Merged 5.0.N (5.0.2) to HEAD-BUG-FIX (5.1/Cloud)
      100832: Merged V4.2-BUG-FIX (4.2.5) to 5.0.N (5.0.2)
         100751: MNT-13732 Merged CLOUD39 (Cloud 39.5) to V4.2-BUG-FIX (4.2.5)
            100220,100719: MNT-13731 Add NodeRef blacklist to transformation config
               - fix test failure in enterprise build (debug now included a noderef)


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@100940 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-03-31 23:22:30 +00:00
Alan Davis
9233e37c9d Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
100866: Merged 5.0.N (5.0.2) to HEAD-BUG-FIX (5.1/Cloud)
      100808: Fix compile error as a result of:
         Merged V4.2-BUG-FIX (4.2.5) to 5.0.N (5.0.2)
            99878: Merged V4.1-BUG-FIX (4.1.10) to V4.2-BUG-FIX (4.2.5)
               99807: Merged DEV to V4.1-BUG-FIX (4.1.10)
                  99672: MNT-12150 : Centera Connector : isContentUrlSupported is returning false for the Centera store
                     - Unit test to demonstrate issue was implemented.
                     - Previously suggested fix was also merged.
                  99781: MNT-12150 : Centera Connector : isContentUrlSupported is returning false for the Centera store
                     - Updated javadoc for new method in ContentDataDAO.
                     - Corrected logic of eager cleaner. If store is read-only content should not be deleted.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@100936 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-03-31 23:21:05 +00:00
Alan Davis
676b681092 Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
100861: Merged 5.0.N (5.0.2) to HEAD-BUG-FIX (5.1/Cloud)
      100772: Merged V4.2-BUG-FIX (4.2.5) to 5.0.N (5.0.2)
         100260: MNT-13722 : CLONE - Ghost versions when Document is created with CheckinType CHECKOUT
            - Fix for tests failures


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@100931 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-03-31 23:19:17 +00:00
Alan Davis
8a6d7da70e Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
100858: Merged 5.0.N (5.0.2) to HEAD-BUG-FIX (5.1/Cloud)
      100769: Merged V4.2-BUG-FIX (4.2.5) to 5.0.N (5.0.2)
         100158: Merged DEV (4.2.5) to V4.2-BUG-FIX (4.2.5)
            100074: MNT-13579: IMAP: Sync doesn't work anymore after a Site which is already marked as IMAP favorite got deleted in Share.
               - Added a check to handle non-existent sites.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@100928 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-03-31 23:18:14 +00:00
Alan Davis
6c78af5165 Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
100852: Merged 5.0.N (5.0.2) to HEAD-BUG-FIX (5.1/Cloud)
      100763: Merged V4.2-BUG-FIX (4.2.5) to 5.0.N (5.0.2)
         100041: MNT-13692: Reverse Merge V4.2-BUG-FIX (4.2.5)
            <<Merge 99879 caused failures on build #898>>
            99877: Merged V4.1-BUG-FIX (4.1.10) to V4.2-BUG-FIX (4.2.5)
               99796: MNT-10999: CMIS: Version is not increased after deleting Content Stream 


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@100922 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-03-31 23:16:06 +00:00
Alan Davis
0fbc74c6fc Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
100846: Merged 5.0.N (5.0.2) to HEAD-BUG-FIX (5.1/Cloud)
      100757: Merged V4.2-BUG-FIX (4.2.5) to 5.0.N (5.0.2)
         99879: Merged V4.1-BUG-FIX (4.1.10) to V4.2-BUG-FIX (4.2.5)
            99811: Merged DEV to V4.1-BUG-FIX (4.1.10)
               99257 : MNT-9557 : VersioningService.getAllVersions() does not include all applied aspects in the returned extension data
                  - Return a current node as head version in version series
               99649,99789 : MNT-9557 : VersioningService.getAllVersions() does not include all applied aspects in the returned extension data
                  - Test for the fix


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@100916 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-03-31 23:13:54 +00:00
Alan Davis
17e4c1b55e Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
100845: Merged 5.0.N (5.0.2) to HEAD-BUG-FIX (5.1/Cloud)
      100756: Merged V4.2-BUG-FIX (4.2.5) to 5.0.N (5.0.2)
         99878: Merged V4.1-BUG-FIX (4.1.10) to V4.2-BUG-FIX (4.2.5)
            99807: Merged DEV to V4.1-BUG-FIX (4.1.10)
               99672: MNT-12150 : Centera Connector : isContentUrlSupported is returning false for the Centera store
                  - Unit test to demonstrate issue was implemented.
                  - Previously suggested fix was also merged.
               99781: MNT-12150 : Centera Connector : isContentUrlSupported is returning false for the Centera store
                  - Updated javadoc for new method in ContentDataDAO.
                  - Corrected logic of eager cleaner. If store is read-only content should not be deleted.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@100915 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-03-31 23:13:31 +00:00
Alan Davis
40fc727b0d Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
100844: Merged 5.0.N (5.0.2) to HEAD-BUG-FIX (5.1/Cloud)
      100755: Merged V4.2-BUG-FIX (4.2.5) to 5.0.N (5.0.2)
         99877: Merged V4.1-BUG-FIX (4.1.10) to V4.2-BUG-FIX (4.2.5)
            99796: MNT-10999: CMIS: Version is not increased after deleting Content Stream 


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@100914 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-03-31 23:13:09 +00:00
Alan Davis
3086f8d178 Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
100843: Merged 5.0.N (5.0.2) to HEAD-BUG-FIX (5.1/Cloud) (PARTIAL MERGE)
      100754: Merged V4.2-BUG-FIX (4.2.5) to 5.0.N (5.0.2)
         99876: Merged V4.1-BUG-FIX (4.1.10) to V4.2-BUG-FIX (4.2.5)
            99778: Merged DEV to V4.1-BUG-FIX (4.1.10)
               81615 : MNT-12101: Workflow loses the line feed in the description
                  - Ignoring of trim for MLValues
               81620 : MNT-12101: Workflow loses the line feed in the description
                  - Added a property to show value with line breaks


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@100913 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-03-31 23:12:47 +00:00
Alan Davis
3054ca3ebc Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
100265: Merged 5.0.N (5.0.2) to HEAD-BUG-FIX (5.1/Cloud)
      100257: Reverse Merge 5.0.N (5.0.2)
         << Cause 4 build errors >>
         100165: Merged NESS/5.0.N-2015_03_23 (5.0.2) to 5.0.N (5.0.2)
            99977: MNT-13628 : No matching ACE found to remove" error when removing all the ACLs with removeAcl method and 1.1 Browser implementation
               - Filter inherited permissions before try to remove them
               - Added unit test for case


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@100574 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-03-27 23:16:14 +00:00
Alan Davis
e19772b892 Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
100261: Merged 5.0.N (5.0.2) to HEAD-BUG-FIX (5.1/Cloud)
      100252: Merged 5.0.1 (5.0.1) to 5.0.N (5.0.2)
         99925: MNT-13677:  Added model validation to make sure the model cannot be deleted/deactivated when its types/aspects are parent to other models� types/aspects.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@100570 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-03-27 23:15:36 +00:00
Alan Davis
e72f8ed937 Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
100243: Merged 5.0.N (5.0.2) to HEAD-BUG-FIX (5.1/Cloud)
      100165: Merged NESS/5.0.N-2015_03_23 (5.0.2) to 5.0.N (5.0.2)
         99977: MNT-13628 : No matching ACE found to remove" error when removing all the ACLs with removeAcl method and 1.1 Browser implementation
            - Filter inherited permissions before try to remove them
            - Added unit test for case


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@100566 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-03-27 23:14:56 +00:00