Commit Graph

4537 Commits

Author SHA1 Message Date
Mark Rogers
0dac120b1c Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
84822: Merged PLATFORM1 (5.0/Cloud) to HEAD-BUG-FIX (5.0/Cloud)
      82523: Fix for     ACE-1044  SOLR 4 - Back up and recovery
      - added baseUrl configuration
      - improved admin


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@85181 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-09-20 08:42:16 +00:00
Mark Rogers
afe200fbd5 Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
84811: Merged PLATFORM1 (5.0/Cloud) to HEAD-BUG-FIX (5.0/Cloud)
      82464: ACE-1246 "Allow the customer to change the document encryption key"
      Encrypting content store


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@85170 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-09-20 08:36:54 +00:00
Mark Rogers
567bf7ed83 Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
84774: Merged PLATFORM1 (5.0/Cloud) to HEAD-BUG-FIX (5.0/Cloud)
      80889: ACE-2213


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@85136 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-09-19 22:34:18 +00:00
Mark Rogers
3350046e5c Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
84769: Merged PLATFORM1 (5.0/Cloud) to HEAD-BUG-FIX (5.0/Cloud)
      80836: ACE-2081


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@85132 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-09-19 22:32:31 +00:00
Mark Rogers
1481a5481e Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
84758: Merged PLATFORM1 (5.0/Cloud) to HEAD-BUG-FIX (5.0/Cloud)
      80284: ACE-2213


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@85123 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-09-19 22:28:29 +00:00
Mark Rogers
6d398a5ba9 Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
84733: Merged PLATFORM1 (5.0/Cloud) to HEAD-BUG-FIX (5.0/Cloud)
      78807: ACE-2083	 - Only allow document encryption if the capability has been licensed


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@85104 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-09-19 22:19:44 +00:00
Mark Rogers
4e0c564d02 Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
84690: Merged ACE-2801 to HEAD-BUG-FIX (5.0.0)
      Fix ACE-2801: Method signature change for AlfrescoTransactionSupport.bindListener
         - Added tests for the older method as well.
         - Deprecated repo version of the TransactionListenerAdapter


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@85097 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-09-19 22:16:42 +00:00
Mark Rogers
31af7c47cd Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
84689: Merged ACE-2801 to HEAD-BUG-FIX (5.0.0)
      84505: Fix ACE-2801: Method signature change for AlfrescoTransactionSupport.bindListener
         - Added overloaded method that accepts the old TransactionListener as well.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@85096 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-09-19 22:16:15 +00:00
Alan Davis
0faa62e500 Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
84673: Merged V4.2-BUG-FIX (4.2.4) to HEAD-BUG-FIX (5.0/Cloud)
      84520: Merged V4.1-BUG-FIX (4.1.10) to V4.2-BUG-FIX (4.2.4)
         84406: Merged DEV to V4.1-BUG-FIX (4.1.10).
            84324: MNT-12302 Deleting file with versionable aspect via WebDav does not show up in "Manage Deleted Items" in Alfresco Explorer 


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@84687 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-09-19 08:34:52 +00:00
Alan Davis
06346cccaa Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
84419: Merged V4.2-BUG-FIX (4.2.4) to HEAD-BUG-FIX (5.0/Cloud)
      84385: Merged DEV to V4.2-BUG-FIX (4.2.4)
         84031 : MNT-12165 : Impossible to replicate documents from server
            - Changed the way to get the length of content


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@84663 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-09-18 17:35:26 +00:00
Alan Davis
7ad9ba8506 Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
84349: Merged V4.2-BUG-FIX (4.2.4) to HEAD-BUG-FIX (5.0/Cloud)
      84240: MNT-12407/MNT-11511 : Reverse Merge V4.2-BUG-FIX (4.2.4)
         77501 : Merged DEV to V4.2-BUG-FIX (4.2.4)
            76291 : MNT-11511 : All tags are not displayed in repository when the number of nodes taggable is over 1000
               - Using tagscope api at search for tags quantity in repository


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@84657 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-09-18 17:34:10 +00:00
Alan Davis
0fc1b60814 Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
84312: Merged V4.2-BUG-FIX (4.2.4) to HEAD-BUG-FIX (5.0/Cloud)
      84198: Merged DEV to V4.2-BUG-FIX (4.2.4)
         84122: MNT-10730: In SelectNode() the third possible parameter is not evaluated properly
            - Now, true and false value will be handled as boolean.
            - Appropriate test was added.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@84655 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-09-18 17:33:46 +00:00
