5053 Commits

Author SHA1 Message Date
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
465034f0be Fixed test failures as a result of r72733 commit.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@72764 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-06-02 12:16:21 +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
Andrew Hind
5aa463989c Fix for:
ACE-1826    Solr: Search not working on some dashlets
    ACE-1827    "Could not retrieve tags error" was detected for Reprository.
    ACE-1830    BM-0010, BM-0013 tests didn't completely run for 4.3.0 b1717.

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@71934 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-05-27 16:40:19 +00:00
David Draper
5d73fd5185 Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
70698: Merged WAT1 (4.3/Cloud) to HEAD-BUG-FIX (4.3/Cloud)
      69833: ACE-1581: Updated the facet display handlers to handle "<field-facet>__.u" rather than "<field-facet>__"


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@70929 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-05-19 12:53:47 +00:00
David Draper
cf0542eb10 Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
70692: Merged WAT1 (4.3/Cloud) to HEAD-BUG-FIX (4.3/Cloud)
      69799: ACE-1605: Fixed Created and Modified date filters.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@70923 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-05-19 12:52:21 +00:00
David Draper
1b5a5dd2ec Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
70683: Merged WAT1 (4.3/Cloud) to HEAD-BUG-FIX (4.3/Cloud)
      69739: ACE-1615: Corrected spelling error.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@70915 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-05-19 12:50:06 +00:00
David Draper
13c1057ba7 Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
70682: Merged WAT1 (4.3/Cloud) to HEAD-BUG-FIX (4.3/Cloud)
      69736: ACE-1615: Fixed the search result to return empty arrays for field facets, when no facet queries are available.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@70914 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-05-19 12:49:53 +00:00
David Draper
98e88f9d65 Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
70681: Merged WAT1 (4.3/Cloud) to HEAD-BUG-FIX (4.3/Cloud)
      69090: Updated the java doc in SolrFacetHelper class as well as removed the un-necessary LinkedHashMap.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@70913 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-05-19 12:49:39 +00:00
David Draper
ad28258976 Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
70680: Merged WAT1 (4.3/Cloud) to HEAD-BUG-FIX (4.3/Cloud)
      69081: ACE-1265: Fixed the selected Date/Size range filtering
      	- Added insertion index for the facet label, to help the Date/Size sorting labels in the UI.
      	- A minor optimization in SolrFacetHelper.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@70911 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-05-19 12:49:26 +00:00
David Draper
c22799ddfa Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
70676: Merged WAT1 (4.3/Cloud) to HEAD-BUG-FIX (4.3/Cloud)
      68560: ACE-1265: removed the setter method in the SolrFacetHelper, to close any window of vulnerability.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@70907 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-05-19 12:48:27 +00:00
David Draper
4d920b21e9 Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
70675: Merged WAT1 (4.3/Cloud) to HEAD-BUG-FIX (4.3/Cloud)
      68557: ACE-1265: added Created date, Modified date, and Content size bucketing. Also, refactored the facet display label implementation.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@70906 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-05-19 12:48:13 +00:00
David Draper
00ef38d6e8 Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
70596: Merged WAT1 (4.3/Cloud) to HEAD-BUG-FIX (4.3/Cloud)
      67363: ACE-1264, ACE-1270: added support for the facet value results, to include display-name for userID and mimetype.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@70828 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-05-19 12:29:03 +00:00
