5154 Commits

Author SHA1 Message Date
Mark Rogers
a576035f0f Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
77150: Merged PLATFORM1 (5.0/Cloud) to HEAD-BUG-FIX (5.0/Cloud)
      73977: ACE-1802 "MT / Cloud Restrict namespace URI of dynamic models."
      ACE-955 "Custom Content Models in Cloud"


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@78008 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-07-23 16:02:04 +00:00
Mark Rogers
f1310c6c8d Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
77148: Merged PLATFORM1 (5.0/Cloud) to HEAD-BUG-FIX (5.0/Cloud)
      73957: ContentStore API cleanup
       - Removed previously-deprecated ContentStore.getWriter(ContentReader existingContentReader, String newContentUrl)
       - Removed previously-deprecated getSpaceUsed()
       - Removed previously-deprecated getTotalSize()
       - Deprecated optional and unused getUrls() and variants
       - Clean up of implementations to ignore relevant deprecations, etc


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@78004 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-07-23 15:57:20 +00:00
Mark Rogers
7fff2b6627 Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
77145: Merged PLATFORM1 (5.0/Cloud) to HEAD-BUG-FIX (5.0/Cloud)
      73891: ACE-1821 - Stop Using MD4 for password encryption on Cloud


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@78001 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-07-23 15:55:56 +00:00
Mark Rogers
b46331ab9c Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
77140: Merged PLATFORM1 (5.0/Cloud) to HEAD-BUG-FIX (5.0/Cloud)
      73711: Reverse Merge
         << Unit tests failed >>
         73642: Merged DEV to PLATFORM1(4.3.0)
           ACE-1996: Cluster: Web client extensions not distributed:
             72232: MNT-9882: Cluster: Web client extensions not distributed
              - Use asynchronously refreshed cache in diactionaryDAO
             73275: MNT-9882: Cluster: Web client extensions not distributed
              - Add javadocs, remove excess classes.
             73509: MNT-9882: Cluster: Web client extensions not distributed
              - Remove stale configs for "compiledModelsSharedCache", remove unreachable code from DictionaryDAOImpl, return value from NoOpCompiledModelsCache.get() method.
             73591: ACE-1996: Cluster: Web client extensions not distributed
              - Remove NoOpCompiledModelsCache.
              - Modify unit tests that uses CompiledModelCache 


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@77996 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-07-23 15:53:37 +00:00
Mark Rogers
64bcf14401 Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
77138: Merged PLATFORM1 (5.0/Cloud) to HEAD-BUG-FIX (5.0/Cloud)
      73642: Merged DEV to PLATFORM1(4.3.0)
      ACE-1996: Cluster: Web client extensions not distributed:
         72232: MNT-9882: Cluster: Web client extensions not distributed
          - Use asynchronously refreshed cache in diactionaryDAO 
         73275: MNT-9882: Cluster: Web client extensions not distributed
          - Add javadocs, remove excess classes. 
         73509: MNT-9882: Cluster: Web client extensions not distributed
          - Remove stale configs for "compiledModelsSharedCache", remove unreachable code from DictionaryDAOImpl, return value from NoOpCompiledModelsCache.get() method. 
         73591: ACE-1996: Cluster: Web client extensions not distributed
          - Remove NoOpCompiledModelsCache.
          - Modify unit tests that uses CompiledModelCache 


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@77994 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-07-23 15:52:36 +00:00
Mark Rogers
b42296da1c Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
77131: Merged PLATFORM1 (5.0/Cloud) to HEAD-BUG-FIX (5.0/Cloud)
      73478: Formatting fixed during investigations


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@77986 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-07-23 15:44:57 +00:00
Mark Rogers
2ff1272a28 Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
77129: Merged PLATFORM1 (5.0/Cloud) to HEAD-BUG-FIX (5.0/Cloud)
      73474: ACE-1685: aclsReaders.post WebScript now includes denied authorities in results


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@77983 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-07-23 15:41:36 +00:00
Mark Rogers
390b32493c Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
77123: Merged PLATFORM1 (5.0/Cloud) to HEAD-BUG-FIX (5.0/Cloud)
      73439: ACE-1685: added missing getReadersDenied(...) impl to PermissionServiceNOOPImpl


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@77976 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-07-23 15:34:06 +00:00
Mark Rogers
d8cf733595 Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
77121: Merged PLATFORM1 (5.0/Cloud) to HEAD-BUG-FIX (5.0/Cloud)
      73389: ACE-1685: added getReadersDenied(...) to PermissionService interface


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@77973 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-07-23 15:31:43 +00:00
Mark Rogers
f989d6fa2d Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
77084: Merged PLATFORM1 (5.0/Cloud) to HEAD-BUG-FIX (5.0/Cloud)
      72906: ACE-956 - Configure Hybrid Sync - step 1


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@77933 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-07-23 14:42:53 +00:00
Mark Rogers
025ea2b305 Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
77083: Merged PLATFORM1 (5.0/Cloud) to HEAD-BUG-FIX (5.0/Cloud)
      72905: Adding a comment on future direction


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@77932 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-07-23 14:42:11 +00:00
Mark Rogers
0255292d44 Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
77034: Merged PLATFORM1 (5.0/Cloud) to HEAD-BUG-FIX (5.0/Cloud)
      71740: Undeprecated Alfresco Transaction Support


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@77876 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-07-23 12:58:38 +00:00
Mark Rogers
62bd780bb5 Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
77003: Merged PLATFORM1 (5.0/Cloud) to HEAD-BUG-FIX (5.0/Cloud)
      70239: Removing two stray files that shouldn't be versioned. This should speed up maven incremental builds for the repo.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@77842 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-07-23 12:07:24 +00:00
