Commit Graph

560 Commits

Author SHA1 Message Date
Alan Davis
6e3fb93759 Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
106699: Made the listModules method public so you can find out what modules are installed. UTF-77


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@106795 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-06-23 07:07:13 +00:00
Alan Davis
e70f3f9bd9 Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
106496: Merged 5.0.N (5.0.3) to HEAD-BUG-FIX (5.1/Cloud)
      106441: Merged V4.2-BUG-FIX (4.2.5) to 5.0.N (5.0.3)
         106391: MNT-14209: Merged V4.2.1 (4.2.1.19) to V4.2-BUG-FIX (4.2.5)
            106130: Merged DEV to V4.2.1 (4.2.1.19)
               106126: MNT-14059 : Replication job reports list all content eligible for replication, not just content that was replicated that job run
                  - added code for the a new simplified (summary) transfer report on the destination server side
                  - updated the jUnit test to check that the new report is generated only when the property: transferservice.simple-report= true
                  - reusing the same format as the old destination side report for the new simplified report, but have only the relevant content
                  - did not modify/break compatibility of the code; did not changes methods in existing interfaces or communication protocols
                  - added a property for the transfer summary report location


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@106632 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-06-20 12:29:46 +00:00
Alan Davis
3a8602f46c Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
105991: Merged 5.0.N (5.0.3) to HEAD-BUG-FIX (5.1/Cloud)
      105915: Merged V4.2-BUG-FIX (4.2.5) to 5.0.N (5.0.3)
         105898: MNT-13901 TransformationOptions Timeout Can Not Easily Be Set
            - Fix "TransformationOptionPair.setMax(long max) and TransformationOptionPair.setLimit(long limit) so that they don't
              clear the other half of the pair when the value being set is < 0 (unset).
            - Unit tests added
            - Added comments about how the 'transformer' code builds up limits to include defaults.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@106013 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-06-12 10:33:47 +00:00
Alan Davis
284539d634 Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
105377: Merged 5.0.N (5.0.3) to HEAD-BUG-FIX (5.1/Cloud)
      105325: MNT-10962 : Versioning for cmis:document not working initially
         - Fixed build failure.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@105411 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-06-03 09:00:28 +00:00
Alan Davis
8e0880b1a8 Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
105375: Merged 5.0.N (5.0.3) to HEAD-BUG-FIX (5.1/Cloud)
      105133: Merged V4.2-BUG-FIX (4.2.5) to 5.0.N (5.0.3)
         104891: MNT-10962: Versioning for cmis:document not working initially
            - Fixed lost dependancies after r104888.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@105409 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-06-03 09:00:14 +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
2de63f795b Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
104819: Merged 5.0.N (5.0.2) to HEAD-BUG-FIX (5.1/Cloud)
      104792: Merged DEV to 5.0.N (5.0.2)
         104003 : MNT-12773: IMAP UID SEARCH <ARGS> not implemented.
            - Implemented imap methods


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@104877 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-05-26 21:54:12 +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
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
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
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
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
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
4ae85c623b Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
103721: Merged 5.0.N (5.0.2) to HEAD-BUG-FIX (5.1/Cloud)
      103683: Merged DEV to V5.0.N (5.0.2)
         102953: MNT-13933: CalendarHelpersTest unit test fails in negative offset timezone e.g. US/Atlanta.
                    - In CalendarHelpersTest.simpleTimeZoneNorthern() was changed date.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@103778 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-05-06 15:27:36 +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
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
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
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
d87d938309 Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
102713: Merged 5.0.N (5.0.2) to HEAD-BUG-FIX (5.1/Cloud)
      102494: Merged V4.2-BUG-FIX (4.2.5) to 5.0.N (5.0.2)
         102420: MNT-13710 : User cannot change site role if its current role contains an underscore
          Build failed. Was corected some junit tests.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@103543 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-05-02 07:19:06 +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
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
6a93e35eb0 Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
102707: Merged 5.0.N (5.0.2) to HEAD-BUG-FIX (5.1/Cloud)
      102488: Merged V4.2-BUG-FIX (4.2.5) to 5.0.N (5.0.2)
         101886: Merged DEV to V4.2-BUG-FIX (4.2.5)
            101564: MNT-13531: EMLTransformer ignoring multipart emails
               - added EMLTransformerTest to Metadata Extractor and Transform test suite


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@103537 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-05-02 07:17:40 +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
Samuel Langlois
8d7f1a1520 Merge HEAD-BUG-FIX (5.1) to HEAD (5.1/Cloud40)
102529: Merge RA-SPRINT3 to HEAD-BUG-FIX (5.1)
      102321: RA-106 - CalendarHelpersTest unit test fails in non-British timezone
         fixed for non english language.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@103283 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-04-30 11:14:59 +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