Alan Davis
7030eb0a29 Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
84255: Merged V4.2-BUG-FIX (4.2.4) to HEAD-BUG-FIX (5.0/Cloud)
      84254: Reverse Merge V4.2-BUG-FIX (4.2.4)
         << Causes problems for other transformations such as those that start with an HTML file >>
         77398: MNT-11279: Docx Preview: FileName in the document header not previewing correctly
          - Keep original name during convertion.
          - Add unit testMNT-11279: Docx Preview: FileName in the document header not previewing correctly
          - Keep original name during convertion.
          - Add unit test


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@84651 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-09-18 17:32:35 +00:00
Alan Davis
435aadfdff Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
84221: Defensive code around missing namespace check for WorkflowQNameConverter


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@84646 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-09-18 17:31:28 +00:00
Alan Davis
06b9014607 Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
84168: ACE-2773 (Amend document versions panel component for further extending possibilities)


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@84637 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-09-18 17:27:07 +00:00
Alan Davis
2b15a5b5ad Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
84138: Merged FEATURE2 (5.0.0.FEATURE2) to HEAD-BUG-FIX (5.0/Cloud)
      83970: ACE-2268 : make ldaps (LDAP over SSL) configurable using ldap subsystem properties and not only JVM (system) properties (JAVA_OPTS)
      Implemented the LDAPS truststore configuration via subsystem's properties.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@84634 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-09-18 17:26:44 +00:00
Alan Davis
2b5e64a359 Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
84121: Merged V4.2-BUG-FIX (4.2.4) to HEAD-BUG-FIX (5.0/Cloud)
      82508: Merged V4.1-BUG-FIX (4.1.10) to V4.2-BUG-FIX (4.2.4)
         82319: Merged DEV to V4.1-BUG-FIX (4.1.10)
            81073 : MNT-9532 : SQL performance issue - WHERE ... IS NULL statements
               - Initial commit to revert fixes for MNT-8527 (r48757) and MNT-9483 (r56137) as this fixes causes performance issue for Oracle.
            81966 : MNT-9532 : SQL performance issue - WHERE ... IS NULL statements
               - Default value for feed_user_id and site_network is now @@NULL@@.
               - IS NULL clause was completly removed from activities queries.
               - Upgrade sql script was added to replace nulls for Oracle (empty strings for other dialect) with @@NULL@@.
               - Version schema was incremented by 1.
            82278 : MNT-9532 : SQL performance issue - WHERE ... IS NULL statements
               - Fixed unit test failure. 
      83431: MNT-9532 : SQL performance issue - WHERE ... IS NULL statements
         - Fixed build failure
      84115: MNT-9532/MNT-11871: with the revert of MNT-11871 patch, MNT-9532 should be using a lower schema number.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@84632 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-09-18 17:26:23 +00:00