Mark Rogers
4f2d6e08bb Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
76994: Merged PLATFORM1 (5.0/Cloud) to HEAD-BUG-FIX (5.0/Cloud)
      70127: MNT-9882 - refactoring of caches


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@77833 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-07-23 12:01:01 +00:00
Mark Rogers
c5cb3ce87a Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
76966: Merged PLATFORM1 (5.0/Cloud) to HEAD-BUG-FIX (5.0/Cloud)
      68048: Reverse 68032 MNT-10822 - committed to wrong branch


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@77807 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-07-23 11:35:17 +00:00
Mark Rogers
3a1aaf5a7c Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
76965: Merged PLATFORM1 (5.0/Cloud) to HEAD-BUG-FIX (5.0/Cloud)
      68032: MNT-10822 - LockType javadoc is incorrect


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@77806 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-07-23 11:34:45 +00:00
Mark Rogers
545b7e71d7 Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
76953: Merged PLATFORM1 (5.0/Cloud) to HEAD-BUG-FIX (5.0/Cloud)
      67499: ACE-1407 - Make alfcmis:nodeRef queryable on cm:category


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@77793 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-07-23 11:29:58 +00:00
Mark Rogers
7678ef43cd Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
76924: Merged PLATFORM1 (5.0/Cloud) to HEAD-BUG-FIX (5.0/Cloud)
      65751: Merge Dev to PLATFORM 1
        58339 :     ACE-968 CIFS: folder is not deleted if it has subfolder and document inside


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@77770 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-07-23 10:49:25 +00:00
Mark Rogers
2dc446694d Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
76911: Merged PLATFORM1 (5.0/Cloud) to HEAD-BUG-FIX (5.0/Cloud)
      66893: Clean up use of deprecated 'UserRegistrySynchronizer.synchronize' and general code clean up


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@77754 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-07-23 10:30:19 +00:00
Mark Rogers
99cd88f18a Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
76900: Merged PLATFORM1 (5.0/Cloud) to HEAD-BUG-FIX (5.0/Cloud)
      65976: Merged BRANCHES/DEV/mward/plat1_cryptodoc to BRANCHES/DEV/PLATFORM1:
         65030: ACE-669: imported main cryptodoc source into Enterprise Repository tree and fixed up package declarations/references.
         65073: ACE-669: moved fileContentStore into a (switchable) subsystem.
         65107: ACE-669: added (enterprise only) encrypted ContentStore subsystem.
         65109: ACE-669: added files missing from previous commit, though the webscripts are not likely to work yet.
         65523: ACE-669: added cryptodoc log4j settings
         65524: ACE-669: imported unit tests over from cryptodoc module
         65528: ACE-669: default ContentStore subsystem (unencrypted) is now configurable through property.
         65678: ACE-669: ContentStore subsystem is now protected against switching from encrypted content store to unencrypted.
         65752: ACE-669: created EncryptedFileContentStoreIntegrationTest - with many test failures to be fixed.
         65757: ACE-669: corrected JceEncryptingContentWriter.putContent(String) to treat the method param as content, not as a source path.
         65758: ACE-669: fixed JceEncryptingContentWriter.getReader() to return a decrypting-reader
         65972: ACE-669: removing unused GetStatus webscript and templates
         65973: ACE-669: removing GetStatus webscript spring context file.
         65974: ACE-669: temporarily disabling EncryptedFileContentStoreIntegrationTest until reasons for failures are identified.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@77742 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-07-23 10:19:53 +00:00
