407 Commits

Author SHA1 Message Date
Pavel Yurke
82bf270d41 ACE-2181 : Merged DEV to HEAD (5.0)
76214 : MNT-10946 : Admin is no longer able to unlock files 
      - Drop check for lockowner from AbstractLockStore.set. Fix related test 


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@85881 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-09-29 10:23:20 +00:00
Pavel Yurke
c77ab4b347 ACE-2181 : Reverse Merge HEAD (5.0)
<< Implementing another approach for MNT-10946 and ACE-2181 >>
   Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (4.3/Cloud)
      71600: Merged V4.2-BUG-FIX (4.2.3) to HEAD-BUG-FIX (4.3/Cloud)
         70349: Merged DEV to V4.2-BUG-FIX (4.2.3)
            70294 : MNT-10946 : Admin is no longer able to unlock files
               - Check if node is locked before unlock for non-admin or System users. Fix related test


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@85880 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-09-29 10:22:06 +00:00
Alan Davis
952eb031a7 Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
85763: Merged V4.2-BUG-FIX (4.2.4) to HEAD-BUG-FIX (5.0/Cloud)
      85729: MNT-12191 : Intermittent test failure: CronScheduledQueryBasedTemplateActionDefinitionTest.testQueryTemplateFunctionsUnescapingMnt11598
      Increased the creation time of "yesterday" nodes from 1 to 2 days as a fix for intermittent test failures.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@85770 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-09-26 09:28:51 +00:00
Matt Ward
0758dc4431 ACE-2682: MT: Failure occurs when creating tenant with specified contentstore directory
This is not a nice solution, nicer would be if we could allow Spring's ProxyFactoryBean to discover all the interfaces implemented by the underlying bean.

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@85696 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-09-25 09:56:02 +00:00
Alan Davis
e507f9ea55 Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
85648: MNT-12422: Merged V4.2-BUG-FIX (4.2.4) to HEAD-BUG-FIX (5.0/Cloud)
      85647: Merged V4.1-BUG-FIX (4.1.10) to V4.2-BUG-FIX (4.2.4)
         85646: MNT-11823: Upload of PPTX causes very high memory usage leading to system instability
            - Need to reduce the timeout (50ms -> 30ms) of the test as it failed on HEAD-BUG-FIX after a new version of POI was merged from V4.2-BUG-FIX
              as it completed the transform in 52ms which then tripped over the check that its should not have completed.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@85678 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-09-25 06:14:01 +00:00
Alan Davis
df4b037784 ACE-2780: Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
85504: Reverse merged HEAD-BUG-FIX (5.0/Cloud)
      << Build failure was fixed >>
      84534: Reverse merged HEAD-BUG-FIX (5.0/Cloud)
         << Causes build problem with Cloud >>
         84123: Merged V4.2-BUG-FIX (4.2.4) to HEAD-BUG-FIX (5.0/Cloud)
            83401: Merged V4.1-BUG-FIX (4.1.10) to V4.2-BUG-FIX (4.2.4)
               83366: Merged DEV to V4.1-BUG-FIX (4.1.10)
                  82671 : MNT-12278 : Activity processing is single-threaded
                     - Refactoring for multithreading.
                  83343 : MNT-12278 : Activity processing is single-threaded
         84124: Merged V4.2-BUG-FIX (4.2.4) to HEAD-BUG-FIX (5.0/Cloud)
            83678: MNT-12278 : Activity processing is single-threaded
               - Fixed build failure


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@85531 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-09-23 16:10:34 +00:00
Mark Rogers
85f1e5b819 Merged DEV to HEAD : 54690, 54691 : ACE-2783 - Opening and closing a *.xls and *.ppt files with the CIFS interface(without saving) creates a new version
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@85530 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-09-23 16:08:15 +00:00
Pavel Yurke
e862da0715 ACE-281: Merged DEV to HEAD (5.0/Cloud)
80201: ACE-281: Problems with renditions and permissions
      - On owner change clear nodeOwnerCache for renditions of the node. Add unit test.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@85519 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-09-23 14:43:01 +00:00
Mark Rogers
2aef07876d Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
85071: Merged PLATFORM1 (5.0/Cloud) to HEAD-BUG-FIX (5.0/Cloud)
      84416: This is the repo-tier part of MNT-12701. Adds a "take ownership" repository action.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@85386 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-09-20 10:46:03 +00:00
Mark Rogers
2e795d71c5 Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
84978: Merged PLATFORM1 (5.0/Cloud) to HEAD-BUG-FIX (5.0/Cloud)
      83886: ACE-2269 - unit test fix.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@85293 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-09-20 10:01:01 +00:00
