5173 Commits

Author SHA1 Message Date
Erik Winlof
a78c593e83 Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
78372: Merged V4.2-BUG-FIX (4.2.3) to HEAD-BUG-FIX (5.0)
      76636 : Merged DEV to V4.2-BUG-FIX (4.2.3)
         76604 : MNT-11876 : CMIS extension data is not returned in 1.1 atom binding
            - Return aspects and aspect properties in extension data. Test for the fix


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@82533 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-09-03 11:51:45 +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
Mark Rogers
88e47210dc revert kludge
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@79601 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-08-13 17:06:19 +00:00
Mark Rogers
3011eeeafe ACE-2487- Activating Duplicate Model in Cloud Causes Infinite Registration Loop
Kludge - disable all dynamic models - build will go red.

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@79377 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-08-13 14:40:32 +00:00
Will Abson
5d80ebd215 Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
78695: ACE-2309: Edit in Google Docs™ option missing
     - Define a registrar bean which can be used by extensions to add custom responses to the original list defined in slingshot-context.xml
     - Abstract bean is named registerSlingshotCustomResponse, developers just need to add the key and value properties to a new instance to add them


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@79004 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-08-06 08:14:03 +00:00
Stefan Kopf
2e5687473e Revert r78925 to fix ACE-2393
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@78933 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-08-05 09:43:41 +00:00
Stefan Kopf
6e745c53ec ACE-2379 - 'Edit online' action is not working
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@78925 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-08-04 19:36:26 +00:00
Mark Rogers
74d5b35127 ACE-2237 : Rel38: Upgrade was not completed.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@78600 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-07-30 10:29:37 +00:00
Mark Rogers
e10bbbcecb Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
77274: Merged PLATFORM1 (5.0/Cloud) to HEAD-BUG-FIX (5.0/Cloud)
      76625: Deprecated ReplicatingContentStore's 'inbound' property and change sample  for outbound to false


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@78130 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-07-23 17:03:28 +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
d16f78b9b2 Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
77225: Merged PLATFORM1 (5.0/Cloud) to HEAD-BUG-FIX (5.0/Cloud)
      75644: ACE-2083 - Only allow document encryption if the capability has been licensed


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@78081 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-07-23 16:40:37 +00:00
Mark Rogers
d1cc3c8f4e Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
77210: Merged PLATFORM1 (5.0/Cloud) to HEAD-BUG-FIX (5.0/Cloud)
      75268: Removed deprecations of Alfresco-specific bind transactional bind methods.  These are valid as they are an abstraction.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@78066 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-07-23 16:32:58 +00:00
Mark Rogers
c0224dacca Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
77202: Merged PLATFORM1 (5.0/Cloud) to HEAD-BUG-FIX (5.0/Cloud)
      74762: ACE-955 "Custom Content Models in Cloud"
      Fix Enterprise build tests, some tidy up


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@78058 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-07-23 16:29:07 +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
c61bfef42c Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
77157: Merged PLATFORM1 (5.0/Cloud) to HEAD-BUG-FIX (5.0/Cloud)
      74030: Bring APIs for ContentStore into data-model project (ACE-1690)


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@78015 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-07-23 16:05:20 +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
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