Mark Rogers
4396b2a746 Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
76896: Merged PLATFORM1 (5.0/Cloud) to HEAD-BUG-FIX (5.0/Cloud)
      65777: AbstractContentReader: Code cleanup


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@77737 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-07-23 10:16:11 +00:00
Mark Rogers
c8c9cc191a Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
76894: Merged PLATFORM1 (5.0/Cloud) to HEAD-BUG-FIX (5.0/Cloud)
      65668: Fixed impossible cast issue flagged by SONAR


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@77736 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-07-23 10:15:38 +00:00
Mark Rogers
8341795a69 Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
76893: Merged PLATFORM1 (5.0/Cloud) to HEAD-BUG-FIX (5.0/Cloud)
      65666: Removed equals and hashcode that use URL (SONAR blocker)


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@77734 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-07-23 10:13:27 +00:00
Mark Rogers
eb646c22b0 Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
76891: Merged PLATFORM1 (5.0/Cloud) to HEAD-BUG-FIX (5.0/Cloud)
      65489: ACE-502 - Transfer categories and tags MNT-8098


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@77732 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-07-23 10:11:52 +00:00
Mark Rogers
f0fb9f279f Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
76890: Merged PLATFORM1 (5.0/Cloud) to HEAD-BUG-FIX (5.0/Cloud)
      65482: Merge DEV to PLATFORM1
        ACE-502 - Transfer service : implement transferring of categories and tags
            58825 : 	MNT-8098 - Create categories on target runs as "System". Bug fix when removing categories which results in a "null" node ref.
            58716 : 	MNT-8098 - transfer of categories and tags.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@77731 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-07-23 10:11:19 +00:00
Mark Rogers
9a685756c1 Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
76888: Merged PLATFORM1 (5.0/Cloud) to HEAD-BUG-FIX (5.0/Cloud)
      65459: MERGE DEV to PLATFORM1 
        ACE-968 - CIFS: folder is not deleted if it has subfolder and document inside


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@77703 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-07-22 16:41:30 +00:00
Mark Rogers
044205397c Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
76749: Merged V4.2-BUG-FIX (4.2.4) to HEAD-BUG-FIX (5.0/Cloud)
      76731: Merged V4.1-BUG-FIX (4.1.10) to V4.2-BUG-FIX (4.2.4)
         76727: Merged V4.1.9 (4.1.9) to V4.1-BUG-FIX (4.1.10)
            76272: MNT-11873 It is impossible to publish in Flickr channel
               - Use new SSL URL https://api.flickr.com/services/


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@77679 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-07-22 16:22:07 +00:00
Mark Rogers
017af1a65c Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
76635: Merged EOL2 (5.0/Cloud) to HEAD-BUG-FIX (5.0/Cloud)
      76545: ACE-2016: EOL Google Docs v1 in 5.0


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@77670 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-07-22 16:13:06 +00:00
Mark Rogers
873e79f0d4 Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
76608: Reverse merged HEAD-BUG-FIX (5.0/Cloud)
      << Commits from broken build on V4.2-BUG-FIX >>
      76591: Merged V4.2-BUG-FIX (4.2.4) to HEAD-BUG-FIX (5.0/Cloud)
         76521: Merged DEV to V4.2-BUG-FIX
          76328 : MNT-11854 : Consumer allowed to create Discussion, Wiki, Blog and Link if she/he creates the first item
           Add the changes - for discussion, blog and link containers we will get site permission. 
      76592: Merged V4.2-BUG-FIX (4.2.4) to HEAD-BUG-FIX (5.0/Cloud)
         76523: Merged DEV to V4.2-BUG-FIX
          58015 : MNT-5877 : Unable to move a working copy
           Add actions to move/copy/delete working copies.
      76593: Merged V4.2-BUG-FIX (4.2.4) to HEAD-BUG-FIX (5.0/Cloud)
         76534: MNT-10226: Merged DEV to V4.2-BUG-FIX (4.2.4)
            76512: MNT-10226: Web Script - Status 500 error on 'Edit Properties' page after adding 'Restrictable' aspect through CMIS 1.1 API
               - Convert default value in appliance with type of the property.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@77665 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-07-22 16:06:29 +00:00