Mark Rogers
a3fec01669 Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
84973: Merged PLATFORM1 (5.0/Cloud) to HEAD-BUG-FIX (5.0/Cloud)
      83851: Adding methods to PropertyDefinition (data-model) to allow for retrieval of title and description for a specified Locale. Required for ACE-2639.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@85288 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-09-20 09:58:40 +00:00
Mark Rogers
6bba4fe0e8 Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
84969: Merged PLATFORM1 (5.0/Cloud) to HEAD-BUG-FIX (5.0/Cloud)
      83756: ACE-2269	 - Allow AMPs to include literals in version number (e.g. -SNAPSHOT)


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@85284 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-09-20 09:56:48 +00:00
Mark Rogers
912f07223e Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
84918: Merged PLATFORM1 (5.0/Cloud) to HEAD-BUG-FIX (5.0/Cloud)
      83446: ACE-2664	 - Deprecate the ReplicatingContentStore in favour of AggregatingContentStore


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@85236 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-09-20 09:09:20 +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
60281c702a Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
84757: Merged PLATFORM1 (5.0/Cloud) to HEAD-BUG-FIX (5.0/Cloud)
      80275: Most of     ACE-2428   SOLR 4 - DD facetable & tidy up doc value support
      - note on disk doc values are gone in 4.9


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@85122 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-09-19 22:27:46 +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
Alan Davis
c6c08ef677 Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
84674: Merged V4.2-BUG-FIX (4.2.4) to HEAD-BUG-FIX (5.0/Cloud)
      84521: Merged V4.1-BUG-FIX (4.1.10) to V4.2-BUG-FIX (4.2.4)
         84435: MNT-11522 : Document modified date is being updated by Workflow
            - Unit test was corrected and refactored.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@84688 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-09-19 08:35:02 +00:00
Alan Davis
9cda1ae985 Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
84671: Merged V4.2-BUG-FIX (4.2.4) to HEAD-BUG-FIX (5.0/Cloud)
      84518: Merged V4.1-BUG-FIX (4.1.10) to V4.2-BUG-FIX (4.2.4)
         84351: Merged DEV to V4.1-BUG-FIX (4.1.10)
            79271 : MNT-11522 : Document modified date is being updated by Workflow
               - Fix bug. Change create a workflow package for the attached items and add them. Add Behavior Filter.
            81662 : MNT-11522 : Document modified date is being updated by Workflow
               - Create Unit test. 
            83496 : MNT-11522 : Document modified date is being updated by Workflow
               - Change unit test.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@84685 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-09-19 08:34:12 +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
b5abcd7812 Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
84146: Fix Build test failure: NodeDAOTest testRootNodeCacheEntries
      Following merge 84033 for MNT-12297: TransactionalCache equality checks lead to false negatives in a cluster
      - Change required to test method that only exists on HEAD-BUG-FIX


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@84636 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-09-18 17:26:59 +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
610afaf8a5 Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
84030: Merged V4.2-BUG-FIX (4.2.4) to HEAD-BUG-FIX (5.0/Cloud)
      83370: Merged V4.2.3 (4.2.3.1) to V4.2-BUG-FIX (4.2.4)
         79190: Merged DEV to PATCHES/V4.2.3
            79172 : MNT-12049 : After uploading a document via WebDAV using DnD or copy/paste, the document appears as locked to Alfresco
               - Unit test added


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@84620 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-09-18 17:21:03 +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
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
7426972237 Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
83530: Merged V4.2-BUG-FIX (4.2.4) to HEAD-BUG-FIX (5.0/Cloud)
      81658: Merge DEV to V4.2-BUG-FIX
       81644 : MNT-11775 : The (reject) review comment value is never shown in a moderated site rejection email.
        Fixed some code for getting correct rejection email. Added unit test. 


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@84560 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-09-18 17:08:41 +00:00
Alan Davis
71ee376714 Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
83387: ACE-2670 (Move BeanExtender from RM into core)


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@84550 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-09-18 16:53:55 +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
03cce24c7a Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
82420: Merged WAT2 (5.0/Cloud) to HEAD-BUG-FIX (5.0/Cloud)
      80335: ACE-2276 - Regression was a deliberate bug fix in activiti.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@83257 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-09-04 07:08:34 +00:00
Erik Winlof
ce18643be9 Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
82419: Merged WAT2 (5.0/Cloud) to HEAD-BUG-FIX (5.0/Cloud)
      80334: ACE-2276 - Possibly non serious regression in activiti - allow test to succeed.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@83256 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-09-04 07:08:13 +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
