Commit Graph

5577 Commits

Author SHA1 Message Date
Tatyana Valkevych
96e195b9fb Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
105524: Merged 5.0.N (5.0.3) to HEAD-BUG-FIX (5.1/Cloud)
      105458: Merged V4.2-BUG-FIX (4.2.5) to 5.0.N (5.0.3)
         105368: Merged DEV to V4.2-BUG-FIX (4.2.5)
            105328: MNT-14021 : Request to optimize db query performance when retrieving the trashcan item
               - applied limit to "select_GetArchivedNodesCannedQuery" query to optimize the general performance of the trashcan


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@105587 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-06-05 11:01:39 +00:00
Tatyana Valkevych
d97044ae94 Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
105522: Merged 5.0.N (5.0.3) to HEAD-BUG-FIX (5.1/Cloud)
      105401: Merged V4.2-BUG-FIX (4.2.5) to 5.0.N (5.0.3) (PARTIAL MERGE)
         105195: Merged V4.1-BUG-FIX (4.1.11) to V4.2-BUG-FIX (4.2.5)
            105130: Merged DEV to V4.1-BUG-FIX (4.1.11)
               MNT-14072: "Unable to add document to publish queue" facebook channel
                  - Updated end point from http to https for publishing.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@105586 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-06-05 11:01:18 +00:00
Alan Davis
d07aeaaa4d Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
105374: Merged 5.0.N (5.0.3) to HEAD-BUG-FIX (5.1/Cloud)
      105132: Merged V4.2-BUG-FIX (4.2.5) to 5.0.N (5.0.3)
         104888: Merged DEV to V4.2-BUG-FIX (4.2.5)
            104492: MNT-10962: Versioning for cmis:document not working initially
               - Use default values in the content model for autoVersion.
               - Test to ensure that version properties for node created via CMIS are set wrt contentModel.
               - TCK is now run with autoVersion=false.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@105408 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-06-03 09:00:06 +00:00
Alan Davis
68d6c42d3f Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
104861: Merged 5.0.N (5.0.2) to HEAD-BUG-FIX (5.1/Cloud)
      104813: Merged V4.2-BUG-FIX (4.2.5) to 5.0.N (5.0.2)
         104739: Merged NESS/4.2.N-2015_04_30 (4.2.5) to V4.2-BUG-FIX (4.2.5)
            104570: MNT-14057 : Are there authentication issues with FSTR?
               - Enabled preemptive authentication through Spring injection


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@104884 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-05-26 21:55:22 +00:00
Alan Davis
2429784d6d Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
104860: Merged 5.0.N (5.0.2) to HEAD-BUG-FIX (5.1/Cloud)
      104812: Merged V4.2-BUG-FIX (4.2.5) to 5.0.N (5.0.2)
         104736: Merged DEV to V4.2-BUG-FIX (4.2.5).
            103329: MNT-13907: CMIS Bulk Update Properties will fail if number of worker threads is 1.


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


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@104876 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-05-26 21:54:03 +00:00
Alan Davis
367182a9fb Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
104814: Merged 5.0.N (5.0.2) to HEAD-BUG-FIX (5.1/Cloud)
      104747: MNT-10914: Merged V4.2-BUG-FIX (4.2.5) to 5.0.N (5.0.2)
         104737: Merged DEV to V4.2-BUG-FIX (4.2.5)
            104724: MNT-10914: Alfresco 4.2.d categories corrupting in share
               - Ignore rule execution for the nodes of cm:failedThumbnail type. Add patch that removes cm:generalclassifiable aspect, associated properties for the nodes of cm:failedThumbnail type and triggers reindex. Add unit test.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@104872 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-05-26 21:53:29 +00:00
Alan Davis
44f920c025 Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
104571: Merged 5.0.N (5.0.2) to HEAD-BUG-FIX (5.1/Cloud)
      104493: MNT-14062: Merged V4.2-BUG-FIX (4.2.5) to 5.0.N (5.0.2)
         104334: MNT-13768: Merged DEV to V4.2-BUG-FIX (4.2.5)
            104284: MNT-13768: Under some circumstances that number of PATH indexed in Lucene increases a lot leading to out of memory and memory over consumption.
               - Move logic that ignores indexing to separate beans. Do not regenerate pathes by ADMLuceneIndexerImpl for nodes with types to ignore.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@104639 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-05-20 12:05:38 +00:00
Alan Davis
681ff6b9c4 Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
104506: Merged 5.0.N (5.0.2) to HEAD-BUG-FIX (5.1/Cloud)
      104357: Merged V4.2-BUG-FIX (4.2.5) to 5.0.N (5.0.2)
         104292: Merged DEV to V4.2-BUG-FIX (4.2.5)
            104235: MNT-13951 : Please use LinkedHashMap in EnumParameterConstraint.java to take control on selectone.ftl's dropdown list options order
               - Changed collection type from HashMap to LinkedHashMap.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@104637 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-05-20 12:00:11 +00:00
Alan Davis
5cdfb8b2f7 Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
104503: Merged 5.0.N (5.0.2) to HEAD-BUG-FIX (5.1/Cloud)
      104354: Merged V4.2-BUG-FIX (4.2.5) to 5.0.N (5.0.2)
         104274: Merged DEV (4.2.5) to V4.2-BUG-FIX (4.2.5)
            102794: MNT-8678 : call to guessMimetype() on a node that has no content creates a content property
               - add check for empty content before saving a node


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@104627 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-05-20 10:38:05 +00:00
Alan Davis
1a2b705c73 Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
104500: Merged 5.0.N (5.0.2) to HEAD-BUG-FIX (5.1/Cloud)
      104340: Merged DEV to 5.0.N (5.0.2)
         101620: MNT-13812: Creating a rule on Repository > Data Dictionary > Solr Facets Space breaks the Search Manager page
            - Check that child has facetField type, before getting properties.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@104611 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-05-20 09:56:47 +00:00