Mark Rogers
e9da763689 Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
76593: Merged V4.2-BUG-FIX (4.2.4) to HEAD-BUG-FIX (5.0/Cloud)
      76534: MNT-10226: Merged DEV to V4.2-BUG-FIX (4.2.4)
         76512: MNT-10226: Web Script - Status 500 error on 'Edit Properties' page after adding 'Restrictable' aspect through CMIS 1.1 API
            - Convert default value in appliance with type of the property.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@77660 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-07-22 15:59:13 +00:00
Mark Rogers
c9ba4bc66e Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
76582: Merged V4.2-BUG-FIX (4.2.4) to HEAD-BUG-FIX (5.0/Cloud)
      76493: MNT-11670: Merged DEV to V4.2-BUG-FIX (4.2.4)
         73830: MNT-11670: Unable to end a workflow when a timer is triggered and a rule is configured on a target folder
            - Save current user info when rule is added to the pending execution. Then it can be used during rule execution if security context is empty.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@77648 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-07-22 15:47:20 +00:00
Mark Rogers
77222c3023 Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
76565: Merged V4.2-BUG-FIX (4.2.4) to HEAD-BUG-FIX (5.0/Cloud)
      76177: Merged DEV to V4.2-BUG-FIX (4.2.3)
         74967 : MNT-11749 : It is possible to create groups with same name in race conditions
            - Disallow creation of authorities with equal names
         76118 : MNT-11749 : It is possible to create groups with same name in race conditions
            - Remove throwing AlfrescoRuntimeException for duplicated authorities. Fix related test


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@77631 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-07-22 15:31:28 +00:00
Mark Rogers
af44652c45 Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
76560: Merged V4.2-BUG-FIX (4.2.4) to HEAD-BUG-FIX (5.0/Cloud)
      75816: Merged DEV V4.2-BUG-FIX to V4.2-BUG-FIX (4.2.3)
         75777: MNT-11598: Escaped Freemarker query templates don't work with org.alfresco.repo.action.scheduled.CronScheduledQueryBasedTemplateActionDefinition
           - Workaround with unescaping Free Marker template has been applied and tested with the newly implemented test


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@77627 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-07-22 15:28:42 +00:00
Mark Rogers
b139656620 Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
76028: Merged V4.2-BUG-FIX (4.2.3) to HEAD-BUG-FIX (5.0/Cloud)
      75739: Merged DEV to V4.2-BUG-FIX (4.2.3)
         71980 : MNT-11362 : Cloud - Manage Sites feature not showing results if a site in the list is corrupt 
            - Check if containing authority exists 


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@77549 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-07-22 13:51:39 +00:00
Mark Rogers
2c2d283868 Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
76027: Merged V4.2-BUG-FIX (4.2.3) to HEAD-BUG-FIX (5.0/Cloud)
      75707: Merged DEV to V4.2-BUG-FIX (4.2.3)
         71368 : MNT-11318 : Rule script gets executed six times when a document is moved
             - implement equals and hashCode methods for policy proxies with SingleHandler


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@77548 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-07-22 13:51:08 +00:00
Mark Rogers
ebf8652ebb Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
75759: Reverse Merge HEAD-BUG-FIX (5.0)
      74605 : Reverse Merge HEAD-BUG-FIX (5.0)
         << Caused 1 build error https://bamboo.alfresco.com/bamboo/browse/THOR-CLOUD0-384 >>
         74567 : Merged DEV to HEAD-BUG-FIX (5.0)
            69634 : MNT-11339 : Unable to create relationship between cmis:document and cmis:item
               - TYPE_BASE is valid CMIS type
            73710 : MNT-11339 : Unable to create relationship between cmis:document and cmis:item
               - Create association between cmis:document and cmis:item test 


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@77545 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-07-22 13:49:11 +00:00
Mark Rogers
915c6a916b Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
75702: Merged DEV to HEAD-BUG-FIX (5.0/Cloud)
      75532: ACE-2133 : LDAP logging throws NullPointerException
      Added additional checks to avoid NPE while closing the contexts.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@77540 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-07-22 13:43:36 +00:00
