4954 Commits

Author SHA1 Message Date
Alan Davis
0124e5cdf8 Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
63912: Merged DEV to HEAD-BUG-FIX (4.3.0.BF)
      63885: MNT-10338 : WebDav MT RepositoryAuthenticationDao.getUserFolderLocation() seems to be no tenant-safe
      Implemented a JUnit test.
      Fixed RepositoryAuthenticationDAO.getUserFolderLocation() to use cache keys with tenant domain and use the domain to find correct user store.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@64334 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-03-14 17:07:47 +00:00
Alan Davis
9a1bb97a0c Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
63904: Merged V4.2-BUG-FIX (4.2.2) to HEAD-BUG-FIX (4.3.0.BF)
      63830: Merged V4.1-BUG-FIX (4.1.9) to V4.2-BUG-FIX (4.2.2)
         63743: Merged V4.1.8 (4.1.8) to V4.1-BUG-FIX (4.1.9)
            63678: Merged DEV to PATCHES/V4.1.8 (4.1.8)
               63659 : MNT-10836 : Created site isn't present on My Sites dashlet
                  - We should make additional check for site existence while listing user's sites as ACL may still exists while site was removed (in trashcan).


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@64333 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-03-14 17:06:49 +00:00
Alan Davis
2e3e975c4e Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
63903: Merged V4.2-BUG-FIX (4.2.2) to HEAD-BUG-FIX (4.3.0.BF)
      63817: Merged DEV to V4.2-BUG-FIX (4.2.2)
         63504 : MNT-10687 : Cannot appendContentStream to PWC
            - Remove ALF-20118 fix
         63648 : MNT-10687 : Cannot appendContentStream to PWC
            - Test appending content to PWC using CMIS 1.1


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@64332 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-03-14 17:05:52 +00:00
Alan Davis
a201257a29 Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
63749: Merged V4.2-BUG-FIX (4.2.2) to HEAD-BUG-FIX (4.3.0.BF)
      63717: Merged V4.1-BUG-FIX (4.1.9) to V4.2-BUG-FIX (4.2.2)
         63646:  Merged DEV to V4.1-BUG-FIX (4.1.9)
            55519: MNT-9203: CMIS: Cannot unset (set to null) property during checkin
              - CMISConnector#setProperty method was modified. Now we can set null values according to provided API. Also, testCheckIn unit test was added for this approach.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@64327 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-03-14 17:01:02 +00:00
Alan Davis
824391d858 Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
63705: Merged V4.2-BUG-FIX (4.2.2) to HEAD-BUG-FIX (4.3.0.BF)
      63639: MNT-10161 : cmis:description is not mapped properly for CMIS 1.1 compliance
         - Test failure fix


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@64316 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-03-14 16:47:25 +00:00
Alan Davis
63b50a15c2 Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
63704: Merged V4.2-BUG-FIX (4.2.2) to HEAD-BUG-FIX (4.3.0.BF)
      63576: Merged DEV to V4.2-BUG-FIX (4.2.2)
         59932 : MNT-10161 : cmis:description is not mapped properly for CMIS 1.1 compliance
            - Implementation of org.alfresco.opencmis.mapping.DescriptionProperty added. Register PropertyAccessor only for CMIS 1.1
         63562 : MNT-10161 : cmis:description is not mapped properly for CMIS 1.1 compliance
            - Fix related test


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@64315 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-03-14 16:46:28 +00:00
Alan Davis
899e3d821c Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
63670: Merged DEV to HEAD-BUG-FIX (4.3)
      63618: Fixed ACE-762: BM-0012: NodeLockedException not handled by CMIS
             - Refactored interceptor to handle previous TODO: Dig into exceptions to find deep causal issues of interest
             - Added unit test
             - Translate lock-related Alfresco exception into CMIS exception
      63619: Further testing for ACE-762: BM-0012: NodeLockedException not handled by CMIS
             - Extended test to ensure that locked nodes generate the correct CMIS exception
      63630: Added test for ACE-762 and cleaned up pointless warnings


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@64309 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-03-14 16:38:05 +00:00
Alan Davis
8e3b3f3628 Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
63669: Merged DEV to HEAD-BUG-FIX (4.3)
      63615: Cleanup of imports while investigating ACE-762
      63616: Neater error reporting (inv. of ACE-762)


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@64308 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-03-14 16:37:07 +00:00
Alan Davis
b00157153f Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
63647: Fixed ACE-290: ServiceRegistry.getRetryingTransactionHelper has been deprecated, with no public alternative
    - Removed final bits of deprecation required for ACE-290
    - Added test to ensure that ALF-18718 does not regress (need new instances of RetryingTransactionHelper)
    - Cleaned up pointless 'Non-Javadoc', added @Override, etc


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@64303 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-03-14 16:29:01 +00:00
Alan Davis
3af879b55e Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
63637: Merged V4.2-BUG-FIX (4.2.2) to HEAD-BUG-FIX (4.3.0.BF)
      63563: MNT-10384: Merged DEV to V4.2-BUG-FIX (4.2.2)
         63550: MNT-10384: when using CIFS on windows, alfresco should raise an error is the cifs.name is the windows server name
            - Throw AlfrescoRuntimeException if the cifs.name is the windows server name


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@64301 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-03-14 16:27:05 +00:00
Alan Davis
985734be08 Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
63393: Merged V4.2-BUG-FIX (4.2.2) to HEAD-BUG-FIX (4.3.0.BF)
      63307: Merged V4.2.1 (4.2.1) to V4.2-BUG-FIX (4.2.2)
         63200: Merged DEV to V4.2.1 (4.2.1)
            63199: MNT-10764 : PostgreSQL: An error message is displayed when applying patch 'patch.emailAliasableAspect'
            Fixed the AliasableAspectPatch to run in read-only mode.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@64289 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-03-14 16:15:41 +00:00