Alan Davis
862e07f3e2 Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
84058: Merged V4.2-BUG-FIX (4.2.4) to HEAD-BUG-FIX (5.0/Cloud)
      83799: MNT-12238: Merged DEV 4.2-BUG-FIX (4.2.4) to V4.2-BUG-FIX (4.2.4)
         MNT-12238: Merged 4.1-BUG-FIX (4.1.10) to V4.2-BUG-FIX (4.2.4)
            80291: Merged V4.1.6 (4.1.6.21) to V4.1-BUG-FIX (4.1.10)
               77378: Merged DEV PATCHES/V4.1.6 (19) to PATCHES/V4.1.6 (20)
                  76649: MNT-11823: Upload of PPTX causes very high memory usage leading to system instability
                     - Patch from MNT-577 has been combined with new changes to avoid hanging of analyzing complicated PPTX documents. The fix just disables reading the entire contents of the complicated document. POI metadata extractor may be switched to standard behavior or reconfigured, using the following new properties: content.transformer.Poi.poiFootnotesLimit, content.transformer.Poi.poiExtractPropertiesOnly and content-services-context.xml/extracter.Poi/poiAllowableXslfRelationshipTypes
                  77379: MNT-11823: Upload of PPTX causes very high memory usage leading to system instability
                     Test and the test data for MNT-577 have been added. Test for MNT-11823 has also been added. But this test is commented because the test data (appropriate PPTX document) is not currently available. Getters for POI specific properties have been added to 'PoiMetadataExtracter' for tests. Also 'afterPropertiesSet()' logic has been a bit modified to allow setting 'false' value for 'poiExtractPropertiesOnly' parameter
                  77561: MNT-11823: Upload of PPTX causes very high memory usage leading to system instability
                     Fix for https://bamboo.alfresco.com/bamboo/browse/HF-PATCH416-126 build failure. POI extractor and transformer properties of 'AlfrescoPoiPatchUtils' have been isolated from each other using context. Each extractor or transformer now has its own context or uses the default context. Properties of the default context allow parsing the entire contents of XLSF documents. And footnotes limit is 50. Property names have not been changed, but currently 'content-services-context.xml/extracter.Poi/poiAllowableXslfRelationshipTypes=null' does not lead to 'content.transformer.Poi.poiExtractPropertiesOnly=false'. I. e., this list may be empty. 'PoiMetadataExtracterTest' test has been modified in accordance with the introduced changes. 'poi-OOXML-3.9-beta1-20121109.jar' has been renamed to 'poi-OOXML-3.9-beta1-20121109-patched.jar'
                  79180: MNT-12043: CLONE - Upload of PPTX causes very high memory usage leading to system instability
                     Timeout mechanism has been added to content transformers. Timeout configuration options have been added. Also mechanism to close streams after 'TimoutException' has been added to transformers and metadata extractors. Also timeout mechanism for input streams has been enabled in 'TikaPoweredContentTransformer'
                  79268: MNT-12043: CLONE - Upload of PPTX causes very high memory usage leading to system instability
                     Fix for the https://bamboo.alfresco.com/bamboo/browse/HF-PATCH416-133 build failure and comments of the review https://fisheye.alfresco.com/cru/CR-100#CFR-1184. The new test has been added into 'PoiOOXMLContentTransformerTest.testMnt12043()' to check out the newly added timeout mechanism
                  79290: MNT-12043: CLONE - Upload of PPTX causes very high memory usage leading to system instability
                     - Removed methods and properties that are no longer needed
                  79327: MNT-12043: CLONE - Upload of PPTX causes very high memory usage leading to system instability
                     - Increased ADDITIONAL_PROCESSING_TIME to 1500ms to try and avoid a new intermittent test failure.
      83885: MNT-12238 Bring Maven POM file in sync with latest patched version of poi-ooxml


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@84627 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-09-18 17:23:49 +00:00
Alan Davis
fa4d74fa5b Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
84033: Merged V4.2-BUG-FIX (4.2.4) to HEAD-BUG-FIX (5.0/Cloud)
      83385: MNT-12297: TransactionalCache equality checks lead to false negatives in a cluster
       - TransactionalCache uses ValueHolder to store values put into the cache.
       - Each ValueHolder will have a new random integer to distinguish it from the next
       - TransactionalCache equality checks no longer use reference equality and instead
         use the ValueHolder.equals() method for most cases.  This actual client value
         .equals() is used where 'allowEquals' is true.
       - Immutable caches always assume the backing cache is correct, still.
      83391: Fix test doing checks in low-level cache (r83385 MNT-12297)


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@84621 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-09-18 17:21:11 +00:00
Alan Davis
3d61b9af7a Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
84028: Merged V4.2-BUG-FIX (4.2.4) to HEAD-BUG-FIX (5.0/Cloud)
      83341: Merged DEV to V4.2-BUG-FIX (4.2.4)
         82263: MNT-12259 : Outlook 2013 implements an IMAP move as a \Deleted + APPEND leading to corrupt files
         Implemented a complex move operation to support Outlook 2013.
         82465: MNT-12259 : Outlook 2013 implements an IMAP move as a \Deleted + APPEND leading to misleading copy of alfresco dummy file
         Modified the fix to use the message id to determine the complex move operation.
         Added JUnit test.
      83420: MNT-12259 : Outlook 2013 implements an IMAP move as a \Deleted + APPEND leading to misleading copy of alfresco dummy file
      Added an addition check for node existence to correctly handle invalid nodeRefs in message id.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@84619 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-09-18 17:20:55 +00:00
