Commit Graph

227 Commits

Author SHA1 Message Date
Alan Davis
aaa621c981 Merged 5.1-MNT1 (5.1.0) to HEAD (5.1)
115572 adavis: Merged 5.1.N (5.1.1) to 5.1-MNT1 (5.1.0)
      114988 rmunteanu: Merged 5.0.N (5.0.3) to 5.1.N (5.1.1) (PARTIAL MERGE)
         114790 amorarasu: MNT-15007: CLONE - String values when migrating from MySQL to other DBs
            Merged V4.2-BUG-FIX (4.2.6) to 5.0.N (5.0.3)
               114311 amorarasu: Merged V4.1-BUG-FIX (4.1.11) to V4.2-BUG-FIX (4.2.6)
                  114245 tvalkevych: Merged V4.1.9 (4.1.9.13) to V4.1-BUG-FIX (4.1.11)
                     113717 dhulley: MNT-14911: String values when migrating from MySQL to other DBs
                      - Add a new job that allows node string values to be re-persisted according to the current 'system.maximumStringLength' value
                      - Job is unscheduled by default
                      - Set the 'system.maximumStringLength' and the 'system.maximumStringLength.jobCronExpression'
                      - Various touched code format fixes, method naming fixes, etc


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@115702 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-10-30 00:18:31 +00:00
Alan Davis
4165e47032 Merged 5.1-MNT1 (5.1.0) to HEAD (5.1)
115460 adavis: Merged 5.1.N (5.1.1) to 5.1-MNT1 (5.1.0)
      113727 amorarasu: Merged 5.0.N (5.0.3) to 5.1.N (5.1.1)
         113684 adavis: Merged V4.2-BUG-FIX (4.2.6) to 5.0.N (5.0.3) (PARTIAL MERGE)
            113603 cturlica: Merged DEV to V4.2-BUG-FIX (4.2.6)
               113602 cturlica: MNT-14504: Cloud pull process not working after large delete


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@115670 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-10-30 00:10:30 +00:00
Alan Davis
42c5ebba5b Merged 5.0.N (5.0.3) to HEAD (5.1)
109721: Merged V4.2-BUG-FIX (4.2.6) to 5.0.N (5.0.3)
      109652: Merged V4.2.5 (4.2.5) to V4.2-BUG-FIX (4.2.6)
         109606: Merged DEV to V4.2.5 (4.2.5)
            109601: MNT-14431 : DB ArchiveAndRestoreTest fails on DB2, MariaDB, Oracle & SQL Server
              - created separate query for those DB's that don't accept limit clause


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@109802 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-08-08 08:00:30 +00:00
Alan Davis
62d972f622 Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
108044: Merged 5.0.N (5.0.3) to HEAD-BUG-FIX (5.1/Cloud)
      107731: Merged 5.0.2 (5.0.2) to 5.0.N (5.0.3)
         107679: MNT-13820 "Model can be deactivated with a node referencing the model is in trashcan"
         Use the database to check if model is in use, rather than Search
         Fix up existing tests in light of these changes


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@108075 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-07-09 22:12:29 +00:00
Alan Davis
0b09d68864 Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
108043: Merged 5.0.N (5.0.3) to HEAD-BUG-FIX (5.1/Cloud)
      107697: Merged DEV to 5.0.N (5.0.3)
         107623: MNT-14125: Errors related to sizeCurrent property.
            - Update actual_type_n and persisted_type_n to 3 (stands for long type) of cm:sizeCurrent properties which have invalid 0 types


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@108074 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-07-09 22:12:02 +00:00
Alan Davis
aaa009bd86 Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
107747: Fix for ACE-2125 Boolean properties should be supported in the predicate for transactional metadata queries.
    - also includes float and double
   Fix for ACE-2685 Error when using content length and mimetype in the same query 
    - SQL refactor removes this issue
   Fix for ACE-3889 Support the OR operator with transactional AFTS queries


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@107764 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-07-07 08:07:53 +00:00
Tatyana Valkevych
96e195b9fb Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
105524: Merged 5.0.N (5.0.3) to HEAD-BUG-FIX (5.1/Cloud)
      105458: Merged V4.2-BUG-FIX (4.2.5) to 5.0.N (5.0.3)
         105368: Merged DEV to V4.2-BUG-FIX (4.2.5)
            105328: MNT-14021 : Request to optimize db query performance when retrieving the trashcan item
               - applied limit to "select_GetArchivedNodesCannedQuery" query to optimize the general performance of the trashcan


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


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@104872 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-05-26 21:53:29 +00:00
Tatyana Valkevych
dd689fb8c4 Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
104024: Merged 5.0.N (5.0.2) to HEAD-BUG-FIX (5.1/Cloud)
      103972: Merged DEV to 5.0.N (5.0.2)
         92304: MNT-12894 : Removal of child assoc order by clauses
            - order by clause was removed in all places where it is not possible disable ordering via query parameters for alf_child_assoc queries.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@104119 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-05-13 16:24:55 +00:00