Alan Davis
c08013eef7 Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
63384: Reverse Merge HEAD-BUG-FIX (4.3.0.BF)
      63381: Merged V4.2.1 (4.2.1) to HEAD-BUG-FIX (4.3.0.BF)
         63200: Merged DEV to V4.2.1 (4.2.1)
            63199: MNT-10764 : PostgreSQL: An error message is displayed when applying patch 'patch.emailAliasableAspect'
            Fixed the AliasableAspectPatch to run in read-only mode.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@64286 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-03-14 16:12:53 +00:00
Alan Davis
cca7b04cd6 Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
63381: Merged V4.2.1 (4.2.1) to HEAD-BUG-FIX (4.3.0.BF)
      63200: Merged DEV to V4.2.1 (4.2.1)
         63199: MNT-10764 : PostgreSQL: An error message is displayed when applying patch 'patch.emailAliasableAspect'
         Fixed the AliasableAspectPatch to run in read-only mode.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@64284 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-03-14 16:11:57 +00:00
Alan Davis
96f5e5815d Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
63338: Merged BRANCHES/DEV/KEVINR to HEAD-BUG-FIX
      63337: Fix bug in SolrJSONResultSet where 'lastIndexedTx' is not always reported in JSON returned from SOLR but it is assumed to be mandatory.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@64283 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-03-14 16:11:01 +00:00
Alan Davis
88ea986b17 Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
63328: Merged V4.2-BUG-FIX (4.2.2) to HEAD-BUG-FIX (Cloud/4.3)
      63150: Merged DEV to V4.2-BUG-FIX (4.2.2)
         61233 : MNT-10548 : Public API returns invalid JSON if a tag or category has been applied to object
            - Replace List of NodeRefs with List of String elements in DirectProperty
         63129 : MNT-10548 : Public API returns invalid JSON if a tag or category has been applied to object
            - Fix related test


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@64277 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-03-14 16:00:48 +00:00
Alan Davis
9425a422f8 Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
63097: Merged V4.2-BUG-FIX (4.2.2) to HEAD-BUG-FIX (Cloud/4.3)
      63044: Merged V4.1-BUG-FIX (4.1.8) to V4.2-BUG-FIX (4.2.2)
         63001: Reverse merged
            << Caused build error https://bamboo.alfresco.com/bamboo/browse/ALF-ENTERPRISEV41BUGFIX-941/ >>
            62778: MNT-10122: Related to MNT-2234 - Incorrect workflow history when using jBPM.
            In JBPMEngine.getTaskProperties() for ContentModel.PROP_OWNER set curren user.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@64270 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-03-14 15:54:15 +00:00