Alan Davis
49e29b3472 Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
84026: Merged V4.2-BUG-FIX (4.2.4) to HEAD-BUG-FIX (5.0/Cloud)
      82663: Neaten logic for MT domain extraction from username


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@84617 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-09-18 17:20:39 +00:00
Alan Davis
afcee48923 Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
84025: Merged V4.2-BUG-FIX (4.2.4) to HEAD-BUG-FIX (5.0/Cloud)
      82649: Merged DEV to V4.2-BUG-FIX (4.2.4)
         82512: MNT-12282 : Site manager's avatar overrides others in Activities dashlet
         Changed the removeMembership activity generation to be done on behalf of the removed user.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@84616 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-09-18 17:20:31 +00:00
Alan Davis
4e7e8ae44b Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
84024: Merged V4.2-BUG-FIX (4.2.4) to HEAD-BUG-FIX (5.0/Cloud)
      82524: Merged DEV to V4.2-BUG-FIX (4.2.4)
         82434 : MNT-12270 : IMAP server closes connections/ IMAP sync fails
            - Incorrect extracting of values from cache


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@84615 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-09-18 17:20:23 +00:00
Alan Davis
9895e145f7 Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
84017: Merged V4.2-BUG-FIX (4.2.4) to HEAD-BUG-FIX (5.0/Cloud)
      82509: Merged V4.1-BUG-FIX (4.1.10) to V4.2-BUG-FIX (4.2.4)
         82351: MNT-12272: Merged DEV to V4.1-BUG-FIX (4.1.10)
            82330: MNT-12272: Possible sql injection in /api/workflow-instances
               - Set exluded definitions for query using parameter binding


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@84613 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-09-18 17:20:08 +00:00
Alan Davis
f422aaf88e Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
83971: ALF-21100 - defensive code improvement around handing of invalid Search operator option.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@84607 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-09-18 17:19:22 +00:00
Alan Davis
17b9a6daf5 Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
83943: Merged V4.2-BUG-FIX (4.2.4) to HEAD-BUG-FIX (5.0/Cloud)
      82504: Merged V4.1-BUG-FIX (4.1.10) to V4.2-BUG-FIX (4.2.4)
         81668: Merged DEV to V4.1-BUG-FIX (4.1.10)
            80985 : MNT-12082 : Consumers can add comments using URL parameters, although they are not allowed to do so
               - Fixed the issue. Implemented a test to simulate the issue.
      82513: Fix build failure after:
         Merged DEV to V4.1-BUG-FIX (4.1.10)
            80985 : MNT-12082 : Consumers can add comments using URL parameters, although they are not allowed to do so
               - Fixed the issue. Implemented a test to simulate the issue.
      83418: Add further hacks to the CommentsApiTest, which needs to be refactored to use RetryingTransactionHelper.
      83679: MNT-12082 : Consumers can add comments using URL parameters, although they are not allowed to do so
         - Fixed build failure


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@84601 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-09-18 17:17:42 +00:00
Alan Davis
aab50bd113 Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
83934: Merged V4.2-BUG-FIX (4.2.4) to HEAD-BUG-FIX (5.0/Cloud)
      81657: Merged DEV to V4.2-BUG-FIX (4.2.4)
         78463 : MNT-11871 : Adding tag with name containing new lines (\n) breaks the tagging service.
            - Tags containing \n chars should not be created 
         80398 : MNT-11871 : Adding tag with name containing new lines (\n) breaks the tagging service.
            - Tags containing \n and | chars should not be created 
         80403 : MNT-11871 : Adding tag with name containing new lines (\n) breaks the tagging service.
            - Replace bad \n and | characters to _ char patch 
      83538: MNT-12288 : Reverse Merge V4.2-BUG-FIX (4.2.4)
         << Caused upgrade failure as the patch relies on search >>
         81657 : Merged DEV to V4.2-BUG-FIX (4.2.4)
            78463 : MNT-11871 : Adding tag with name containing new lines (\n) breaks the tagging service.
               - Tags containing \n chars should not be created
            80398 : MNT-11871 : Adding tag with name containing new lines (\n) breaks the tagging service.
               - Tags containing \n and | chars should not be created
            80403 : MNT-11871 : Adding tag with name containing new lines (\n) breaks the tagging service.
               - Replace bad \n and | characters to _ char patch
      83539: Merged DEV to V4.2-BUG-FIX (4.2.4)
         78463 : MNT-11871 : Adding tag with name containing new lines (\n) breaks the tagging service.
            - Tags containing \n chars should not be created
         80398 : MNT-11871 : Adding tag with name containing new lines (\n) breaks the tagging service.
            - Tags containing \n and | chars should not be created


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@84600 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-09-18 17:17:34 +00:00
Alan Davis
b27d1c0dec Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
83910: Reverse Merge HEAD-BUG-FIX (5.0/Cloud)
      <<Does not include 83538, 83539 as intended>>
      83891: Merged V4.2-BUG-FIX (4.2.4) to HEAD-BUG-FIX (5.0/Cloud)
         81657: Merged DEV to V4.2-BUG-FIX (4.2.4)
            78463 : MNT-11871 : Adding tag with name containing new lines (\n) breaks the tagging service.
               - Tags containing \n chars should not be created 
            80398 : MNT-11871 : Adding tag with name containing new lines (\n) breaks the tagging service.
               - Tags containing \n and | chars should not be created 
            80403 : MNT-11871 : Adding tag with name containing new lines (\n) breaks the tagging service.
               - Replace bad \n and | characters to _ char patch 
         83538: MNT-12288 : Reverse Merge V4.2-BUG-FIX (4.2.4)
            << Caused upgrade failure as the patch relies on search >>
            81657 : Merged DEV to V4.2-BUG-FIX (4.2.4)
               78463 : MNT-11871 : Adding tag with name containing new lines (\n) breaks the tagging service.
                  - Tags containing \n chars should not be created
               80398 : MNT-11871 : Adding tag with name containing new lines (\n) breaks the tagging service.
                  - Tags containing \n and | chars should not be created
               80403 : MNT-11871 : Adding tag with name containing new lines (\n) breaks the tagging service.
                  - Replace bad \n and | characters to _ char patch
         83539: Merged DEV to V4.2-BUG-FIX (4.2.4)
            78463 : MNT-11871 : Adding tag with name containing new lines (\n) breaks the tagging service.
               - Tags containing \n chars should not be created
            80398 : MNT-11871 : Adding tag with name containing new lines (\n) breaks the tagging service.
               - Tags containing \n and | chars should not be created


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@84596 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-09-18 17:17:02 +00:00
Alan Davis
03952f8551 Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
83892: Merged FEATURE2 to HEAD-BUG-FIX (5.0)
      82450, 82478, 83318, 83442 : ACE-898 : Share uses "ModifiedBy" which is not always correct for folders
         - Propagate cm:modifier and cm:modified. Feature related test


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@84595 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-09-18 17:16:45 +00:00
Alan Davis
d9363413c3 Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
83891: Merged V4.2-BUG-FIX (4.2.4) to HEAD-BUG-FIX (5.0/Cloud)
      81657: Merged DEV to V4.2-BUG-FIX (4.2.4)
         78463 : MNT-11871 : Adding tag with name containing new lines (\n) breaks the tagging service.
            - Tags containing \n chars should not be created 
         80398 : MNT-11871 : Adding tag with name containing new lines (\n) breaks the tagging service.
            - Tags containing \n and | chars should not be created 
         80403 : MNT-11871 : Adding tag with name containing new lines (\n) breaks the tagging service.
            - Replace bad \n and | characters to _ char patch 
      83538: MNT-12288 : Reverse Merge V4.2-BUG-FIX (4.2.4)
         << Caused upgrade failure as the patch relies on search >>
         81657 : Merged DEV to V4.2-BUG-FIX (4.2.4)
            78463 : MNT-11871 : Adding tag with name containing new lines (\n) breaks the tagging service.
               - Tags containing \n chars should not be created
            80398 : MNT-11871 : Adding tag with name containing new lines (\n) breaks the tagging service.
               - Tags containing \n and | chars should not be created
            80403 : MNT-11871 : Adding tag with name containing new lines (\n) breaks the tagging service.
               - Replace bad \n and | characters to _ char patch
      83539: Merged DEV to V4.2-BUG-FIX (4.2.4)
         78463 : MNT-11871 : Adding tag with name containing new lines (\n) breaks the tagging service.
            - Tags containing \n chars should not be created
         80398 : MNT-11871 : Adding tag with name containing new lines (\n) breaks the tagging service.
            - Tags containing \n and | chars should not be created


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@84594 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-09-18 17:16:37 +00:00
Alan Davis
3a2bd598d0 Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
83858: Merged KEVINR1 (5.0/Cloud) to HEAD-BUG-FIX (5.0/Cloud)
      82984: ACE-2644 - Administrator Node Browser (in-process) functional parity of Explorer
         Initial basic store list and child listings


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@84580 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-09-18 17:14:25 +00:00
Alan Davis
1aa5f4a1fd Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
83759: Merge WAT2 to HEADBUGFIX: r83494  When package items are added/removed it dispatches an Activiti VARIABLE_UPDATED event


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@84576 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-09-18 17:13:54 +00:00
Alan Davis
672d23b2ee Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
83542: Merged V4.2-BUG-FIX (4.2.4) to HEAD-BUG-FIX (5.0/Cloud)
      82265: Merged DEV to V4.2-BUG-FIX (4.2.4)
         82260: MNT-10766: User quotas diminished due to orphan, undetectable, non-deletable, temporary download files generated by "Download as Zip"
            - functionality that allows to configure excluded types, that will ignore user usage recalculation for these types.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@84562 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-09-18 17:08:58 +00:00