d4798c682a Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
102230: Added test to check if ACE-3943 is an issue i.e. does the SiteService handle MLText site data.  It does.  Not a bug.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@102253 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-04-21 13:35:06 +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
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
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
07e2aa7066 Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
101394: MNT-13545 Re-apply fix of parameters inconsistence in Javadoc


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@101476 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-04-08 16:26:29 +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
Tatyana Valkevych
32d645cfb5 Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
101319: Merge RA-SPRINT2 to HEAD-BUG-FIX (5.1)
      100048: RA-62: moves common webscript tests to repo, fixes compilation.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@101461 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-04-08 16:15:25 +00:00
Tatyana Valkevych
2495674216 Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
101307: Merge RA-SPRINT2 to HEAD-BUG-FIX (5.1)
      99908: RA-49: Rename Surf types model


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@101450 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-04-08 16:08:47 +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
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
014eec4b5a Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
100864: Merged 5.0.N (5.0.2) to HEAD-BUG-FIX (5.1/Cloud)
      100803: Merged DEV to 5.0.N (5.0.2)
         100181 : MNT-13646 : Share - copy too many items
            - Test move/copy 3000 items


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@100934 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-03-31 23:20:23 +00:00
Alan Davis
352c439f98 Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
100848: Merged 5.0.N (5.0.2) to HEAD-BUG-FIX (5.1/Cloud)
      100759: Merged V4.2-BUG-FIX (4.2.5) to 5.0.N (5.0.2)
         99912: MNT-10999: CMIS: Version is not increased after deleting Content Stream
            - resolved compilation errors of the merge (99877) to 4.2-BUG-FIX:
               -- removed extra declaration of versionService;
               -- added declaration and initialization of context


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@100918 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-03-31 23:14:38 +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
ac9b2206bc Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
100117: Merged 5.0.N (5.0.2) to HEAD-BUG-FIX (5.1/Cloud)
      99965: Merged DEV to 5.0.N (5.0.2)
         98656: MNT-13529 : Just-installed Alfresco does not return a CMIS latestChangeLogToken
            - Add initial change log token
         99911: MNT-13529 : Just-installed Alfresco does not return a CMIS latestChangeLogToken
            - Added test


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@100540 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-03-27 23:06:50 +00:00
Alan Davis
a4a7c5f8e7 Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
99981: Merged 5.0.N (5.0.2) to HEAD-BUG-FIX (5.1/Cloud) (PARTIAL MERGE)
      99482: Merged DEV to 5.0.N (5.0.1)
         99198 : MNT-13545: JavaDoc : Inconsistencies between the Java doc and the actual code
            - Changed Javadoc typo in project alfresco-jlan
         99413 : MNT-13545: JavaDoc : Inconsistencies between the Java doc and the actual code
            - Changed Javadoc parameters inconsistence in project alfresco-jlan
         99205 : MNT-13545: JavaDoc : Inconsistencies between the Java doc and the actual code
            - Changed Javadoc parameters inconsistence in project core
         99415 : MNT-13545: JavaDoc : Inconsistencies between the Java doc and the actual code
            - Changed Javadoc parameters inconsistence in project data-model
         99227 : MNT-13545: JavaDoc : Inconsistencies between the Java doc and the actual code
            - Changed Javadoc parameters inconsistence in project file-transfer-receiver
         99416 : MNT-13545: JavaDoc : Inconsistencies between the Java doc and the actual code
            - Changed Javadoc parameters inconsistence in project legacy-lucene
         99417 : MNT-13545: JavaDoc : Inconsistencies between the Java doc and the actual code
            - Changed Javadoc parameters inconsistence in project qa-share
         99418 : MNT-13545: JavaDoc : Inconsistencies between the Java doc and the actual code
            - Changed Javadoc parameters inconsistence in project remote-api
         99427 : MNT-13545: JavaDoc : Inconsistencies between the Java doc and the actual code
            - Changed Javadoc in project Repository, letters S..Z
         99433 : MNT-13545: JavaDoc : Inconsistencies between the Java doc and the actual code
            - Changed Javadoc in project Repository, letters A..R
         99421 : MNT-13545: JavaDoc : Inconsistencies between the Java doc and the actual code
            - Changed Javadoc parameters inconsistence in project share-po
         99247 : MNT-13545: JavaDoc : Inconsistencies between the Java doc and the actual code
            - Changed Javadoc typo in project slingshot
         99248 : MNT-13545: JavaDoc : Inconsistencies between the Java doc and the actual code
            - Changed Javadoc parameters inconsistence in project slingshot
         99424 : MNT-13545: JavaDoc : Inconsistencies between the Java doc and the actual code
            - Changed Javadoc parameters inconsistence in project solr
         99426 : MNT-13545: JavaDoc : Inconsistencies between the Java doc and the actual code
            - Changed Javadoc parameters inconsistence in project solr4
         99253 : MNT-13545: JavaDoc : Inconsistencies between the Java doc and the actual code
            - Changed Javadoc parameters inconsistence in project solr-client
         99259 : MNT-13545: JavaDoc : Inconsistencies between the Java doc and the actual code
            - Changed Javadoc parameters inconsistence in project web-client
         99260 : MNT-13545: JavaDoc : Inconsistencies between the Java doc and the actual code
            - Changed Javadoc parameters inconsistence in project web-framework-commons


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@100501 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-03-27 23:00:01 +00:00
Alan Davis
bc6720c6cc Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
99771: Merged 5.0.N (5.0.2) to HEAD-BUG-FIX (5.1/Cloud)
      99702: Merged V4.2-BUG-FIX (4.2.5) to 5.0.N (5.0.2)
         99655: Reverse Merge V4.2-BUG-FIX (4.2.5)
            << Caused build failures >>
            99553: MNT-12628: Following on from MNT-12501 - Rollback of synchronous transactions is not behaving consistently
               - Added a static variable holding the RollbackOnly state to RetryingTransactionHelper. Currently used by RetryingTransactionInterceptor.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@100498 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-03-27 22:57:20 +00:00