Alan Davis
6fd14d0987 Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
63096: Merged V4.2-BUG-FIX (4.2.2) to HEAD-BUG-FIX (Cloud/4.3)
      63043: Revert the reverse to merge the reverse from V4.1-BF instead
         62900: Reverse merge from V4.2-BUG-FIX (4.2.2) to V4.1-BUG-FIX (4.1.8)
            62851: Reverse merged
               << Caused build error https://bamboo.alfresco.com/bamboo/browse/ALF-ENTERPRISEV42BUGFIX-194 >>
               62778: MNT-10122: Related to MNT-2234 - Incorrect workflow history when using jBPM.
               In JBPMEngine.getTaskProperties() for ContentModel.PROP_OWNER set curren user.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@64269 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-03-14 15:53:19 +00:00
Alan Davis
71324ac54f Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
63086: Merged V4.2-BUG-FIX (4.2.2) to HEAD-BUG-FIX (Cloud/4.3)
      62850: Merged V4.1-BUG-FIX (4.1.8) to V4.2-BUG-FIX (4.2.2)
         62709: MNT-10644: autoCreatePeopleOnLogin=false allows unauthorized users to log in via CIFS
            Force user creation on CIFS log in only if autoCreatePeopleOnLogin=true. Add unit tests for EnterpriseCifsAuthenticator
   		 and PassthruCifsAuthenticator.
      62968: MNT-10644: autoCreatePeopleOnLogin=false allows unauthorized users to log in via CIFS
         Fix CifsAuthenticatorKerberosTest: to check person existence in V4.2-BUG-FIX RunAsUser is required to be set


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@64265 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-03-14 15:49:58 +00:00
Alan Davis
6a048b6b85 Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
63085: Reverse merged
      63077: Merged V4.2-BUG-FIX (4.2.2) to HEAD-BUG-FIX (Cloud/4.3)
         62850: Merged V4.1-BUG-FIX (4.1.8) to V4.2-BUG-FIX (4.2.2)
            62709: MNT-10644: autoCreatePeopleOnLogin=false allows unauthorized users to log in via CIFS
               Force user creation on CIFS log in only if autoCreatePeopleOnLogin=true. Add unit tests for EnterpriseCifsAuthenticator
               and PassthruCifsAuthenticator.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@64264 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-03-14 15:45:59 +00:00
Alan Davis
50b4c69df3 Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
63079: Merged V4.2-BUG-FIX (4.2.2) to HEAD-BUG-FIX (Cloud/4.3)
      62900: Reverse merge from V4.2-BUG-FIX (4.2.2) to V4.1-BUG-FIX (4.1.8)
         62851: Reverse merged
            << Caused build error https://bamboo.alfresco.com/bamboo/browse/ALF-ENTERPRISEV42BUGFIX-194 >>
            62778: MNT-10122: Related to MNT-2234 - Incorrect workflow history when using jBPM.
            In JBPMEngine.getTaskProperties() for ContentModel.PROP_OWNER set curren user.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@64262 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-03-14 15:44:05 +00:00
Alan Davis
1dc8214cbd Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
63078: Merged V4.2-BUG-FIX (4.2.2) to HEAD-BUG-FIX (Cloud/4.3)
      62851: Merged V4.1-BUG-FIX (4.1.8) to V4.2-BUG-FIX (4.2.2)
         62778: MNT-10122: Related to MNT-2234 - Incorrect workflow history when using jBPM.
         In JBPMEngine.getTaskProperties() for ContentModel.PROP_OWNER set curren user.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@64261 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-03-14 15:43:08 +00:00
Alan Davis
22e9128f35 Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
63077: Merged V4.2-BUG-FIX (4.2.2) to HEAD-BUG-FIX (Cloud/4.3)
      62850: Merged V4.1-BUG-FIX (4.1.8) to V4.2-BUG-FIX (4.2.2)
         62709: MNT-10644: autoCreatePeopleOnLogin=false allows unauthorized users to log in via CIFS
            Force user creation on CIFS log in only if autoCreatePeopleOnLogin=true. Add unit tests for EnterpriseCifsAuthenticator
            and PassthruCifsAuthenticator.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@64260 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-03-14 15:42:10 +00:00