Mark Rogers
97db4de531 Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
75639: Merged V4.2-BUG-FIX (4.2.3) to HEAD-BUG-FIX (5.0/Cloud)
      75253: Merged DEV to V4.2-BUG-FIX (4.2.3)
         75193 : MNT-11771 : Disabling thumbnail also disables Share preview
            - Provide force parameter to ignore system.thumbnail.generate


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@77515 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-07-22 13:27:30 +00:00
Mark Rogers
a89276be19 Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
75551: Reverse Merge HEAD-BUG-FIX (5.0/Cloud)
      74584: Reverse merged HEAD-BUG-FIX (5.0/Cloud)
         << Requires more work on the EOL branch >>
         74416: Merged EOL to HEAD-BUG-FIX (5.0/Cloud)
            74309: ACE-2010 EOL Legacy CMIS Inputs (2) in 5.0
               - Start replacing references to the original CMIS code with Alfresco and chemistry Open CMIS classes 
            74342: ACE-2010 EOL Legacy CMIS Inputs (2) in 5.0
               - Switch ServiceRegistry over to using Open CMIS classes 
            74406: ACE-2010 EOL Legacy CMIS Inputs (2) in 5.0
               << Compiles and starts Share without error >>
               - Removed Original CMIS classes from the repository, remote-api and thor
               - Moved the CMIS.DictionaryBootstrap bean into opencmis-context.xml before removing cmis-api-context.xml
               - Some code was left under:
                   root\projects\remote-api\source\java\org\alfresco\repo\cmis
                   ...........................................................\client
                   ...........................................................\ws
                   ...........................................................\rest
                   ................................test-java\org\alfresco\repo\cmis
                   ................................................................\ws
                   ................................................................\rest
                 Will have to see if it should be be removed too, or if it is common with OpenCMIS
            74407: ACE-2010 EOL Legally CMIS Inputs (2) in 5.0
               - Removed left over code under:
                   root\projects\remote-api\source\java\org\alfresco\repo\cmis
                   ................................test-java\org\alfresco\repo\cmis
               - Removed an authentication URL test in QuickShareRestApiTest which was failing in
                 the same way as the tests above.
               - Removed CXFAuthenticationSystemTest which appears to be using the original CMIS
         74465: Merged EOL (5.0/Cloud) to HEAD-BUG-FIX (5.0/Cloud)
            74464: ACE-2010 EOL Legacey CMIS Inputs (2) in 5.0
               - New failure in QuickShareRestApiTest
               - CXFAuthenticationSystemTest (deleted) was still referenced in MiscSystemTestSuite


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@77489 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-07-22 12:58:48 +00:00
Mark Rogers
8db8094c57 Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
75525: Merged V4.2-BUG-FIX (4.2.3) to HEAD-BUG-FIX (5.0/Cloud)
      75287: Merged V4.1-BUG-FIX (4.1.10) to V4.2-BUG-FIX (4.2.3)
         75284: Merged V4.1.8 (4.1.8.11) to V4.1-BUG-FIX (4.1.10)
            75265: MNT-11766 : User with username starting with admin gets admin rights
               - Previous fix was corrected according to Derek's review.
               - Unit test that demonstrates fix added.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@77485 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-07-22 12:55:23 +00:00
Mark Rogers
27e2d25a8b Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
75520: Merged V4.2-BUG-FIX (4.2.3) to HEAD-BUG-FIX (5.0/Cloud)
      75206: Merged DEV to V4.2-BUG-FIX (4.2.3)
         74383 : MNT-11726 : CMIS change log isn't returning valid cmis:objectId values for deleted objects
            - Use context safe objectId generation in CMISChangeLogDataExtractor. Test for the fix
         74484 : MNT-11726 : CMIS change log isn't returning valid cmis:objectId values for deleted objects
            - Test implemented in CMISTest
            - Changed CMISConnector.isFolder(NodeRef) logic. Can cause NPE if NodeRef is not FOLDER or FILE
         75113 : MNT-11726 : CMIS change log isn't returning valid cmis:objectId values for deleted objects
            - alfresco-audit-cmis.xml moved to Repository project


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@77482 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-07-22 12:52:57 +00:00
Mark Rogers
238a2a02c1 Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
75516: Merged V4.2-BUG-FIX (4.2.3) to HEAD-BUG-FIX (5.0/Cloud)
      75147: MNT-11789: Merged V4.1-BUG-FIX (4.1.10) to V4.2-BUG-FIX (4.2.3)
         75140: MNT-11788: Merged V4.1.8 (4.1.8.11) to V4.1-BUG-FIX (4.1.10)
            74982: MNT-11766 : User with username starting with admin gets admin rights
               - MultiTServiceImpl#getBaseNameUser was modified to return base name as part of user name before @ symbol only for real existing tenant domains. If no tenant domain is actually found original username is returned as base name.
         75141: MNT-11788: Merged V4.1.8 (4.1.8.11) to V4.1-BUG-FIX (4.1.10)
            75139: MNT-11766 : User with username starting with admin gets admin rights
               - Just reformat (no code change) to find out if it is possible to use the same
                 fix for >= 4.2.N (which had already been reformatted), as it was not possible
                 to see given the large number of format changes.
         75145: Merged V4.1.9 (4.1.9) to V4.1-BUG-FIX (4.1.10) (RECORD ONLY)
            75143: Merged V4.1-BUG-FIX (4.1.10) to V4.1.9 (4.1.9)
               75140: MNT-11788: Merged V4.1.8 (4.1.8.11) to V4.1-BUG-FIX (4.1.10)
                  74982: MNT-11766 : User with username starting with admin gets admin rights
                     - MultiTServiceImpl#getBaseNameUser was modified to return base name as part of user name before @ symbol only for real existing tenant domains. If no tenant domain is actually found original username is returned as base name.
         75146: Merged V4.1.9 (4.1.9) to V4.1-BUG-FIX (4.1.10) (RECORD ONLY)
            75144: Merged V4.1-BUG-FIX (4.1.10) to V4.1.9 (4.1.9)
               75141: MNT-11788: Merged V4.1.8 (4.1.8.11) to V4.1-BUG-FIX (4.1.10)
                  75139: MNT-11766 : User with username starting with admin gets admin rights
                     - Just reformat (no code change) to find out if it is possible to use the same
                       fix for >= 4.2.N (which had already been reformatted), as it was not possible
                       to see given the large number of format changes.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@77478 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-07-22 12:49:39 +00:00