Alan Davis
783c24a2a5 Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
99764: Merged 5.0.N (5.0.2) to HEAD-BUG-FIX (5.1/Cloud)
      99695: Merged V4.2-BUG-FIX (4.2.5) to 5.0.N (5.0.2)
         99553: MNT-12628: Following on from MNT-12501 - Rollback of synchronous transactions is not behaving consistently
            - Added a static variable holding the RollbackOnly state to RetryingTransactionHelper. Currently used by RetryingTransactionInterceptor.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@100491 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-03-27 22:56:07 +00:00
Alan Davis
58aa01da0e Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
99691: Merged 5.0.N (5.0.2) to HEAD-BUG-FIX (5.1/Cloud)
      99496: Merged V4.2-BUG-FIX (4.2.5) to 5.0.N (5.0.2)
         99400: Merged DEV to V4.2-BUG-FIX (4.2.5)
            99360 : MNT-13234 : Duplicate activities in activities feed
               - Added check for avoid duplicate activities
               - Added test


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@100483 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-03-27 22:52:23 +00:00
Alan Davis
eba15572e6 Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
99489: Put tests back because they are not the issue (revert r99483)


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@99509 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-03-16 13:37:39 +00:00
Alan Davis
0e45287a6d Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
99483: Comment tests until we figure out how they are not working with other tests in the suite ... when run in Cloud build


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@99508 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-03-16 13:37:31 +00:00
Alan Davis
64627b758a Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
99399: Fix tests to dodge leaked security contexts from other tests in the suite and handle MLText better (BENCH-369)


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@99507 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-03-16 13:37:24 +00:00