Alan Davis
ed5f1f4803 Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
102258: Support for     ACE-1021 SOLR 4 - Sharding/Replication/Cluster/CloudACE-3827    SOLR 4 - Shard based on ACL hash
   - the code to support index sharding by ACL ID and query execution


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@102534 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-04-24 11:02:58 +00:00
Tatyana Valkevych
e5505b39d7 Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
102224: Remove svn:mime-type and svn:executable from ibatis mapping files


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@102251 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-04-21 13:33:23 +00:00
Alan Davis
17e4c1b55e Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
100845: Merged 5.0.N (5.0.2) to HEAD-BUG-FIX (5.1/Cloud)
      100756: Merged V4.2-BUG-FIX (4.2.5) to 5.0.N (5.0.2)
         99878: Merged V4.1-BUG-FIX (4.1.10) to V4.2-BUG-FIX (4.2.5)
            99807: Merged DEV to V4.1-BUG-FIX (4.1.10)
               99672: MNT-12150 : Centera Connector : isContentUrlSupported is returning false for the Centera store
                  - Unit test to demonstrate issue was implemented.
                  - Previously suggested fix was also merged.
               99781: MNT-12150 : Centera Connector : isContentUrlSupported is returning false for the Centera store
                  - Updated javadoc for new method in ContentDataDAO.
                  - Corrected logic of eager cleaner. If store is read-only content should not be deleted.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@100915 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-03-31 23:13:31 +00:00
Alan Davis
8f772566bd Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
95991: Merged 5.0.N (5.0.1) to HEAD-BUG-FIX (5.1/Cloud)
      95811: Merged V4.2-BUG-FIX (4.2.5) to 5.0.N (5.0.1)
         95810: MNT-13162 : WCMQS is not working on solaris stack
            - Fixed the select that threw error with oracle db; removed 'AS' from alias syntax for table names
              Should be okay in SQL-92, but appears to be a problem with Oracle12c
              Original change was introduced in 4.2.4. Fixing this on 4.2.N and merging forward. 


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@96020 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-02-04 07:44:32 +00:00
Alan Davis
12bf60293c Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
93649: Merged 5.0.N (5.0.1) to HEAD-BUG-FIX (5.1/Cloud)
      93569: Merged V4.2-BUG-FIX (4.2.5) to 5.0.N (5.0.1)
         93479: Merged V4.2.4 (4.2.4) to V4.2-BUG-FIX (4.2.5)
            93423: MNT-13160: 30 test failures in PersonTest, InviteTest, SiteServiceTest on Oracle, SQLServer and DB2
             - Use specific concatenate functions for each dialect.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@94983 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-01-31 12:29:46 +00:00
Alan Davis
206d39db47 Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
92721: Merged 5.0.N (5.0.1) to HEAD-BUG-FIX (5.1/Cloud)
      92678: Merged V4.2-BUG-FIX (4.2.5) to 5.0.N (5.0.1)
         92593: Merged V4.1-BUG-FIX (4.1.10) to V4.2-BUG-FIX (4.2.5)
            92522: Fix MNT-13032: Forgot to change skip parameter


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@94907 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-01-31 11:56:53 +00:00
Alan Davis
8215994da0 Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
92720: Merged 5.0.N (5.0.1) to HEAD-BUG-FIX (5.1/Cloud)
      92677: Merged V4.2-BUG-FIX (4.2.5) to 5.0.N (5.0.1)
         92592: Merged V4.1-BUG-FIX (4.1.10) to V4.2-BUG-FIX (4.2.5)
            92521: Fix MNT-13032: Poor query plan for select_ChildNodeIds_Limited
             - Pull query out into a general snippet
             - Changed paging to use alf_child_assoc.child_node_id
             - Changed query sort to use child_node_id
             - No more 'filesort'


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@94906 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-01-31 11:56:43 +00:00
Alan Davis
45d980c2de Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
92415: Merged 5.0.N (5.0.1) to HEAD-BUG-FIX (5.1/Cloud)
      92316: Merged V4.2-BUG-FIX (4.2.5) to 5.0.N (5.0.1)
         92211: MNT-12862: Merged DEV to V4.2-BUG-FIX (4.2.5)
            92199: MNT-12862: Performance and memory issues cleaning up deleted nodes
               - Split statements for cleaning up deleted nodes out into a separate sql map file and create the MySQL-specific version


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@94873 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-01-31 11:49:56 +00:00
Alan Davis
c61b0ccbf0 Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
91933: Merged 5.0.N (5.0.1) to HEAD-BUG-FIX (5.1/Cloud)
      91860: Merged V4.2-BUG-FIX (4.2.5) to 5.0.N (5.0.1)
         91754: Merged V4.2.4 (4.2.4) to V4.2-BUG-FIX (4.2.5)
            91668: MNT-12809 : ORDER BY on custom metadata property without node with custom type
             Was corrected sql select query.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@94845 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-01-31 11:42:21 +00:00
