Commit Graph

279 Commits

Author SHA1 Message Date
Erik Winlof
f7c9eb6db8 Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
78565: Merged V4.2-BUG-FIX (4.2.4) to HEAD-BUG-FIX (5.0/Cloud)
      77792: Merged V4.2.3 (4.2.3) to V4.2-BUG-FIX (4.2.4)
         77393: Merged DEV to V4.2.3 (4.2.3)
            76812: MNT-11695 : Site cannot be deleted if copy/move outbound rule exists
            Fixed move action, implemented a JUnit test to simulate the issue.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@82602 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-09-03 12:35:11 +00:00
Erik Winlof
ad229d966f Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
78564: Merged V4.2-BUG-FIX (4.2.4) to HEAD-BUG-FIX (5.0/Cloud)
      77751: Merged DEV to V4.2-BUG-FIX (4.2.4)
         77428 : MNT-11911 : Cancelling a download as ZIP archive leads to nodeRef-ID displayed at 'My Documents' dashlet
            - Added temp file aspect "indexControl", property "isIndexed" and "isContentIndexed" which allow not index files in the search. Added in JUnit test check to add properties and aspects. Now in "My Documents" dashlet is not visible zip file. 


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@82601 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-09-03 12:34:48 +00:00
Erik Winlof
87085fafda Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
78561: Merged V4.2-BUG-FIX (4.2.4) to HEAD-BUG-FIX (5.0/Cloud)
      77720: Merged DEV to V4.2-BUG-FIX (4.2.4)
         57817: MNT-7383: ActionFormProcessor not capable of handling multi-valued parameters, empty optional parameters and paramater types other than TEXT, BOOLEAN or NODE_REF
         The hard limitation to TEXT, BOOLEAN and NODE_REF fields was relaxed to make use of default controls in the Share UI.
         Added unit test.
      78164: MNT-7383 : ActionFormProcessor not capable of handling multi-valued parameters, empty optional parameters and paramater types other than TEXT, BOOLEAN or NODE_REF
      Reimplemented missing test configuration.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@82598 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-09-03 12:34:03 +00:00
Erik Winlof
e429be8b8c Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
78537: Merged V4.2-BUG-FIX (4.2.4) to HEAD-BUG-FIX (5.0/Cloud)
      77398: MNT-11279: Docx Preview: FileName in the document header not previewing correctly
       - Keep original name during convertion.
       - Add unit testMNT-11279: Docx Preview: FileName in the document header not previewing correctly
       - Keep original name during convertion.
       - Add unit test


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@82590 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-09-03 12:29:43 +00:00
Erik Winlof
f4e6466c93 Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
78501: Merged V4.2-BUG-FIX (4.2.4) to HEAD-BUG-FIX (5.0/Cloud)
      76817: MNT-11756: Merged DEV to V4.2-BUG-FIX (4.2.4)
         76808: MNT-11756: Associated nodes deleted when reverting to older version.
            - Keep secondary association during revert if versioned and current node have child association with the same node


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@82573 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-09-03 12:20:51 +00:00
Erik Winlof
e35970c3f1 Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
78500: Merged V4.2-BUG-FIX (4.2.4) to HEAD-BUG-FIX (5.0/Cloud)
      76815: Merged V4.2.3 (4.2.3) to V4.2-BUG-FIX (4.2.4)
         76612: Merged DEV to V4.2.3 (4.2.3)
            73832: MNT-11695 : Site cannot be deleted if copy/move outbound rule exists
            Added a test to simulate the issue.
            73871: MNT-11695 : Site cannot be deleted if copy/move outbound rule exists
            Added a check for the destination not to be in a pending delete list for copy action executer.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@82572 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-09-03 12:20:30 +00:00
Erik Winlof
ddef482f7e Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
78498: Merged V4.2-BUG-FIX (4.2.4) to HEAD-BUG-FIX (5.0/Cloud)
      76654: MNT-10226: Web Script - Status 500 error on 'Edit Properties' page after adding 'Restrictable' aspect through CMIS 1.1 API
      Fix unit test failures: now webscripts return values with appropriate type, so in tests it should be compared with value of the expected type.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@82570 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-09-03 12:19:55 +00:00