66693dd50c Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
82377: Merged WAT2 (5.0/Cloud) to HEAD-BUG-FIX (5.0/Cloud)
      76489: Removed checking for download events because that functionality has been removed


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@83220 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-09-04 06:51:29 +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
Will Abson
d7833d9809 Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
80768: Merged WAT1 (5.0/Cloud) to HEAD-BUG-FIX (5.0/Cloud)
      79183: Renamed one of the test method committed in r79182.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@83066 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-09-03 16:51:16 +00:00
Will Abson
28ff1951c6 Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
80767: Merged WAT1 (5.0/Cloud) to HEAD-BUG-FIX (5.0/Cloud)
      79182: Added more tests for SolrFacetServiceImpl.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@83065 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-09-03 16:51:07 +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
76e5df2cb7 Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
80628: Merged WAT1 (5.0/Cloud) to HEAD-BUG-FIX (5.0/Cloud)
      76618: Initial commit of Java service changes for facet reordering. Part of ACE-1582.
      Facet persistence has not been changed, but a property has been added to the folder
      which contains the facet nodes. This property 'facetOrder' holds a sequence of strings
      which are the ordered facet IDs.
      Facets are now returned from the SolrFacetService in a sorted order, where this explicit
      'facetOrder' is the primary source for sort order.
      The sorting algorithm falls back to using indexes if no order is available.
      It then falls back to using alphabetic sorting if no index is available.
      These last two scenarios are likely to be corner cases.
      Still to do: some enhancements to the Java service, webscripts as REST API endpoints.
                   the REST API will provide for reordering of existing facets.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@82922 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-09-03 16:12:05 +00:00
Will Abson
3599152c64 Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
80626: Merged WAT1 (5.0/Cloud) to HEAD-BUG-FIX (5.0/Cloud)
      76614: Some minor enhancements to CollectionUtils which are of general utility.
      These were made as part of work for ACE-1582.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@82920 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-09-03 16:11:45 +00:00
Will Abson
f9d9a6cb46 Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
80488: Merged WAT1 (5.0/Cloud) to HEAD-BUG-FIX (5.0/Cloud)
      73486: Added SolrFacetHelperTest into the SearchTestSuite in order to be incorporated into the automatic build.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@82786 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-09-03 15:40:16 +00:00
Will Abson
30900f9054 Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
80486: Merged WAT1 (5.0/Cloud) to HEAD-BUG-FIX (5.0/Cloud)
      73436: Added tests for the SolrFacetHelper class and the newly added method in the patch service.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@82784 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-09-03 15:39:56 +00:00
Will Abson
08aca567c4 Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
80359: Merged V4.2-BUG-FIX (4.2.4) to HEAD-BUG-FIX (5.0/Cloud)
      80255: Merged DEV to V4.2-BUG-FIX (4.2.4)
         80253: MNT-12191 : Intermittent test failure: CronScheduledQueryBasedTemplateActionDefinitionTest.testQueryTemplateFunctionsUnescapingMnt11598
         Added guarding check for the test to avoid intermittent failures.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@82738 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-09-03 15:29:57 +00:00
Will Abson
10ff05205d Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
80349: MNT-11779 Cannot create dynamic transformer transformer.complex.JodConverter... ERRORs in log
      - Allow Enterprise or AMP specific transformers to be ignored.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@82735 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-09-03 15:26:04 +00:00
Will Abson
c717551907 Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
79326: Merged EOL to HEAD-BUG-FIX (5.0/Cloud)
      79090: ACE-2013 EOL JCR, JCR-RMI, etc in 5.0
         - Removed references to http://www.jcp.org/jcr (left in web-scripts-application-context.xml
           and multiple versions of opencmis-gnamefilter-context.xml)
      78990: ACE-2013 EOL JCR, JCR-RMI, etc in 5.0
         - Removing references to "jcr-xpath" - Biggest changes were to: DocumentNavigator, NodeServiceXPath and NodeSearcher
         - SearcherComponentTest has a lot of tests removed that appeared to be JCR specific
         - There are still a lot of namespace references in XML files to http://www.jcp.org/jcr/1.0 etc.
         - Left a few  references to "JSR 170" and JCR in java classes as they looked like they might be common with other bits.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@82708 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-09-03 15:21:53 +00:00
Will Abson
387eb1b37c Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
79307: Merged V4.2-BUG-FIX (4.2.4) to HEAD-BUG-FIX (5.0/Cloud)
      79080: Merged V4.2.3 (4.2.3) to V4.2-BUG-FIX (4.2.4)
         78999: MNT-12049 : After uploading a document via WebDAV using DnD or copy/paste, the document appears as locked to Alfresco
            - Fixed build failure


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@82699 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-09-03 15:20:22 +00:00