Alan Davis
ff24f64c17 Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
91880: Merged 5.0.N (5.0.1) to HEAD-BUG-FIX (5.1/Cloud)
      91761: Merged V4.2-BUG-FIX (4.2.5) to 5.0.N (5.0.1)
         91686: Merged V4.2.4 (4.2.4) to V4.2-BUG-FIX (4.2.5)
            91643: Merged DEV to V4.2.4-PATCHES
               91252: MNT-12037: CLONE - User search does not return results with "<firstname> <lastname>" search in admin console users page.
                - Split entered pattern into parts and return users that match each part. 


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@94839 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-01-31 11:40:47 +00:00
Alan Davis
6fec0adb16 Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
90996: Merged V4.2-BUG-FIX (4.2.5) to HEAD-BUG-FIX (5.0/Cloud)
      90953: Merged DEV to V4.2-BUG-FIX (4.2.5)
         90913: MNT-12798 : SOLRDAO doesn't use fromTxnId when toTxnId is null
            - Fixed syntax bug in solr-common-SqlMap.xml
            - Added test


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@94759 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-01-31 11:10:26 +00:00
Alan Davis
82417e2bff Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
90238: Merged V4.2-BUG-FIX (4.2.4) to HEAD-BUG-FIX (5.0/Cloud)
      90203: Fix for     MNT-12543     AFTS: Use of Negation operations syntax
      Fix for     MNT-10528     FTS Query does not work as expected


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@94667 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-01-31 10:49:17 +00:00
Alan Davis
083402d1d0 Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
89080: Merged V4.2-BUG-FIX (4.2.4) to HEAD-BUG-FIX (5.0/Cloud)
      89079: MNT-12587: MySQL: Query to retrieve orphaned content URLs can cause memory issues
      Corrected namespace from the fix.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@94603 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-01-31 10:34:18 +00:00
Alan Davis
80db2b1110 Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
89043: Merged V4.2-BUG-FIX (4.2.4) to HEAD-BUG-FIX (5.0/Cloud)
      88875: Merged DEV (4.2.4) to V4.2-BUG-FIX (4.2.4)
         88823: MNT-12587: MySQL: Query to retrieve orphaned content URLs can cause memory issues
         Added fetchSize parameter to select_ContentUrlsOrphaned query for MySQL.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@94598 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-01-31 10:33:01 +00:00
Derek Hulley
0e7398576d ACE-2030: Clean up patches on unsupported upgrade paths to 5.0
88058: ACE-2030: Start process of retiring patches leading up to 4.0a
  88061: ACE-2030: Remove unused SQL scripts for newly-retired patches
  88062: ACE-2030: Change class names for all generic patches.
  88064: ACE-2030: Remove unused patch implementation classes and fixes to get upgrade working again.
  88067: ACE-2030: Clean up unused code and SQL for PatchDAO


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@88070 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-10-14 14:58:37 +00:00
Derek Hulley
33da30e3b8 Merged DEV to HEAD (5.0)
87810: ACE-2030: Moved retired patches into retired-patches-context.xml
  87811: ACE-2030: Clean up unused PatchDAO methods and SQL mappings


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@87814 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-10-11 21:00:25 +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
Steven Glover
9b40d6977c MNT-12369 "CryptoDoc: Cluster: removeMasterKey operation removes master key alias only on one cluster node"
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@85879 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-09-29 10:09:47 +00:00
Mark Rogers
9bb54ede62 Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
85037: Merged PLATFORM1 (5.0/Cloud) to HEAD-BUG-FIX (5.0/Cloud)
      84231: MNT-12370 "CryptoDoc: sometimes reEncryptSymmetricKeys operation doesn't reencrypt all symmetric keys at once"


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@85352 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-09-20 10:29:18 +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
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
Erik Winlof
3f5242db68 Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
78519: Merged EOL (5.0/Cloud) to HEAD-BUG-FIX (5.0/Cloud)
      78398: ACE-81 Upgrade MyBatis to 3.2.7
         - myBatis 3.2.7 upgrade onto Spring 3.2 upgrade. Merged in appropriate sections from BRANCHES/DEV/DEREK/ALF-19099 and fixed
         - myBatis namespace config issue. Full maven build with unit tests works, repo and share start and the basics seem to be working.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@82583 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-09-03 12:25:40 +00:00
