Commit Graph

434 Commits

Author SHA1 Message Date
Pavel Yurke
46ceced321 Merged HEAD-MNT-2904 to HEAD (5.0.0)
89997: ACE-2904: Localised labels for type, aspect and property definitions are no longer returned
      - Update base types. Appropriate unit test was added.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@90092 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-11-07 10:47:34 +00:00
Pavel Yurke
4e858163a8 Merged HEAD-MNT-2904 to HEAD (5.0.0)
89844:ACE-2904: Localised labels for type, aspect and property definitions are no longer returned
         - Update of typeDefInclProperties property definitions is required. Updated unit test to check functionality.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@89864 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-11-04 14:38:28 +00:00
Pavel Yurke
4e57f75adf Merged HEAD-MNT-2904 to HEAD (5.0.0)
89796: Merged DEV to HEAD-MNT-2904
      88615: ACE-2904: Localised labels for type, aspect and property definitions are no longer returned
         - Fix for side effect of ACE-1996, when initial title/description resolving was removed. Now, it will be resolved, when we are going to get type definition for the first time. Appropriate unit test was added.
      89240: ACE-3322: CMIS Types have lost display names - breaks workbench
         - Update child definitions.
      89482: ACE-2904: Localised labels for type, aspect and property definitions are no longer returned
         - Fix that updates property\properties of type definition. Unit test was added that checks for update children type defs and properties.
      89775:  ACE-2904: Localised labels for type, aspect and property definitions are no longer returned
         - Fix that won't update property\properties of type definition on initialization phase (resolveInheritance method invocation).


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@89836 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-11-04 08:23:57 +00:00
Matt Ward
d9c11a7ca7 Merged BRANCHES/DEV/mward/head_cachestats to HEAD:
89575: ACE-3327: Work In Progress. TX cache statistics.
   89642: ACE-3327: Exposes statistics through JMX. Adds hit ratio.
   89649: ACE-3327: Added "@since 5.0" to new classes.
   89691: ACE-3327: improved TransactionalCache stats tests.
   89743: ACE-3327: fixed lack of thread safety for InMemoryCacheStatistics.
   89752: ACE-3327: now possible to disable/enable tx cache statistics per-cache with properties.



git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@89798 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-11-03 18:08:50 +00:00
Pavel Yurke
72ce672d17 Reverse Merged - Fix causes deadlock in tests
89542: Merged DEV to HEAD (5.0.0)
      88615: ACE-2904: Localised labels for type, aspect and property definitions are no longer returned
         - Fix for side effect of ACE-1996, when initial title/description resolving was removed. Now, it will be resolved, when we are going to get type definition for the first time. Appropriate unit test was added.
      89240: ACE-3322: CMIS Types have lost display names - breaks workbench
         - Update child definitions.
      89482: ACE-2904: Localised labels for type, aspect and property definitions are no longer returned
         - Fix that updates property\properties of type definition. Unit test was added that checks for update children type defs and properties.

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@89587 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-10-31 08:49:17 +00:00
Pavel Yurke
a445c6bf80 Merged DEV to HEAD (5.0.0)
88615: ACE-2904: Localised labels for type, aspect and property definitions are no longer returned
      - Fix for side effect of ACE-1996, when initial title/description resolving was removed. Now, it will be resolved, when we are going to get type definition for the first time. Appropriate unit test was added.

   89240: ACE-3322: CMIS Types have lost display names - breaks workbench 
      - Update child definitions.

   89482: ACE-2904: Localised labels for type, aspect and property definitions are no longer returned
      - Fix that updates property\properties of type definition. Unit test was added that checks for update children type defs and properties.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@89542 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-10-30 13:48:37 +00:00
Pavel Yurke
200b3c4ff3 Revert of R 88659 ACE-2904
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@89267 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-10-28 09:57:02 +00:00
Pavel Yurke
c9dbaa773a ACE-2224: Merged DEV to HEAD (5.0/Cloud)
89023: ACE-2224: Could not re-applying ACL by cmis api request using Atom binding
      - Report only repo permissions if onlyBasicPermissions is 'false', but do revert conversion if cmis basic permission has exact matching. Remove MNT-4561 changes to avoid clever logic. Restore unit test for MNT-10165 scenario. Allow apply empty set of direct permissions if node inherits parent permissions. In onlyBasicPermissions mode report only one cmis permission if one was set.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@89123 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-10-24 14:52:08 +00:00
Pavel Yurke
6b1b075584 ACE-2224: Reverse Merge HEAD (5.0/Cloud)
74808: Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (4.3/Cloud)
      73693: Merged V4.2-BUG-FIX (4.2.3) to HEAD-BUG-FIX (4.3/Cloud)
         73621: MNT-10165: CMIS 1.1 API: Impossible to remove ACL through Atom binding
            - Fix test failure - fix CMISTest to not affect on AuthorityServiceTest
   74803: Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (4.3/Cloud)
      73688: Merged V4.2-BUG-FIX (4.2.3) to HEAD-BUG-FIX (4.3/Cloud)
         73548: MNT-10165: Merged DEV to V4.2-BUG-FIX (4.2.3)
            61161: MNT-10165: CMIS 1.1 API: Impossible to remove ACL through Atom binding
               - Detect permission to delete for principal and also find and delete all the concomitant basic CMIS permissions. Add unit test.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@88915 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-10-22 12:30:57 +00:00