Erik Winlof
8801446a2b Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
78434: Merged EOL (5.0/Cloud) to HEAD-BUG-FIX (5.0/Cloud)
      76169: ACE-2149: EOL AVM / WCM
       - Adjust permission count checks after AVM/WCM removal


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@82561 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-09-03 12:14:46 +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
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
Erik Winlof
f01f727e5e Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
78392: Merged EOL (5.0/Cloud) to HEAD-BUG-FIX (5.0/Cloud)
      75693: ACE-2149 Remove AVM/WCM - first round, based on the following Sparta commits
         08f1ff556cf3e8eb370e433b69b634026c848af1: SlimRepo: comment-out AVM schema bootstrap and wcm-services-context
            - plus associated bootstrap/startup fallout
            - note: disabling/removing WCM/AVM will be a work-in-progress due to tight code coupling :-(
         cdb78eeae53522cc2d78feb94be49d11648fa582; SlimRepo: comment-out AVM schema bootstrap and wcm-services-context
             - follow-on to fix "regenerate_renditions" fallout error (in Alfresco Explorer web client)
         33337ad4239df91b9a8dc7a00be43e55ffef5bef: SlimRepo: remove WCM/AVM - round 1 (wip)
            - removal of some of the AVM code and tests (including core impl such as AVMServiceImpl, AVMRepository, AVMSyncServiceImpl, underlying DAOs etc)
            - fix Spring config (major impact) and any obvious compile-time fallout
            - ensured repo starts and ran (some of the) repo unit tests
            - also check basic Explorer access
         47e50847bbbbdda5fd64a27c212dfbdd625cbfdb: Jenkins build/test repo - minor: disable/remove repo tests
            - disabled unused tests, removed remaining AVM* tests


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@82537 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-09-03 11:57:51 +00:00
Erik Winlof
d385bc9bb1 Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
78359: Merged V4.2-BUG-FIX (4.2.4) to HEAD-BUG-FIX (5.0/Cloud)
      76619: Merged DEV to V4.2-BUG-FIX (4.2.4).
         76456: MNT-10693 Changing permission on a document changes its modified fields in Share
         76496: MNT-10693 Changing permission on a document changes its modified fields in Share
         76499: MNT-10693 Changing permission on a document changes its modified fields in Share
                   - In PermissionServiceTest.testPreserveAuditableData() was made changes.
         76520: MNT-10693 Changing permission on a document changes its modified fields in Share
                   - In AbstractPermissionTest was changed visibility of 'applicationContext' to 'protected'. 


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@82530 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-09-03 11:36:59 +00:00
Steven Glover
b610216824 ACE-2308 "Dictionary load errors caused by ConcurrentModificationException"
Add locking/concurrent data structures to dictionary registry to deal with multi-threading introduced by asynchronously refreshed compiled models cache
Code tidy up
Removed unused imports

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@78693 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-07-31 10:59:31 +00:00
Mark Rogers
ec8137e8dc Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
77259: Merged PLATFORM1 (5.0/Cloud) to HEAD-BUG-FIX (5.0/Cloud)
      76447: SOLR node metadata includes getNamePaths, which is a Collection<Collection<String>>
       - JSON serialization stubbed out; fix TODOs in NodesMetaDataGet to transfer serialize to specification
       - The name paths are the largest list of names of nodes that culminate in the target node.
       - The top parent is the last highest parent with a cm:name property
       - ALL paths are introspected but it does not mean that the node path count will always equal the name path count


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@78115 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-07-23 16:56:36 +00:00
Mark Rogers
1edab772b1 Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
77245: Merged PLATFORM1 (5.0/Cloud) to HEAD-BUG-FIX (5.0/Cloud)
      76227: Merged DEV to PLATFORM1 with corrections
         75545: ACE-1996: Cluster: Web client extensions not distributed:
            - Remove initial title/description resolving in CMIS dictionaries
            - Use asynchronously refreshed cache in diactionaryDAO
            - Modify unit tests that uses CompiledModelCache 
            - Make sure that rootNode exists before children retrieving in DictionaryRepositoryBootstrap.getNodes()


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@78101 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-07-23 16:50:06 +00:00
Mark Rogers
d9271fc8e8 Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
77193: Merged PLATFORM1 (5.0/Cloud) to HEAD-BUG-FIX (5.0/Cloud)
      74588: Revert of R 74318 ACE-1996


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@78049 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-07-23 16:24:56 +00:00
Mark Rogers
eaf4f69cdd Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
77169: Merged PLATFORM1 (5.0/Cloud) to HEAD-BUG-FIX (5.0/Cloud)
      74318: ACE-1996: Cluster: Web client extensions not distributed:
       - Remove initial title/description resolving in CMIS dictionaries
       Merged DEV to PLATFORM1(4.3.0) with corrections
         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@78027 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-07-23 16:14:52 +00:00
Mark Rogers
8f0fae4336 Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
77158: Merged PLATFORM1 (5.0/Cloud) to HEAD-BUG-FIX (5.0/Cloud)
      74123: ACE-1802 "MT / Cloud Restrict namespace URI of dynamic models."
      ACE-955 "Custom Content Models in Cloud"
      More build fixes: enforce tenant in model namespace restriction on Cloud only, remove unused test class, ensure correct initialisation of CMIS dictionary, make new Cloud dictionary tests run in a separate VM


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@78016 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-07-23 16:05:49 +00:00
Mark Rogers
ece83f5410 Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
77154: Merged PLATFORM1 (5.0/Cloud) to HEAD-BUG-FIX (5.0/Cloud)
      74004: ACE-1802 "MT / Cloud Restrict namespace URI of dynamic models."
      ACE-955 "Custom Content Models in Cloud"
      fix tests


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@78012 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-07-23 16:03:56 +00:00
Mark Rogers
1b4155add7 Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
77153: Merged PLATFORM1 (5.0/Cloud) to HEAD-BUG-FIX (5.0/Cloud)
      74000: ACE-1802 "MT / Cloud Restrict namespace URI of dynamic models."
      ACE-955 "Custom Content Models in Cloud"
      fix build


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@78011 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-07-23 16:03:28 +00:00
Mark Rogers
3349e56606 Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
77152: Merged PLATFORM1 (5.0/Cloud) to HEAD-BUG-FIX (5.0/Cloud)
      73997: Test cleanup following r73957: ContentStore API cleanup


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@78010 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-07-23 16:03:00 +00:00
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
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
6250491ae5 Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
77132: Merged PLATFORM1 (5.0/Cloud) to HEAD-BUG-FIX (5.0/Cloud)
      73479: Removed AVM-only test from DomainTestSuite


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@77987 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-07-23 15:45:45 +00:00
Mark Rogers
90712bd712 Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
77099: Merged PLATFORM1 (5.0/Cloud) to HEAD-BUG-FIX (5.0/Cloud)
      73031: ACE-956 - fixes to other unit tests affected by the change of interface.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@77950 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-07-23 15:13:26 +00:00
Mark Rogers
c260a1f85a Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
77080: Merged PLATFORM1 (5.0/Cloud) to HEAD-BUG-FIX (5.0/Cloud)
      72874: More for ACE-1034   SOLR 4 - Data model - Impl - part 2


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@77929 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-07-23 14:38:28 +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
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
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
ded1d1a971 Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
76588: Merged V4.2-BUG-FIX (4.2.4) to HEAD-BUG-FIX (5.0/Cloud)
      76507: Merged V4.2.3 (4.2.3) to V4.2-BUG-FIX (4.2.4)
         76354: MNT-11247 : Additional assignment events triggered at end of workflow
         Added a test to simulate the issue.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@77655 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-07-22 15:55:05 +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
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
Will Abson
71352485d3 Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
75091: Merged WAT2 (5.0/Cloud) to HEAD-BUG-FIX (5.0/Cloud)
      74392: Update tests for mmt version check logging


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@75419 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-07-01 15:32:19 +00:00
Will Abson
567f58eca1 Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
75032: Merged WAT2 (5.0/Cloud) to HEAD-BUG-FIX (5.0/Cloud)
      71716: Added a webscript to raise browser events ACE-1709


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@75360 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-07-01 15:10:20 +00:00
Will Abson
f4f3bdd860 Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
75030: Merged WAT2 (5.0/Cloud) to HEAD-BUG-FIX (5.0/Cloud)
      71714: Added a event publishing test to WebDAVHelper


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@75358 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-07-01 15:10:04 +00:00
Will Abson
9aaca71a50 Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
75011: Merged WAT2 (5.0/Cloud) to HEAD-BUG-FIX (5.0/Cloud)
      70370: Cleaned up the solr stats code, added security check and tenants


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@75339 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-07-01 15:00:02 +00:00
Will Abson
ceeee50b22 Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
75005: Merged WAT2 (5.0/Cloud) to HEAD-BUG-FIX (5.0/Cloud)
      70182: WIP, allows date ranges for solr stats queries


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@75334 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-07-01 14:59:19 +00:00
Will Abson
1962cab130 Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
75000: Merged WAT2 (5.0/Cloud) to HEAD-BUG-FIX (5.0/Cloud)
      69908: Initial version of Solr Stats service and webscript


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@75329 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-07-01 14:58:38 +00:00
Will Abson
e9f9812165 Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (4.3/Cloud)
74254: Merged V4.2-BUG-FIX (4.2.3) to HEAD-BUG-FIX (5.0/Cloud)
      74153: Merged DEV to V4.2-BUG-FIX
       73664	: MNT-11667 : "createComment" method creates activity for users who are not supposed to see the file
       Added "nodeRef" for json activity data.
       74134 : MNT-11667 : "createComment" method creates activity for users who are not supposed to see the file
       Added unit test.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@74887 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-06-25 16:33:14 +00:00
Will Abson
67ebe0412b Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (4.3/Cloud)
74253: Merged V4.2-BUG-FIX (4.2.3) to HEAD-BUG-FIX (5.0/Cloud)
      74025: Merged DEV to V4.2-BUG-FIX (4.2.3)
         74013: MNT-11653 : Content Model <override> doesnt allow overriding "enforcement"
         Changed the mandatory type validation.
         Added model validation against xsd in the test.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@74886 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-06-25 16:33:06 +00:00
Will Abson
347b91ac1f Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (4.3/Cloud)
74021: Merged DEV 5.0 to HEAD-BUG-FIX (5.0)
      r73999: ACE-1979: BM-0015: S3 AWS error messages generated during load tests
      - Emptying tag scope cache has been changed to setting content property for the cache to null to avoid zero-size writes. New test has been added for 'UpdateTagScopesActionExecuter' which covers use-case described in point 4. The fix has been tested against 'TaggingServiceImplTest'


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@74867 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-06-25 16:28:14 +00:00
Will Abson
8d6d4e9e88 Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (4.3/Cloud)
73990: Merged V4.2-BUG-FIX (4.2.3) to HEAD-BUG-FIX (5.0/Cloud)
      73920: MNT-11653 : Content Model <override> doesnt allow overriding "enforcement"
      Added clean up for the test.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@74855 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-06-25 16:18:24 +00:00
Will Abson
2cbb29e38c Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (4.3/Cloud)
73962: Merged V4.2-BUG-FIX (4.2.3) to HEAD-BUG-FIX (5.0/Cloud)
      73819: Merged DEV to V4.2-BUG-FIX (4.2.3)
         73811: MNT-11653 : Content Model <override> doesnt allow overriding "enforcement"
         Added a test to simulate the issue.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@74848 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-06-25 16:17:33 +00:00
Will Abson
176c2069be Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (4.3/Cloud)
73702: Merged V4.2-BUG-FIX (4.2.3) to HEAD-BUG-FIX (4.3/Cloud)
      73647: Merged DEV to V4.2-BUG-FIX (4.2.3)
         73236: Merged DEV to DEV
            71914: MNT-11424 : MultiTServiceImpl.java check if MT is enabled in functions - username as email may return wrong result
            Corrected the MultiTServiceImpl.isTenantUser(String).
            Added a test to simulate the issue.
         73242: MNT-11424 : MultiTServiceImpl.java check if MT is enabled in functions - username as email may return wrong result
         Removed @deprecated marks.
         Added @Override annotations.
         73244: MNT-11424 : MultiTServiceImpl.java check if MT is enabled in functions - username as email may return wrong result
         Fixed formatting.
         73245: MNT-11424 : MultiTServiceImpl.java check if MT is enabled in functions - username as email may return wrong result
         Fixed messed javadoc.
         73372: MNT-11424 : MultiTServiceImpl.java check if MT is enabled in functions - username as email may return wrong result
         Implemented tests.
         Fixed the getPrimaryDomain method.
         73484: MNT-11424 : MultiTServiceImpl.java check if MT is enabled in functions - username as email may return wrong result
         Removed wrongly committed files from r73236.
         73492: MNT-11424 : MultiTServiceImpl.java check if MT is enabled in functions - username as email may return wrong result
         Fixed multi line method calls.
         Added additional test.
         73552: MNT-11424 : MultiTServiceImpl.java check if MT is enabled in functions - username as email may return wrong result
         Hardened the test's initialization and clean up methods.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@74811 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-06-25 16:08:29 +00:00