Mark Rogers
e208531988 Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
75505: Merged V4.2-BUG-FIX (4.2.3) to HEAD-BUG-FIX (5.0/Cloud)
      74929: MNT-11772: Cast Exception When Mapping Single Metadata Property to cm:taggable
         - Added check of propertyValue type


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@77467 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-07-22 12:40:31 +00:00
Mark Rogers
ee9d5fddcf Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
75497: Merged V4.2-BUG-FIX (4.2.3) to HEAD-BUG-FIX (5.0/Cloud)
      74569: Code cleanup from investigations


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@77459 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-07-22 12:33:30 +00:00
Mark Rogers
24f0f78b56 Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
75496: Merged V4.2-BUG-FIX (4.2.3) to HEAD-BUG-FIX (5.0/Cloud)
      74568: Issue a warning when finding a nodes that have the checkout-checkin aspects but where the association is missing
       - This is quite likely caused by the nodes cache being incorrect, which leads to the incorrect aspects being picked up
       - If you get the warning 'Found node with xyz aspect but no association", then the cache may be incorrect.
       - TODO: Recovery code, which is possible, if this turns out to be an issue


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@77458 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-07-22 12:32:08 +00:00
Mark Rogers
0b2efd4d2c Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
75134: Merged BRANCHES/DEV/KEVINR3 to BRANCHES/DEV/HEAD-BUG-FIX
      71905: Merged BRANCHES/DEV/KEVINR2 to BRANCHES/DEV/KEVINR3
         71779: Activities prototype - PDF Previewer link to original PDF correction
         71776: Activities prototype - Slingshot download urls for Image Preview dashlet and PDF Previewer components.
         71752: Activities prototype - Added activity feed items for Preview and Download actions
      71913: Activities prototype - styling and UX
      72000: Activities prototype - improved CSS
      73462: Activities prototype - CSS tweaks
      75128: Activities prototype - CSS tweaks


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@77438 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-07-22 12:15:29 +00:00
Gethin James
4d1141c27f ACE-2179, fix TestCMIS test, MultiTNodeServiceInterceptor throws an exception when it tries to intercept a deleted node.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@76129 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-07-09 10:24:39 +00:00
Will Abson
5adf37ba71 Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
75092: Merged WAT2 (5.0/Cloud) to HEAD-BUG-FIX (5.0/Cloud)
      74393: Removed the extra step when posting activities, its now enhanced from the queue.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@75421 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-07-01 15:32:27 +00:00
Will Abson
d1e580887c Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
75090: Merged WAT2 (5.0/Cloud) to HEAD-BUG-FIX (5.0/Cloud)
      74391: Better logging/messages from the mmt


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@75418 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-07-01 15:32:11 +00:00
Will Abson
e5ec4ddaa3 Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
75088: Merged WAT2 (5.0/Cloud) to HEAD-BUG-FIX (5.0/Cloud)
      73976: Improvements to activities post events for ACE-1707


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@75416 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-07-01 15:31:54 +00:00