5194 Commits

Author SHA1 Message Date
Erik Winlof
b1453aa246 Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
78692: ACE-2346: Merged V4.2-BUG-FIX (4.2.4) to HEAD-BUG-FIX (5.0/Cloud)
      76534: 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.
      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@82630 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-09-03 12:49:30 +00:00
Erik Winlof
77e7de5626 Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
78612: Fix PropertyFieldProcessor, committed by mistake


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@82623 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-09-03 12:46:28 +00:00
Erik Winlof
af3480e728 Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
78611: Merged V4.2-BUG-FIX (4.2.3) to HEAD-BUG-FIX (5.0/Cloud): Bringing Maven installer up-to-date with Ant installer, and removing the latter
      74010: Merged V4.1-BUG-FIX (4.1.10) to V4.2-BUG-FIX (4.2.3)
         74007: Merged V4.1.9 (4.1.9) to V4.1-BUG-FIX (4.1.10)
            73973: MNT-11647: Impossible to check in the google spreadsheet
            Custom share configuration sample has been modified to reflect changes in the Google API
      74968: Merged DEV to V4.2-BUG-FIX (4.2.3)
         74960: MNT-11762 : include the new option <stripUserNameSuffix/> in the sample share-config-custom.xml
            - Added variable "stripUsernameSuffix" to share-config-custom file
      75142:  Merged DEV to V4.2-BUG-FIX (4.2.3)
         74496: MNT-11611: Delivered bin/apply_amps.sh doesn't use installer delivered java
           - java verification was added.
      76950: MNT-11947: Merged V4.1-BUG-FIX (4.1.10) to V4.2-BUG-FIX (4.2.4)
         76944: MNT-11945: Merged V4.1.2 (4.1.2.18) to V4.1-BUG-FIX (4.1.10)
            76360: MNT-11836: Persistent Cookies vulnerability
               - The new CookieInterceptor was added that removes the alfUsername2 cookie from response. This is configurable option and as default cookie won't be removed. Sample could be found in share-config-custom.xml.sample.
      77375: MNT-11159 Applied Bitrock fix to avoid invalid warning when installation folder field is empty
      77726: Merged DEV to V4.2-BUG-FIX (4.2.4)
         77705: MNT-11920 : Should remove jtds-1.2.5.jar in alfresco lib directory
         Removed jtds-1.2.5.jar from libs.
      77869: Merged V4.2.3 (4.2.3) to V4.2-BUG-FIX (4.2.4)
         77451: Merged V4.1-BUG-FIX (4.1.10) to V4.2.3 (4.2.3)
            76492: Merged V4.1.9 (4.1.9) to V4.1-BUG-FIX (4.1.10)
               76264: MNT-11872 (Bitrock Case 15778) Tuning dependencies between Tomcat and Postgres Windows services, so that Postgres can stop.
               76396: MNT-11872 Apply newer Bitrock fix to finally stop services on Windows
               76466: MNT-11872 Apply newest Bitrock fix to finally finally stop services on Windows


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@82622 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-09-03 12:45:54 +00:00
Erik Winlof
e8faa3cd77 Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
78609: Merged V4.2-BUG-FIX (4.2.4) to HEAD-BUG-FIX (5.0/Cloud)
      78259: MNT-11895: Merged DEV to V4.2-BUG-FIX (4.2.4)
         78245: MNT-11895: Attribute Service Entries with "Serializable" objects in key Segments are not guaranteed to be unique
            - Dissallow attributeService entries with "Serializable" objects in key Segments because they are not guaranteed to be unique. Add unit test.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@82620 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-09-03 12:45:04 +00:00
Erik Winlof
1992fa9900 Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
78578: Merged V4.2-BUG-FIX (4.2.4) to HEAD-BUG-FIX (5.0/Cloud)
      78186: Merged DEV to V4.2-BUG-FIX (4.2.4)
         73408:MNT-11634: Thumbnail and preview transformation fail for empty xls/xlsx files on OpenOffice
          - The catch of JodConverter exception was added for preventing transformation fail for empty xls/xlsx files on OpenOffice 


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@82613 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-09-03 12:42:12 +00:00
Erik Winlof
dc45405aa9 Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
78573: Merged V4.2-BUG-FIX (4.2.4) to HEAD-BUG-FIX (5.0/Cloud)
      78005: Merged DEV to V4.2-BUG-FIX (4.2.4)
         77740: MNT-11960 : Public Share Link action changes modified by and modifier values on content
         Disabled audit for sharing.
         Added JUnit test.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@82609 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-09-03 12:41:03 +00:00
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
3ccf71dc7b Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
78551: Merged V4.2-BUG-FIX (4.2.4) to HEAD-BUG-FIX (5.0/Cloud)
      77501: Merged DEV to V4.2-BUG-FIX (4.2.4)
         76291 : MNT-11511 : All tags are not displayed in repository when the number of nodes taggable is over 1000
            - Using tagscope api at search for tags quantity in repository


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@82595 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-09-03 12:32:55 +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
3f5242db68 Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
78519: Merged EOL (5.0/Cloud) to HEAD-BUG-FIX (5.0/Cloud)
      78398: ACE-81 Upgrade MyBatis to 3.2.7
         - myBatis 3.2.7 upgrade onto Spring 3.2 upgrade. Merged in appropriate sections from BRANCHES/DEV/DEREK/ALF-19099 and fixed
         - myBatis namespace config issue. Full maven build with unit tests works, repo and share start and the basics seem to be working.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@82583 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-09-03 12:25:40 +00:00
Erik Winlof
2aecb5c5ac Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
78518: Merged EOL (5.0/Cloud) to HEAD-BUG-FIX (5.0/Cloud)
      78365: ACE-234 Upgrade Spring Framework
         - Spring 3.2 Upgrade against 5.0 pt1. NOTE: does not build yet. Committing ready for myBatis upgrade merge in.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@82582 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-09-03 12:25:04 +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
c532a2288d Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
78438: Merged EOL (5.0/Cloud) to HEAD-BUG-FIX (5.0/Cloud)
      77695: ACE-2149 - EOL AVM / WCM. Ripped WCM out of Explorer.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@82564 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-09-03 12:18:05 +00:00
Erik Winlof
385c8c2328 Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
78433: Merged EOL (5.0/Cloud) to HEAD-BUG-FIX (5.0/Cloud)
      76037: ACE-2149: EOL AVM / WCM
       - Fix MLContentInterceptor to avoid any ML code when a node is not ML-aware
       - Somehow the AVM interceptor removal exposed this bug


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@82560 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-09-03 12:14:27 +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
3b86753d32 Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
78416: Merged EOL (5.0/Cloud) to HEAD-BUG-FIX (5.0/Cloud)
      75791: ACE-2149: EOL AVM / WCM
       - Some (probably not all!) removal of AVM patch-related code and MyBatis config


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@82548 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-09-03 12:09:04 +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
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