Alan Davis
8199f45483 Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
70544: Merged WAT1 (4.3/Cloud) to HEAD-BUG-FIX (4.3/Cloud)
      66789: Merged BRANCHES/DEV/KEVINR to BRANCHES/DEV/WAT1 (all faceted search prototype commits)


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@70774 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-05-19 12:14:59 +00:00
Alan Davis
359a977540 Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
70246: Add "pdf" to the list of possible contexts in which a transformation may take place. Used in JMX client.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@70497 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-05-16 20:42:42 +00:00
Alan Davis
10f8ccb903 Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
70226: Merged V4.2-BUG-FIX (4.2.3) to HEAD-BUG-FIX (4.3/Cloud)
      70137: Reverse Merge V4.2-BUG-FIX (4.2.3)
         << Commit appears to have resulted in lots of build errors. Not obvious why. >>
         70056: Merged DEV to V4.2-BUG-FIX (4.2.3)
            69689 : MNT-10946 : Admin is no longer able to unlock files 
               - Check if node is locked for non-admin users. Fix related test
            69751 : MNT-10946 : Admin is no longer able to unlock files 
               - Changed warn message


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@70491 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-05-16 20:36:33 +00:00
Alan Davis
32ba9f0af2 Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
70225: Merged V4.2-BUG-FIX (4.2.3) to HEAD-BUG-FIX (4.3/Cloud)
      70073: Fixed stream closure handling, updated javadocs and cleaned up as an aside to MNT-11098


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@70490 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-05-16 20:35:31 +00:00
Alan Davis
5102185ae0 Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
70224: Merged V4.2-BUG-FIX (4.2.3) to HEAD-BUG-FIX (4.3/Cloud)
      70072: Removed unused imports found during investigation


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@70489 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-05-16 20:34:30 +00:00
Alan Davis
a6e1c48e84 Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
70223: Merged V4.2-BUG-FIX (4.2.3) to HEAD-BUG-FIX (4.3/Cloud)
      70056: Merged DEV to V4.2-BUG-FIX (4.2.3)
         69689 : MNT-10946 : Admin is no longer able to unlock files 
            - Check if node is locked for non-admin users. Fix related test
         69751 : MNT-10946 : Admin is no longer able to unlock files 
            - Changed warn message


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@70488 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-05-16 20:33:29 +00:00
Alan Davis
e7b0d805ed Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
70042: Merged V4.2-BUG-FIX (4.2.3) to HEAD-BUG-FIX (4.3/Cloud)
      70038: Merged V4.1-BUG-FIX (4.1.9) to V4.2-BUG-FIX (4.2.3)
         - Fix build Automatic merge removed imports
         69858: MNT-11371: Alfresco unable to bootstrap due to LockTryExceptions following an upgrade from 3.4.8 -> 3.4.13 -> 4.0.2 to either 4.1.8 or 4.2.1
         Additional boolean parameter 'haveWriteLock' has been added to 'MessageServiceImpl.getResourceBundleBaseNames()' method. It serves to avoid unlocking external write locks. The method still assumes that read lock is acquired if 'haveWriteLock=false'. Read lock will be upgraded to write lock only if 'haveWriteLock' parameter is equal to false


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@70477 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-05-16 20:21:52 +00:00
Alan Davis
64970f7889 Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
70028: Merged V4.2-BUG-FIX (4.2.3) to HEAD-BUG-FIX (4.3/Cloud)
      70023: Merged V4.1-BUG-FIX (4.1.9) to V4.2-BUG-FIX (4.2.3)
         69858: MNT-11371: Alfresco unable to bootstrap due to LockTryExceptions following an upgrade from 3.4.8 -> 3.4.13 -> 4.0.2 to either 4.1.8 or 4.2.1
         Additional boolean parameter 'haveWriteLock' has been added to 'MessageServiceImpl.getResourceBundleBaseNames()' method. It serves to avoid unlocking external write locks. The method still assumes that read lock is acquired if 'haveWriteLock=false'. Read lock will be upgraded to write lock only if 'haveWriteLock' parameter is equal to false


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@70474 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-05-16 20:18:50 +00:00
Alan Davis
2073978995 Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
70027: Merged V4.2-BUG-FIX (4.2.3) to HEAD-BUG-FIX (4.3/Cloud)
      70022: Merged V4.1-BUG-FIX (4.1.9) to V4.2-BUG-FIX (4.2.3)
         69848: Merged DEV 4.2.N to V4.1-BUG-FIX (4.1.9)
            69603: MNT-11371: Alfresco unable to bootstrap due to LockTryExceptions following an upgrade from 3.4.8 -> 3.4.13 -> 4.0.2 to either 4.1.8 or 4.2.1
              Ability to configure try lock timeout for several different contexts has been implemented. New configuration for every context has been added:
              - system.lockTryTimeout=100
              - system.lockTryTimeout.DictionaryDAOImpl=2000
              - system.lockTryTimeout.MessageServiceImpl=${system.lockTryTimeout}
               - system.lockTryTimeout.PolicyComponentImpl=${system.lockTryTimeout}
              'LockHelper.tryLock()' has been modified to accept additional string 'useCase' parameter. Parameter is used for throwing exceptions with contextual messages when lock is not acquired


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@70473 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-05-16 20:17:50 +00:00
Alan Davis
54e1dc2a66 Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
69953: Merged V4.2-BUG-FIX (4.2.3) to HEAD-BUG-FIX (4.3/Cloud)
      69919: Fix build error related to the following merge.
         << Forgot to make sure the new file had the changes that were only in V4.2-BUG-FIX >>
         Merged V4.1-BUG-FIX (4.1.9) to V4.2-BUG-FIX (4.2.3)
            69831: MNT-11192: TestModel.java removed from alfresco-repository-xxx.jar
                - moved TestModel.java back from **/test-java/** to **/java/**


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@70469 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-05-16 20:13:49 +00:00
Alan Davis
9526c89138 Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
69952: Merged V4.2-BUG-FIX (4.2.3) to HEAD-BUG-FIX (4.3/Cloud)
      69917: Merged V4.1-BUG-FIX (4.1.9) to V4.2-BUG-FIX (4.2.3)
         69831: MNT-11192: TestModel.java removed from alfresco-repository-xxx.jar
             - moved TestModel.java back from **/test-java/** to **/java/**


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@70468 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-05-16 20:12:49 +00:00
Alan Davis
a2d120e503 Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
69951: Merged V4.2-BUG-FIX (4.2.3) to HEAD-BUG-FIX (4.3/Cloud)
      69870: MNT-11310 : Applying patch 'patch.siteLoadPatch.swsdp': Error message when applying patch in read-only mode
        - Using global instance of retryingTransactionHelper at patch transaction and using correct runAs user 
        - correct restoring of fullyAuthenticatedUser
      Note that this fix requires the changes to the RetryingTransactionHelper that precede it


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@70467 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-05-16 20:11:48 +00:00
Alan Davis
85c8583145 Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
69950: Merged V4.2-BUG-FIX (4.2.3) to HEAD-BUG-FIX (4.3/Cloud)
      69869: Fix action's runAs user (found investigating MNT-11310)


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@70466 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-05-16 20:10:47 +00:00
Alan Davis
5763abbf6d Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
69949: Merged V4.2-BUG-FIX (4.2.3) to HEAD-BUG-FIX (4.3/Cloud)
      69867: Fix handling of non-propagating transactions embedded in write transactions that have been forced writable (MNT-11310)
       - Test to demonstrate the failure
       - Regardless of whether a RetryingTransactionHelper was going to create a new transaction (non-propagating) or not,
         it did a sanity check of its read-write state against the desired state.  This was kicking things out for cases
         where the RetryingTransactionInterceptor should just have been going along with the current transaction.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@70465 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-05-16 20:09:47 +00:00
Alan Davis
81d2356496 Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
69948: Merged V4.2-BUG-FIX (4.2.3) to HEAD-BUG-FIX (4.3/Cloud)
      69866: Merged V4.2.2 to V4.2-BUG-FIX (V4.2.3)
         69863: Fix edge-case read-only server browsing of sites that require the tagscope aspect (MNT-11310)
         69864 (RECORD-ONLY): Removed deep svn:mergeinfo
         69865 (RECORD-ONLY): Undo r69863 (MNT-11310) as incorrect branch


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@70464 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-05-16 20:08:47 +00:00
Alan Davis
9898a4c200 Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
69947: Merged V4.2-BUG-FIX (4.2.3) to HEAD-BUG-FIX (4.3/Cloud)
      69861: MNT-11371: Alfresco unable to bootstrap due to LockTryExceptions following an upgrade from 3.4.8 -> 3.4.13 -> 4.0.2 to either 4.1.8 or 4.2.1
      Merged 4.1.N to V4.2.N (4.2.3)
         69858: MNT-11371: Alfresco unable to bootstrap due to LockTryExceptions following an upgrade from 3.4.8 -> 3.4.13 -> 4.0.2 to either 4.1.8 or 4.2.1
           Additional boolean parameter 'haveWriteLock' has been added to 'MessageServiceImpl.getResourceBundleBaseNames()' method. It serves to avoid unlocking external write locks. The method still assumes that read lock is acquired if 'haveWriteLock=false'. Read lock will be upgraded to write lock only if 'haveWriteLock' parameter is equal to false


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@70463 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-05-16 20:07:48 +00:00
Alan Davis
c505322c35 Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
69946: Merged V4.2-BUG-FIX (4.2.3) to HEAD-BUG-FIX (4.3/Cloud)
      69860: MNT-11371: Alfresco unable to bootstrap due to LockTryExceptions following an upgrade from 3.4.8 -> 3.4.13 -> 4.0.2 to either 4.1.8 or 4.2.1
      Merged 4.1.N to V4.2.N (4.2.3)
         69848: MNT-11371: Alfresco unable to bootstrap due to LockTryExceptions following an upgrade from 3.4.8 -> 3.4.13 -> 4.0.2 to either 4.1.8 or 4.2.1
           Ability to configure try lock timeout for several different contexts has been implemented. New configuration for every context has been added:
           - system.lockTryTimeout=100
           - system.lockTryTimeout.DictionaryDAOImpl=2000
           - system.lockTryTimeout.MessageServiceImpl=${system.lockTryTimeout}
            - system.lockTryTimeout.PolicyComponentImpl=${system.lockTryTimeout}
           'LockHelper.tryLock()' has been modified to accept additional string 'useCase' parameter. Parameter is used for throwing exceptions with contextual messages when lock is not acquired
         69858: MNT-11371: Alfresco unable to bootstrap due to LockTryExceptions following an upgrade from 3.4.8 -> 3.4.13 -> 4.0.2 to either 4.1.8 or 4.2.1
           Additional boolean parameter 'haveWriteLock' has been added to 'MessageServiceImpl.getResourceBundleBaseNames()' method. It serves to avoid unlocking external write locks. The method still assumes that read lock is acquired if 'haveWriteLock=false'. Read lock will be upgraded to write lock only if 'haveWriteLock' parameter is equal to false


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@70462 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-05-16 20:06:48 +00:00
Alan Davis
dab8858288 Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
69924: Merged V4.2-BUG-FIX (4.2.3) to HEAD-BUG-FIX (4.3/Cloud)
      69817: Merged V4.1-BUG-FIX (4.1.9) to V4.2-BUG-FIX (4.2.3)
         69777: Merged DEV to V4.1-BUG-FIX (4.1.9)
            69741: MNT-10023: Activities - deletions may not be listed
               - Implemented functionality that will check original parent node permission (even if it has been archived too), when archived node has not read permission with inherit flag (true). This approach is used for appropriate feed creation.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@70456 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-05-16 17:56:19 +00:00
Alan Davis
c5abaaec03 Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
69767: Merged V4.2-BUG-FIX (4.2.3) to HEAD-BUG-FIX (4.3/Cloud)
      69723: MNT-11123 : Test failure in TestEnterpriseAtomPubTCK
       Added code which check status of node (it has private working copy).
      Merged DEV to 4.2-BUG-FIX
      67109 : MNT-11123 : Test failure in TestEnterpriseAtomPubTCK
       Fixed RenditionServiceIntegrationTest.testRenderPdfDocumentLongRunningCheckout test. 


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@70450 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-05-16 17:50:11 +00:00
Alan Davis
f38ddabb2d Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
69765: Merged V4.2-BUG-FIX (4.2.3) to HEAD-BUG-FIX (4.3/Cloud)
      69685: Merged V4.1-BUG-FIX (4.1.9) to V4.2-BUG-FIX (4.2.3)
         68638: Merged DEV to V4.1-BUG-FIX (4.1.9)
            68070 : MNT-11289 : Sites deleted in 2013 cannot be restored in 2014
               - Recreate groups when a site is restored on condition that the groups are missing. Make current user site manager if there is no site managers. Fix related test


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@70448 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-05-16 17:47:59 +00:00
Alan Davis
b31ac27b22 Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
68541: Merged V4.2-BUG-FIX (4.2.3) to HEAD-BUG-FIX (4.3/Cloud)
      68489: MNT-11225: Problem with pdf-text extraction, spaces between letters in many of the words
         - Removed debugging sys out


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@70424 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-05-16 17:18:37 +00:00
Alan Davis
cf0089b9b7 Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
68540: Merged V4.2-BUG-FIX (4.2.3) to HEAD-BUG-FIX (4.3/Cloud)
      68479: MNT-11225: Problem with pdf-text extraction, spaces between letters in many of the words
         - Added PdfParserConfig config field which is added to the ParseContext if present


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@70422 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-05-16 16:39:52 +00:00
Alan Davis
6a0ead3dc1 Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
68536: Merged V4.2-BUG-FIX (4.2.3) to HEAD-BUG-FIX (4.3/Cloud)
      68314: Merged V4.1-BUG-FIX (4.1.9) to V4.2-BUG-FIX (4.2.3)
         68272: MNT-11349: Merged V4.1.7 (4.1.7.9) to V4.1-BUG-FIX (4.1.9)
            67241: MNT-11185 : 4.1.7.7HF calls onContentUpdate policies twice when using ftp or cifs (once with webdav)
               - Remove ASPECT_NO_CONTENT after content is added


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@70417 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-05-16 16:35:51 +00:00
Alan Davis
ca174bab71 Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
68535: Merged V4.2-BUG-FIX (4.2.3) to HEAD-BUG-FIX (4.3/Cloud)
      68313: Merged V4.1-BUG-FIX (4.1.9) to V4.2-BUG-FIX (4.2.3)
         68271: MNT-11348: Merged V4.1.1 (4.1.1.28) to V4.1-BUG-FIX (4.1.9)
            67447: MNT-11057: Bug in replication process on Aliens.
            Ignore a node that has no invadedBy property value (has no  alien aspect).
            Implemented unit-test.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@70415 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-05-16 16:34:47 +00:00
Alan Davis
c74100a1fa Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
68534: Merged V4.2-BUG-FIX (4.2.3) to HEAD-BUG-FIX (4.3/Cloud)
      68311: Merged V4.1-BUG-FIX (4.1.9) to V4.2-BUG-FIX (4.2.3)
         68270: MNT-11347: Merged V4.1.4 (4.1.4.28) to V4.1-BUG-FIX (4.1.9)
            66989: MNT-11026 Version indicators after publishing a document are incorrect.
               - In PublishingEventHelper#createPublishSnapshot(NodeRef) was added versionProperties map.
            67468: MNT-11026 Version indicators after publishing a document are incorrect.
               - In PublishingEventHelper#createPublishSnapshot(NodeRef) was addedversionService.ensureVersioningEnabled(node, props).


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@70413 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-05-16 16:33:44 +00:00
Alan Davis
e19cce7317 Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
68533: Merged V4.2-BUG-FIX (4.2.3) to HEAD-BUG-FIX (4.3/Cloud)
      68310: Merged V4.1-BUG-FIX (4.1.9) to V4.2-BUG-FIX (4.2.3)
         68265: MNT-11345: Merged V4.1.6 (4.1.6.15) to V4.1-BUG-FIX (4.1.9)
            65696: Merged DEV to V4.1.6 (4.1.6.15)
               65522: MNT-10931 : Unable to retrieve completed workflow's tasks using workflowService.queryTasks() with processProperties
               Added a check to NOT include start-task when the process for the given processId is already ended.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@70412 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-05-16 16:32:45 +00:00
Alan Davis
a41642494b Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
68532: Merged V4.2-BUG-FIX (4.2.3) to HEAD-BUG-FIX (4.3/Cloud)
      68305: Merged V4.1-BUG-FIX (4.1.9) to V4.2-BUG-FIX (4.2.3)
         68264: MNT-11343: Merged V4.1.6 (4.1.6.14) to V4.1-BUG-FIX (4.1.9)
            << There are really only 3 commits as follows. In addition there are a number of reverts and reverts of reverts:
               59852+6039-60386, 60679-60680, 64213-64219, 65093-65103, 65450-65451 >>
            - 60675: MNT-10017: SOLR: Long reindex times when deleting or changing sites env with 15K sites
               New ability has been added to configure types which do not support paths calculation for indexing.
         	  New option has been added to enable or disable filtering types. Paths are also ignored for 'cm:person' and 'app:configurations' subtypes.
               Also parent associations are ignored for 'cm:person' and 'app:configurations' types and their subtypes:
               - 'search.solrTrackingSupport.ignorePathsForSpecificTypes' (default value is 'false'; usual behavior);
               - the configuration for the types supports full and prefixed QNames
            - 63983: MNT-10017: SOLR: Long reindex times when deleting or changing sites env with 15K sites
                Aux re-index logic has been modified to skip metadata pulling for types not matching type constraints. Set of types is configurable.
                'SOLRTrackingComponentImpl.getNodesMetadata()' has been modified to filter children not matching type constraints. Additionally, logic for calculating category paths has been modified to take into account the type constraints
            - 65017: MNT-10017: SOLR: Long reindex times when deleting or changing sites env with 15K sites
                Nodes filtering (those do not need in cascade update for their child aux docs) has been improved. Ids of such docs are searched at start of cascade by configured types. Metadata of child are not pulled if result docs set contains id of the child.
                Node metadata may contain DB ids of child associations in the same time. Cache with doc id by DB id mapping doesn't exist in core tracker. Hence, these child associations can be filtered only using query by DB id to get doc id


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@70411 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-05-16 16:31:42 +00:00
Alan Davis
3e9a566944 Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
68528: Merged V4.2-BUG-FIX (4.2.3) to HEAD-BUG-FIX (4.3/Cloud)
      68303: Merged V4.1-BUG-FIX (4.1.9) to V4.2-BUG-FIX (4.2.3)
         68256: MNT-11342: Merged V4.1.7 (4.1.7.7) to V4.1-BUG-FIX (4.1.9)
            65718: MNT-10966: 4.1.7 breaks onContentUpdate policies when using webdav
               Call onContentUpdate policies on ASPECT_NO_CONTENT removal as it means that new content was uploaded.
               For WebDAV ASPECT_NO_CONTENT is removed on UNLOCK of the new node.
            65741: MNT-10966: 4.1.7 breaks onContentUpdate policies when using webdav
               Add unit test for case
            - Test resources alraedy existed on V4.1-BUG-FIX


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@70410 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-05-16 16:30:37 +00:00
Alan Davis
b78998bd06 Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
68525: Merged V4.2-BUG-FIX (4.2.3) to HEAD-BUG-FIX (4.3/Cloud)
      68281: MNT-11350: Upgrade of Tika to 1.6-SNAPSHOT
         - Upgraded patched Tika, patched PDFBox, and other dependencies
         - Added a MediaTypeDisablingDocumentSelector to disable parsing of certain embedded attachments
         - Added TikaPoweredMetadataExtracter.buildParseContext method which sets the context's DocumentSelector if specified
         - Added setting of DocumentSelector if specified to TikaPoweredContentTransformer
         - Added MediaTypeDisablingDocumentSelector to the transformer.PdfBox bean config which disables parsing of embedded images
         - Updated PdfBoxContentTransformerTest to disable the parsing of embedded images


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@70407 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-05-16 16:24:02 +00:00
Alan Davis
c02f02bf69 ACE-1640: Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
70083: Merged V4.2-BUG-FIX (4.2.3) to HEAD-BUG-FIX (4.3/Cloud)
      70071: Merged V4.1-BUG-FIX (4.1.9) to V4.2-BUG-FIX (4.2.3)
         70057: Merged V4.1.5 (4.1.5.14) to V4.1-BUG-FIX (4.1.9)
            70048: 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
            - move defining into same TX as shared when shared created.
            - fix tests that assumes there will never be ACL dupes when traversing the tx change log  - incorrect. We aim to minimise this


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@70084 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-05-12 16:01:06 +00:00
Alan Davis
bc7fb95b83 ACE-1640: Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
70016: Merged V4.2-BUG-FIX (4.2.3) to HEAD-BUG-FIX (4.3/Cloud)
      70015: Merged V4.1-BUG-FIX (4.1.9) to V4.2-BUG-FIX (4.2.3)
         70014: MNT-11437: Merged V4.1.5 (4.1.5.14) to V4.1-BUG-FIX (4.1.9)
            70009: 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
            - test fixes and maintain order


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@70017 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-05-11 22:08:45 +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
Kevin Roast
c9b4f63a3f Fix for MNT-11408 - change to use the only 'safe' Thor only codepath to avoid early THOR data hack from THOR-293
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@69652 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-05-06 10:45:59 +00:00
Mark Rogers
a9b232b235 Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
68229: Merged V4.2-BUG-FIX (4.2.3) to HEAD-BUG-FIX (4.3/Cloud)
      68099: Merged V4.1-BUG-FIX (4.1.9) to V4.2-BUG-FIX (4.2.3)
         68049: Merged DEV to V4.1-BUG-FIX (4.1.9)
            63586: MNT-10822 : LockType javadoc is incorrect
            Fixed javadoc for LockType enum.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@68477 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-04-30 16:37:06 +00:00
Mark Rogers
5c6dabfff3 Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
68202: Merged PLATFORM1 (4.3/Cloud) to HEAD-BUG-FIX (4.3/Cloud)
      65477: ACE-525	- BM-0013: SOAK: v420b214_01: DescriptorService intercepts retrying exception during concurrent start


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@68465 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-04-30 16:33:27 +00:00
Mark Rogers
03f7156590 Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
68201: Merged PLATFORM1 (4.3/Cloud) to HEAD-BUG-FIX (4.3/Cloud)
      64815: Put transaction back around licenseService.verifyLicense() (removed in r63894)
       - ACE-525 - BM-0013: SOAK: v420b214_01: DescriptorService intercepts retrying exception during concurrent start
       - The transaction is required for concurrency, etc.
       - Added code to inspect any resulting exception in order to dig out a LicenseException


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@68464 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-04-30 16:33:07 +00:00
Mark Rogers
13d3965663 Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
68199: Merged PLATFORM1 (4.3/Cloud) to HEAD-BUG-FIX (4.3/Cloud)
      63894: ACE-525 - BM-0013: SOAK: v420b214_01: DescriptorService intercepts retrying exception during concurrent start


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@68462 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-04-30 16:32:27 +00:00