Alan Davis
b9f6063646 Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
104498: Merged 5.0.N (5.0.2) to HEAD-BUG-FIX (5.1/Cloud)
      104338: Merged DEV to 5.0.N (5.0.2)
         103169: MNT-13949: Association's set of a document shall be overwritten by a user who doesn't have read permissions to all target locations of associated content
            - Target content will be checked for read permission to avoid unexpected association removal.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@104609 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-05-20 09:56:24 +00:00
Alan Davis
9552852b91 Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
104496: Merged 5.0.N (5.0.2) to HEAD-BUG-FIX (5.1/Cloud)
      104336: Merged NESS/5.0.N-2015_03_23 (5.0.2) to 5.0.N (5.0.2)
         103763: MNT-13920 - rewrite the image dimension properties if there is any exif dimensions information available
         104332: MNT-13920 - code changes based on review, improved javadoc and slight modifications on the extract size method


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@104607 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-05-20 09:54:36 +00:00
Tatyana Valkevych
7bdcab15bc Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
104368: Merged 5.0.N (5.0.2) to HEAD-BUG-FIX (5.1/Cloud)
      104301: Merged DEV to 5.0.N (5.0.2)
         104289: MNT-14052 : CLONE - <filter-activities> config doesn't work in share
                    -added method to set the ignored-types pots


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@104524 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-05-19 15:14:18 +00:00
Tatyana Valkevych
79e65e0023 Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
104367: Merged 5.0.N (5.0.2) to HEAD-BUG-FIX (5.1/Cloud)
      104293: Merged DEV to 5.0.N (5.0.2)
         104276: MNT-14012 : Setting <display-facets>false</display-facets> throws InvalidQNameException
            - skip empty facet names on search queries 


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@104523 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-05-19 15:14:02 +00:00
Tatyana Valkevych
1baa77ab48 Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
104361: Merged 5.0.N (5.0.2) to HEAD-BUG-FIX (5.1/Cloud)
      104249: Merged V4.2-BUG-FIX (4.2.5) to 5.0.N (5.0.2)
         104150: Merged DEV (4.2.5) to V4.2-BUG-FIX (4.2.5)
            104089: MNT-13577: Incorrect site handling in Outlook client by Alfresco Administrator and Site Manager
               - Added unmovable aspect to restrict move of nodes. Unmovable aspect added to st:site type.
               - Added JUnit test.
               - Added patch for the fix.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@104517 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-05-19 15:12:43 +00:00
Tatyana Valkevych
871332a83a Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
104271: Fix for     ACE-3827    SOLR 4 - Shard based on ACL hash
   - the sub system supports sharding


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@104398 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-05-18 15:13:48 +00:00
Tatyana Valkevych
7027a0871e Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
104252: Merged 5.0.N (5.0.2) to HEAD-BUG-FIX (5.1/Cloud)
      104183: Merged DEV to V5.0.N (5.0.2)
         104081 : MNT-12874: FTP: 0kb file when uploading file via ftp (drop network connection)
            - Added timeout for server session.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@104394 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-05-18 15:12:34 +00:00
Tatyana Valkevych
867a183447 Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
104250: Merged 5.0.N (5.0.2) to HEAD-BUG-FIX (5.1/Cloud)
      104173: Merged V4.2-BUG-FIX (4.2.5) to 5.0.N (5.0.2)
         104090: Merged NESS/4.2.N-2015_04_30 (4.2.5) to V4.2-BUG-FIX (4.2.5)
            104084: MNT-13366 : CMIS folder.deleteTree results in multiple entries in trashcan rather than one
               - Implemented fix and test.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@104392 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-05-18 15:11:53 +00:00
Tatyana Valkevych
08363286f0 Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
104179: Merged 5.0.N (5.0.2) to HEAD-BUG-FIX (5.1/Cloud)
      104080: Merged DEV (5.0.2) to 5.0.N (5.0.2)
         104074: MNT-13989: securing external authentication with non null external.authentication.proxyUserName fails
            - Added SSL certificate subject DN validation in case of external.authentication.proxyUserName is set.
            - Added JUnit test.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@104262 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-05-15 10:29:27 +00:00
Tatyana Valkevych
8e6acabc2f Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
104107: Merged 5.0.N (5.0.2) to HEAD-BUG-FIX (5.1/Cloud)
      104059: Merged V4.2-BUG-FIX (4.2.5) to 5.0.N (5.0.2)
         104006: Merged DEV to V4.2-BUG-FIX (4.2.5)
            83993 : MNT-12265 : Uploading a new version of a .rtf file in Mac OS breaks the preview
               - Using mimetype map from Alfresco at upload


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@104200 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-05-14 15:35:17 +00:00
Tatyana Valkevych
84ed670287 Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
104064: Merged 5.0.N (5.0.2) to HEAD-BUG-FIX (5.1/Cloud)
      103990: SHA-879: Overloaded "deployModel" method to make the created model active/inactive based on the passed in argument. Also, externalised the RepoAdminService error messages.,
      104009: SHA-879: An attempt to fix the test failure caused by r103990.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@104122 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-05-13 16:26:10 +00:00
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