Erik Winlof
e94f8f8351 Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
78429: Merged EOL (5.0/Cloud) to HEAD-BUG-FIX (5.0/Cloud)
      75801: ACE-2149: EOL AVM / WCM
       - Thorough sweep of 'avm' and 'wcm' references
       - Picked up on many 'deployment' and related classes and configuration
       - Repo starts


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@82558 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-09-03 12:13:50 +00:00
Erik Winlof
3b86753d32 Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
78416: Merged EOL (5.0/Cloud) to HEAD-BUG-FIX (5.0/Cloud)
      75791: ACE-2149: EOL AVM / WCM
       - Some (probably not all!) removal of AVM patch-related code and MyBatis config


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@82548 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-09-03 12:09:04 +00:00
Erik Winlof
0baa0f74f4 Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
78403: Merged EOL (5.0/Cloud) to HEAD-BUG-FIX (5.0/Cloud)
      75700: ACE-2149: EOL AVM / WCM
       - Remove most of the AVM and WCM beans, scripts, classes, patches, etc
       - The Explorer client is very broken for compilation
         - TODO: Remove all WCM-related functionality, which I thought would be best left to a UI dev
                 I've murdered many of the classes and beans but there's more to do
       - The repository compiles
         TODO: Get it running again
       - TODO: Check if we can wipe the 'deployment' project as well


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@82540 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-09-03 12:01:49 +00:00
Jamal Kaabi-Mofrad
ff3d6862ba ACE-1918: Surf-config patch improvements. Made:
- surfConfigFolder patch to use Cron trigger
          - surf-config SQL query more efficient
	  - changes to comments and formatting


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@73049 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-06-04 14:39:31 +00:00
Jamal Kaabi-Mofrad
5a021b2565 ACE-1447: Added 'cm:indexControl' aspect to surf-config folder and its children so they wouldn’t be indexed. Also added an asynchronous patch.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@72733 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-06-02 04:03:57 +00:00
Alan Davis
873db6ba7c ACE-1640: Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
70000: Merged V4.2-BUG-FIX (4.2.3) to HEAD-BUG-FIX (4.3/Cloud)
      69998: Merged V4.1-BUG-FIX (4.1.9) to V4.2-BUG-FIX (4.2.3)
         69997: MNT-11437: Merged V4.1.5 (4.1.5.14) to V4.1-BUG-FIX (4.1.9)
            69995: Revised fix for     MNT-11107  Documents uploaded by another user are not filtered via tags in My Files
            Fix for     MNT-11427  Impossible to start reindex process for bm-0010 and bm-0013 tests: api/solr/aclchangesets return status:502
            - fixed as described - no complex join - pull back and check inherited shared are indexed when the defining acls is indexed if it exists
            - will also be indexed if created lazily


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@70001 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-05-11 11:39:28 +00:00
Mark Rogers
f1825c7ab1 Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
68227: Merged V4.2-BUG-FIX (4.2.3) to HEAD-BUG-FIX (4.3/Cloud)
      68017: Merged V4.1-BUG-FIX (4.1.9) to V4.2-BUG-FIX (4.2.3)
         68002: Merged V4.1.5 (4.1.5.13) to V4.1-BUG-FIX (4.1.9)
            67573: MNT-11107: Merged DEV to PATCHES/V4.1.5 (4.1.5.13)
               66906: MNT-11107: Documents uploaded by another user are not filtered via tags in My Files
                  - For SolrDAO.getAcls select ACLs that are directly related to nodes or their defining acl is related to a node. Add the regression test.
            67575: MNT-11055: Merged DEV to PATCHES/V4.1.5 (4.1.5.13)
               57903: MNT-9964: DB2 unit tests failing
                  - Move 'exists' subquery from 'join on' to 'where' clause
            67658: MNT-11107: Documents uploaded by another user are not filtered via tags in My Files
               For ChangeSets Summary select also take into account ACLs that have defining ACL related to a node.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@68475 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-04-30 16:36:27 +00:00