Alan Davis
74a57d33cb Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
83406: ACE-2669 (Move behaviour annotation framework from RM into core)


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@84552 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-09-18 16:54:09 +00:00
Will Abson
72af9229de ACE-2433: Adapt repository script to allow SOLR 4
- Change solr query endpoint to that passed in to the method and remove redundant 'qt' parameter (consistent with other query methods)
 - Parsing of stats response no longer expects a specific stats item, it just parses the first stats field object as there should only ever be one

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@83720 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-09-09 15:27:32 +00:00
Alan Davis
8ba7795cd5 Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
83478: Merged V4.2-BUG-FIX (4.2.4) to HEAD-BUG-FIX (5.0/Cloud)
      83322: Merged DEV to V4.2-BUG-FIX (4.2.4)
         83320 : MNT-12301
            - Util method was added for FileContentStore
            - Unit test added.
      83473: Merged V4.1-BUG-FIX (4.1.10) to V4.2-BUG-FIX (4.2.4) (RECORD ONLY)
      83474: Merged V4.1-BUG-FIX (4.1.10) to V4.2-BUG-FIX (4.2.4) (RECORD ONLY)


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@83484 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-09-05 17:17:58 +00:00
Erik Winlof
023e275bc3 Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
82493: Merged WAT2 (5.0/Cloud) to HEAD-BUG-FIX (5.0/Cloud)
      82483: An event is published when a file/folder is added using the FavouriteService


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@83290 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-09-04 07:34:51 +00:00
Erik Winlof
8aececc730 Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
82400: Merged WAT2 (5.0/Cloud) to HEAD-BUG-FIX (5.0/Cloud)
      80250: ACE-2276	 - Update Activiti to 5.16.1


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@83240 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-09-04 07:00:28 +00:00
Erik Winlof
825e6c29a6 Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
82394: Merged WAT2 (5.0/Cloud) to HEAD-BUG-FIX (5.0/Cloud)
      80104: Bug fixed user Create / Update event generation, mistakenly creating multiple events.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@83237 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-09-04 06:58:44 +00:00