Alan Davis
467ffadf06 Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
63067: Merged V4.2-BUG-FIX (4.2.2) to HEAD-BUG-FIX (Cloud/4.3)
      62765: MNT-10611: Merged DEV to V4.2-BUG-FIX (4.2.2)
         62735: MNT-10611: Exception generated in .AccessAuditor. when audited String values bigger than 1024 characters (non-MySQL)
            - Trim String and MLtext audit values to not exceed system.maximumStringLength. Add unit test for case.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@64255 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-03-14 15:33:55 +00:00
Derek Hulley
7e2d1a95c6 Reverted 63895 (MNT-10338), which went onto the wrong branch
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@63908 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-03-11 12:38:58 +00:00
Alex Mukha
69f2922c30 Merged DEV to HEAD (4.3.0)
63885: MNT-10338 : WebDav MT RepositoryAuthenticationDao.getUserFolderLocation() seems to be no tenant-safe
   Implemented a JUnit test.
   Fixed RepositoryAuthenticationDAO.getUserFolderLocation() to use cache keys with tenant domain and use the domain to find correct user store.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@63895 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-03-11 11:37:48 +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
9dca412a8c Merged HEAD-BUG-FIX (Cloud33/4.3) to HEAD (Cloud33/4.3)
62931: Merged PLATFORM1 (Cloud33) to HEAD-BUG-FIX (Cloud33/4.3)
      62696: ACE-480  Split Data-Model into Lucene Independent and Legacy Lucene Project


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@62986 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-02-20 14:59:18 +00:00
Alan Davis
3e55fd9ca1 Merged HEAD-BUG-FIX (Cloud33/4.3) to HEAD (Cloud33/4.3)
62930: Merged PLATFORM1 (Cloud33) to HEAD-BUG-FIX (Cloud33/4.3)
      62626: Build fix


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@62985 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-02-20 14:45:36 +00:00
Alan Davis
3168485452 Merged HEAD-BUG-FIX (Cloud33/4.3) to HEAD (Cloud33/4.3)
62929: Merged PLATFORM1 (Cloud33) to HEAD-BUG-FIX (Cloud33/4.3)
      62598: ACE-579 - Synchronization aborted due to error java.lang.NullPointerException


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@62984 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-02-20 14:44:43 +00:00
Alan Davis
149492e25c Merged HEAD-BUG-FIX (Cloud33/4.3) to HEAD (Cloud33/4.3)
62928: Merged PLATFORM1 (Cloud33) to HEAD-BUG-FIX (Cloud33/4.3)
      62580: ACE-482: now logs timings for search types other than hybrid.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@62983 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-02-20 14:43:50 +00:00
Alan Davis
b0954de8b3 Merged HEAD-BUG-FIX (Cloud33/4.3) to HEAD (Cloud33/4.3)
62927: Merged PLATFORM1 (Cloud33) to HEAD-BUG-FIX (Cloud33/4.3)
      62573: ACE-482: now logs timings for hybrid search at debug level.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@62982 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-02-20 14:42:56 +00:00
Alan Davis
0fddaf3141 Merged HEAD-BUG-FIX (Cloud33/4.3) to HEAD (Cloud33/4.3)
62925: Merged PLATFORM1 (Cloud33) to HEAD-BUG-FIX (Cloud33/4.3)
      62531: ACE-482: ChildAssocRefResultSet.hasMore() returns false, previously threw UnsupportedOperationException.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@62979 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-02-20 14:41:11 +00:00
Alan Davis
8bb9d2507d Merged HEAD-BUG-FIX (Cloud33/4.3) to HEAD (Cloud33/4.3)
62924: Merged PLATFORM1 (Cloud33) to HEAD-BUG-FIX (Cloud33/4.3)
      62527: ACE-482: improved logging for hybrid search - returns numbers of results for each part of process.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@62978 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-02-20 14:40:18 +00:00