Mark Rogers
a5543491bb Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
68189: Merged PLATFORM1 (4.3/Cloud) to HEAD-BUG-FIX (4.3/Cloud)
      63165: ACE-482: sinceTxId clause in SQL query is no longer generated unless sinceTxId is non-null


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@68454 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-04-30 16:25:13 +00:00
Alan Davis
b1c279bdaf Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
64703: Fix ACE-987: NPE in NodeEntity during post-commit write through to shared cache
    - Query selecting specific root nodes was not fully populating the stored entity
    - The failure itself mainly occurs when a check is made to prevent duplication of cache transfers
      (the cached value is the same); once the cache has an entry, the error would not have
      occurred again.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@66181 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-04-02 19:45:56 +00:00
Alan Davis
4707e6cd48 Merged HEAD-BUG-FIX (Cloud33/4.3) to HEAD (Cloud33/4.3)
62939: Merged PLATFORM1 (Cloud33) to HEAD-BUG-FIX (Cloud33/4.3)
      62289: Merged BRANCHES/DEV/mward/plat1_hybrid_search to BRANCHES/DEV/PLATFORM1:
         61145: ACE-482: very simple start to Hybrid DB/SOLR search.
         61236: ACE-482: added last indexed transaction ID to search results.
         61254: ACE-482: added repo-side support for "lastIndexedTx" from SOLR results
         61508: ACE-482: DbOrIndexSwitchingQueryLanguage uses sinceTxId search param to perform DB search for unindexed content.
         61523: ACE-482: Improved unit tests for DbOrIndexSwitchingQueryLanguage
         61656: ACE-482: Retrieves a changed nodes list, and removes these from index results before adding DB search results.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@62993 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-02-20 15:05:11 +00:00