Erik Winlof
fd970bf2f8 Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
82385: Merged WAT2 (5.0/Cloud) to HEAD-BUG-FIX (5.0/Cloud)
      79093: Added event generation for User update and create


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@83228 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-09-04 06:55:53 +00:00
Erik Winlof
a8aac98030 Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
82373: Merged WAT2 (5.0/Cloud) to HEAD-BUG-FIX (5.0/Cloud)
      76479: Supporting Client class from alfresco-events


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@83217 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-09-04 06:50:19 +00:00
Erik Winlof
6575029ee5 Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
82370: Merged WAT2 (5.0/Cloud) to HEAD-BUG-FIX (5.0/Cloud)
      76476: Removing alfresco-events from the core product in favour of an org.alfresco.services component


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@83214 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-09-04 06:49:17 +00:00
Erik Winlof
214e1ea9d8 Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
82339: Merged WAT2 (5.0/Cloud) to HEAD-BUG-FIX (5.0/Cloud)
      75270: Added event generation for site creation


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@83204 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-09-04 06:30:54 +00:00
Erik Winlof
7f3dda5c98 Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
82289: Merged V4.2-BUG-FIX (4.2.4) to HEAD-BUG-FIX (5.0/Cloud)
      81646: Merged V4.1-BUG-FIX (4.1.10) to V4.2-BUG-FIX (4.2.4)
         81441: Merged DEV to V4.1-BUG-FIX
          81113 : MNT-12145 : BM-0013 Soak test: Exception during generation of feeds org.springframework.dao.DataIntegrityViolationException.
           Added RetryingTransactionHelper (before the job lock is created), which would deal with the exception neatly, and disabled force writable flag.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@83202 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-09-04 06:30:16 +00:00