Alan Davis
1a7fd86ee2 Merged HEAD-BUG-FIX (Cloud33/4.3) to HEAD (Cloud33/4.3)
62920: Merged PLATFORM1 (Cloud33) to HEAD-BUG-FIX (Cloud33/4.3)
      << This was a bad merge with conflicts to do with the impl/solr directory not existing >>
      62511: ACE-482: Hybrid search can be disabled/enabled and is disabled by default.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@62975 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-02-20 14:37:41 +00:00
Alan Davis
4e6a415eb2 Merged HEAD-BUG-FIX (Cloud33/4.3) to HEAD (Cloud33/4.3)
62919: Merged PLATFORM1 (Cloud33) to HEAD-BUG-FIX (Cloud33/4.3)
      62510: ACE-33 - fix for unit test


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@62974 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-02-20 14:36:47 +00:00
Alan Davis
2e25d15ed1 Merged HEAD-BUG-FIX (Cloud33/4.3) to HEAD (Cloud33/4.3)
62917: Merged PLATFORM1 (Cloud33) to HEAD-BUG-FIX (Cloud33/4.3)
      62451: ACE-33 - CMIS item support.   CRUD of cmis items, cmis item shown as children of folders.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@62971 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-02-20 14:35:00 +00:00
Alan Davis
50f699b961 Merged HEAD-BUG-FIX (Cloud33/4.3) to HEAD (Cloud33/4.3)
62916: Merged PLATFORM1 (Cloud33) to HEAD-BUG-FIX (Cloud33/4.3)
      62406: ACE-479  Provide Search Adapter - more tidy up - remove commented code, update copyright, tweak some adaptor variable names


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@62970 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-02-20 14:34:04 +00:00
Alan Davis
e245353b4a Merged HEAD-BUG-FIX (Cloud33/4.3) to HEAD (Cloud33/4.3)
62915: Merged PLATFORM1 (Cloud33) to HEAD-BUG-FIX (Cloud33/4.3)
      62288: ACE-479  Provide Search Adapter - general tidy up including addressing the review comments


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@62969 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-02-20 14:33:04 +00:00
Alan Davis
50b79beee2 Merged HEAD-BUG-FIX (Cloud33/4.3) to HEAD (Cloud33/4.3)
62909: Merged PLATFORM1 (Cloud33) to HEAD-BUG-FIX (Cloud33/4.3)
      61407: removed the deprecated comment on getRetryingTransactionHelper per ACE-290


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@62962 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-02-20 14:27:28 +00:00
Alan Davis
c38c6fe1d7 Merged HEAD-BUG-FIX (Cloud33/4.3) to HEAD (Cloud33/4.3)
62905: Merged PLATFORM1 (Cloud33) to HEAD-BUG-FIX (Cloud33/4.3)
      61335: ACE-33 implementation of cmis:items
          add permissions
          create and delete of cmis:items 
          some unit test fixes
          new unit test for items


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@62958 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-02-20 14:23:58 +00:00
Alan Davis
30b1d43c90 Merged HEAD-BUG-FIX (Cloud33/4.3) to HEAD (Cloud33/4.3)
62901: Merged PLATFORM1 (Cloud33) to HEAD-BUG-FIX (Cloud33/4.3)
      61252: ACE-479  Provide Search Adapter
       - Reintegrated BRANCHES/DEV/PLATFORM1 from BRANCHES/DEV/PLATFORM1-AHIND


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@62955 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-02-20 14:21:16 +00:00
Alan Davis
edcd570731 Merged HEAD-BUG-FIX (Cloud33/4.3) to HEAD (Cloud33/4.3)
62894: Merged PLATFORM1 (Cloud33) to HEAD-BUG-FIX (Cloud33/4.3)
      61101: ACE-33 : cmis:folder creation should work again.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@62950 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-02-20 14:16:36 +00:00
Alan Davis
d00bdc4806 Merged HEAD-BUG-FIX (Cloud33/4.3) to HEAD (Cloud33/4.3)
62893: Merged PLATFORM1 (Cloud33) to HEAD-BUG-FIX (Cloud33/4.3)
      61039: ACE-33 : Implementation of cmis:item


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@62949 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-02-20 14:15:43 +00:00
Alan Davis
72a3ae93d4 Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
61354: Merged V4.2-BUG-FIX (4.2.2) to HEAD-BUG-FIX (Cloud/4.3)
      61287:  Merged DEV to V4.2-BUG-FIX (4.2.2)
         59996: MNT-10366: Share link does not work for consumer/contributor 
           - Run as system user the addition of "shared" aspect to a node.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@62412 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-02-12 15:12:00 +00:00