Alan Davis
2493ba39ac Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
58494: Merged V4.2-BUG-FIX (4.2.1) to HEAD-BUG-FIX (Cloud/4.3)
      58406: Merged V4.1-BUG-FIX (4.1.8) to V4.2-BUG-FIX (4.2.1)
         58389: Fix for MNT-9272 	Duplicate entry error after LDAP sync with user with different case from alf_authority 
         - authority case changes that imply updates that violate integrity constraints are supported.
         - if permissions exist for a non existent user "BOB" and an existing user "bob" is updated to "BOB"
              - all "bob"'s permissions will be migrated and "BOB"s  will be added (as they are treated as one and the same)


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@61995 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-02-11 23:40:19 +00:00
Alan Davis
ba6f6c4b97 Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
58204: Merged V4.2-BUG-FIX (4.2.1) to HEAD-BUG-FIX (Cloud/4.3)
      58144: Merged V4.1-BUG-FIX (4.1.8) to V4.2-BUG-FIX (4.2.1)
         58027: Merged DEV to V4.1-BUG-FIX (4.1.8)
            57903 : MNT-9964: DB2 unit tests failing
               - Move 'exists' subquery from 'join on' to 'where' clause


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@61943 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-02-11 23:00:09 +00:00
Alan Davis
32b6e12b9e Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
57246: Merged V4.2-BUG-FIX (4.2.1) to HEAD-BUG-FIX (Cloud/4.3)
      57226: Reverse Merge back to the original now we know r57085 caused the two errors
         57222: Reverse Merge in attempt to work out which commit causes the two EmbeddedSolrTest test failures in https://bamboo.alfresco.com/bamboo/browse/ALF-ENTERPRISEV42BUGFIX-23
            57116: Merged V4.1-BUG-FIX (4.1.7) to V4.2-BUG-FIX (4.2.1)
               56986: MNT-9829: Merged V4.1.5 (4.1.5.10) to V4.1-BUG-FIX (4.1.7)
                  56818: Fix for     MNT-9706  Big amount of alf_acl_change_set entries slowing down massively index times and prevent access to report / summary pages of SOLR
                  56848: Fix for     MNT-9706  Big amount of alf_acl_change_set entries slowing down massively index times and prevent access to report / summary pages of SOLR
                  - moved to join, count and group by    as having is causing issues.
                  56868: Fix for     MNT-9706  Big amount of alf_acl_change_set entries slowing down massively index times and prevent access to report / summary pages of SOLR
                  - also protect direct acl fetch with node exists test
                  - fix test to use a sensible loop .....
         57224: Reverse Merge in attempt to work out which commit causes the two EmbeddedSolrTest test failures in https://bamboo.alfresco.com/bamboo/browse/ALF-ENTERPRISEV42BUGFIX-23
            57082: Merged V4.1-BUG-FIX (4.1.7) to V4.2-BUG-FIX (4.2.1)
               56949: Fix for     MNT-9456  SOLR: Index error count does not decrease even if you delete/fix the problematic doc 
               - counts undeleted docs


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@61801 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-02-11 20:31:30 +00:00
Alan Davis
3584a3249a Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
57242: Merged V4.2-BUG-FIX (4.2.1) to HEAD-BUG-FIX (Cloud/4.3)
      57222: Reverse Merge in attempt to work out which commit causes the two EmbeddedSolrTest test failures in https://bamboo.alfresco.com/bamboo/browse/ALF-ENTERPRISEV42BUGFIX-23
         << was not this one >>
         57116: Merged V4.1-BUG-FIX (4.1.7) to V4.2-BUG-FIX (4.2.1)
            56986: MNT-9829: Merged V4.1.5 (4.1.5.10) to V4.1-BUG-FIX (4.1.7)
               56818: Fix for     MNT-9706  Big amount of alf_acl_change_set entries slowing down massively index times and prevent access to report / summary pages of SOLR
               56848: Fix for     MNT-9706  Big amount of alf_acl_change_set entries slowing down massively index times and prevent access to report / summary pages of SOLR
               - moved to join, count and group by    as having is causing issues.
               56868: Fix for     MNT-9706  Big amount of alf_acl_change_set entries slowing down massively index times and prevent access to report / summary pages of SOLR
               - also protect direct acl fetch with node exists test
               - fix test to use a sensible loop .....


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@61797 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-02-11 20:28:17 +00:00
Alan Davis
53fdfb2593 Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
57233: Merged V4.2-BUG-FIX (4.2.1) to HEAD-BUG-FIX (Cloud/4.3)
      57116: Merged V4.1-BUG-FIX (4.1.7) to V4.2-BUG-FIX (4.2.1)
         56986: MNT-9829: Merged V4.1.5 (4.1.5.10) to V4.1-BUG-FIX (4.1.7)
            56818: Fix for     MNT-9706  Big amount of alf_acl_change_set entries slowing down massively index times and prevent access to report / summary pages of SOLR
            56848: Fix for     MNT-9706  Big amount of alf_acl_change_set entries slowing down massively index times and prevent access to report / summary pages of SOLR
            - moved to join, count and group by    as having is causing issues.
            56868: Fix for     MNT-9706  Big amount of alf_acl_change_set entries slowing down massively index times and prevent access to report / summary pages of SOLR
            - also protect direct acl fetch with node exists test
            - fix test to use a sensible loop .....


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@61788 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-02-11 20:21:04 +00:00
Alan Davis
fcea63a25f Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
57074: Merged V4.2-BUG-FIX (4.2.1) to HEAD-BUG-FIX (Cloud/4.3)
      56561: Merged V4.1-BUG-FIX (4.1.7) to V4.2-BUG-FIX (4.2.1)
         56137: Merged DEV to V4.1-BUG-FIX (4.1.7)
            56091: MNT-9483 : FeedCleaner on Oracle broken, regression of MNT-8527
            Added a check for site network to be null for a feed, which will result in a an null row returned from MyBatis.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@61705 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-02-11 19:15:50 +00:00
Andrew Hind
2429d0a852 Reversed revision 56078
Fix for     ALF-20138   Metadata query results include nodes that would be hidden (ie not indexed) in SOLR or lucene 
    Fix for     ALF-20148   Hidden files such as surf-config are visible in dashlets etc. after upgrade from 4.0.2 > 4.2.0 if using MDQ


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@56096 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2013-09-27 14:04:15 +00:00
Andrew Hind
5081066738 Fix for ALF-20138 Metadata query results include nodes that would be hidden (ie not indexed) in SOLR or lucene
Fix for     ALF-20148   Hidden files such as surf-config are visible in dashlets etc. after upgrade from 4.0.2 > 4.2.0 if using MDQ

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@56078 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2013-09-27 09:26:51 +00:00
Andrew Hind
f89f2abff4 Fix for Bug ALF-19985 Metadata query performance - remove store join, make node id based -> better ordering and large result set performance (x2-x3)
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@55166 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2013-09-10 10:05:15 +00:00