Erik Winlof
e71d0e65f8 Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
81437: Fixing a little bug identified by findbugs. An exception was created and dropped without being thrown.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@83164 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-09-04 06:18:34 +00:00
Will Abson
ac4213cd9c Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
80871: Fix for ALF-20896. ScriptNode.childByPath should return null for no child.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@83123 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-09-03 18:07:02 +00:00
Will Abson
bc794cda30 Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
80709: Merged WAT1 (5.0/Cloud) to HEAD-BUG-FIX (5.0/Cloud)
      78667: ACE-1582: Made the facet config service and the relevant web scripts to accept single/multiple value(s) update (to support inline edits).


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@83007 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-09-03 16:41:45 +00:00
Will Abson
930f2a2edf Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
80698: Merged WAT1 (5.0/Cloud) to HEAD-BUG-FIX (5.0/Cloud)
      78457: ACE-1582: - Fixed facet's custom properties.
                - Made the GET facets web-script to be accessed by all authenticated users rather than just the Search-Admin/Network-Admin users. 
                - Fixed FacetRestApiTests and added more tests.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@82996 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-09-03 16:30:54 +00:00
Will Abson
a740ca67cb Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
80669: Merged WAT1 (5.0/Cloud) to HEAD-BUG-FIX (5.0/Cloud)
      78166: ACE-1582: Enhancements to the facet service to persist only the modified value(s) rather than the whole facet's properties. Also fixed facets cache and facets reordering NPE.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@82966 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-09-03 16:18:39 +00:00
Will Abson
5d5409019e Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
80656: Merged WAT1 (5.0/Cloud) to HEAD-BUG-FIX (5.0/Cloud)
      77535: Adding first JUnit test of facet config rest api. Part of ACE-1582.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@82950 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-09-03 16:16:41 +00:00