Alan Davis
2a9600f26c Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
61350: Merged V4.2-BUG-FIX (4.2.2) to HEAD-BUG-FIX (Cloud/4.3)
      61114: Merged V4.1-BUG-FIX (4.1.8) to V4.2-BUG-FIX (4.2.2)
         61011: Merged DEV to V4.1-BUG-FIX (4.1.8)
            60967: MNT-10610: FilenameFilteringInterceptor.java readability
            MNT-10561 : If a folder is renamed with 8 characters that are within A-F and 0-9, the sys:temporary aspect is applied to it
            Implemented a JUnit test to simulate the issue.
            Added a check for a node to be without content in FilenameFilteringInterceptor.isNameOfTmporaryObject(String, NodeRef).
            Fixed code and JavaDoc formatting.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@62410 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-02-12 15:10:29 +00:00
Alan Davis
4faaf92018 Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
61345: Merged V4.2-BUG-FIX (4.2.2) to HEAD-BUG-FIX (Cloud/4.3)
      61071: Merged DEV to V4.2-BUG-FIX (4.2.2)
         60764: MNT-10533: Calls during the beforeDeleteNode phase of a group deletion may confuse the AuthorityDaoImpl cache
          - First delete authority and refresh cache only after that 


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@62407 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-02-12 15:08:11 +00:00
Alan Davis
77ab73a944 Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
61185: Added a mention that the SiteService.listSites method may return stale data (ACE-196)


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@62400 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-02-12 15:03:24 +00:00
Alan Davis
3aa31d4ba2 Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
61167: Removed in-txn exception absorbtion and replaced with a node exists check


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@62397 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-02-12 15:01:09 +00:00
Alan Davis
3f9c22dd32 Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
61122: Merged V4.2-BUG-FIX (4.2.2) to HEAD-BUG-FIX (Cloud/4.3)
      60991: Merged DEV to V4.2-BUG-FIX
      60325 : MNT-10404 : Runas problem in workflow when package contains versioned content
       Added some unit tests. 
      60443 : MNT-10404 : Runas problem in workflow when package contains versioned content
       Added tests, debug log. Run work as system user in VersionableAspect. 
      60452 : MNT-10404 : Runas problem in workflow when package contains versioned content
       Wrap debug statements. 
      60492 : MNT-10404 : Runas problem in workflow when package contains versioned content
       Fix if statement indents. 


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@62387 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-02-12 14:54:12 +00:00
Alan Davis
1c4d662866 Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
61049: Merged V4.2-BUG-FIX (4.2.2) to HEAD-BUG-FIX (Cloud/4.3)
      60931: Merged V4.1-BUG-FIX (4.1.8) to V4.2-BUG-FIX (4.2.2)
         60806: Merged BELARUS/V4.1-BUG_FIX-2013_11_27 (4.1.8) to V4.1-BUG-FIX (4.1.8)
            58341: MNT-8109: Moving a file over WebDAV changes the modification date although the file was not modified
               'system.preserve.modificationData' property has been added. The property controls if the logic of auditable aspect should be executed or not.
               - 'FileFolderServiceImplTest' has been fixed in accordance with changes in 'FileFolderServiceImpl';
               - 'FileFolderServicePropagationTest' has been added
            58456: MNT-8109: Moving a file over WebDAV changes the modification date although the file was not modified
               'system.preserve.modificationData' property has been added. The property controls if the logic of auditable aspect should be executed or not. Default value has been modified to 'false'. Tests were modified appropriately to respect the default value:
               - 'FileFolderServiceImplTest' has been reverted to the original state;
               - 'FileFolderServicePropagationTest' has been improved to avoid further modifications if the default value is changed;
               - 'FileFolderServicePropagationTest' has been added to 'ModelTestSuite';
               - Getter for the 'system.preserve.modificationData' property has been added to the 'FileFolderServiceImpl'


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@62381 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-02-12 14:49:25 +00:00