Kevin Roast
9376ec3b44 ACE-3175
- First part, fix embarrassing spelling mistakes in public API methods and bean settings.

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@88884 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-10-22 09:13:24 +00:00
Pavel Yurke
338aa7904d Merged DEV to HEAD (5.0.0)
88615: ACE-2904: Localised labels for type, aspect and property definitions are no longer returned
      - Fix for side effect of ACE-1996, when initial title/description resolving was removed. Now, it will be resolved, when we are going to get type definition for the first time. Appropriate unit test was added.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@88659 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-10-17 16:45:37 +00:00
Jamal Kaabi-Mofrad
9b4a83ac2d Added UNIT tests for the SpellCheckDecisionManager class.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@88630 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-10-17 12:53:48 +00:00
Ahmed Owian
f16b1ac567 ACE-3121: Workflow Admin Console: Cannot change priority for activiti
- Removed priority value validation.  Just checked the type.
   - TODO: Determine if DelegateTask also needs similar handling

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@88560 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-10-16 21:50:10 +00:00
Ahmed Owian
24560c0afd ACE-3121: Workflow Admin Console: Cannot change priority for activiti
- Handled priority property for Task
   - Determine if DelegateTask also needs similar handling

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@88557 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-10-16 21:34:08 +00:00
Derek Hulley
c5ac017dfb ACE-2030: Remove some patches for V3.1, including Version store migrator
- Deprecated VersionStore V1 is no longer usable by any means
 - Various scripts and other patches retired


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@87775 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-10-10 17:12:57 +00:00
Jamal Kaabi-Mofrad
76361fbf61 ACE-3083: Fixed facets reordering/retrieving when a default facet is removed from the config file, but it has already been persisted.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@87764 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-10-10 16:31:50 +00:00
Jamal Kaabi-Mofrad
37309f11d7 Removed "cm:description" facet from the default filters.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@87669 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-10-09 12:19:30 +00:00
Ahmed Owian
b6cf2c6513 ACE-2092: EOL Lucene
- Renamed lucene to buildonly in tests
   - TODO:
   - Add to ERROR message about upgrading to Solr

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@86431 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-10-03 16:32:35 +00:00
Alex Mukha
0c9de67714 Merged DEV (5.0.0) to HEAD (5.0/Cloud)
86091: ACE-1061 : SQL Server: ArchiveAndRestoreTest.testListArchivedNodesFilter fails
   Disabled case-sensitive filtering as not required.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@86359 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-10-03 06:17:59 +00:00
Pavel Yurke
7cf754053f Merged DEV to HEAD (5.0)
85993 : ACE-2181 : Non-owner cannot execute cancel editing for content
      - Tests changes according to new lock store behavior 
   86133 : ACE-2181 : Non-owner cannot execute cancel editing for content
      - Added test case - attempt to unlock node by user who has ALL_PERMISSIONS 


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@86239 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-10-02 09:43:43 +00:00
Pavel Yurke
ef5954a1a4 Reverse merged HEAD (5.0/Cloud)
<< Put the code back to HEAD >>
   86049 : Reverse merged HEAD (5.0/Cloud)
      << Cause of 4 errors in https://bamboo.alfresco.com/bamboo/browse/ALF-ENT-141 >>
      85880: 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
      85881: 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@86238 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-10-02 09:39:02 +00:00
Alan Davis
58408c3eae Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
<< Fix for  ActivitiTimerExecutionTest failure on HEAD taking place 50% of the time in last few days >> 
   85907: Merged DEV (5.0.0.BF) to HEAD-BUG-FIX (5.0/Cloud)
      85758: MNT-12398 : FeedNotifier - Users mixed up, fail to send notification email
      Changed the timing logic in ActivitiTimerExecutionTest to avoid possible deadlocks.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@86051 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-09-30 22:28:41 +00:00
Alan Davis
b8ddc53af2 Reverse merged HEAD (5.0/Cloud)
<< Cause of 4 errors in https://bamboo.alfresco.com/bamboo/browse/ALF-ENT-141 >>
   85880: 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
   85881: 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@86049 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-09-30 22:15:25 +00:00
Alan Davis
72ba2b31bf ACE-2564:
- fix MailActionExecuterTest testSendEmailByExternalUser test: Looks like format is wrong but the date is as expected

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@86048 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-09-30 22:00:21 +00:00
Pavel Yurke
290f3ec8a0 ACE-2564: Merged DEV to HEAD (5.0/Cloud)
85938: ACE-2564: Cloud - No task assignment email notification when a task is created by an External User
      - Run as primary tenant for user to retrieve fromActualUser email property. Add unit test.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@85988 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-09-30 11:02:14 +00:00
Jamal Kaabi-Mofrad
7f4cf333fd Fixed failing tests as a result of r85946 commit.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@85963 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-09-30 02:11:00 +00:00
Jamal Kaabi-Mofrad
fc8c649191 - Refactored facet display handlers
- Changed date buckets implementation to use Solr Date math
- Added Site title display handler as well as a test for it
- Reverted back Neil’s work to inject the "special" facet IDs (SITE, TAG etc) from the solr-facets-context.xml as I re-wrote the SolrFacetHelper class.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@85946 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-09-29 21:14:26 +00:00
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