Commit Graph

2424 Commits

Author SHA1 Message Date
Erik Winlof
eb6e5e1ff0 Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
78437: Merged EOL (5.0/Cloud) to HEAD-BUG-FIX (5.0/Cloud)
      76188: ACE-2149: EOL AVM / WCM
       - Force a type exclusion (act:actionbase) in order to test CMIS type exclusions
       - Originally, all wcm prefixes were ignored and that had been used by the CMIS exclusion test


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@82563 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-09-03 12:15:25 +00:00
Erik Winlof
eaa84fe057 Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
78436: Merged EOL (5.0/Cloud) to HEAD-BUG-FIX (5.0/Cloud)
      76187: ACE-2149: EOL AVM / WCM
       - Fix DictionaryRestApiTest to use 'cm:' model during testing


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@82562 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-09-03 12:15:05 +00:00
Erik Winlof
7599a9b24d Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
78432: Merged EOL (5.0/Cloud) to HEAD-BUG-FIX (5.0/Cloud)
      76036: Fixed PutMethodTest: Just throw unexpected exceptions in the test so that they are fully reported


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@82559 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-09-03 12:14:09 +00:00
Erik Winlof
4e8556fc9b Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
78421: Merged EOL (5.0/Cloud) to HEAD-BUG-FIX (5.0/Cloud)
      75797: ACE-2149: EOL AVM / WCM
       - Removal from 'remote-api' project


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@82553 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-09-03 12:11:32 +00:00
Erik Winlof
4249c9ac4b Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
78412: Merged EOL (5.0/Cloud) to HEAD-BUG-FIX (5.0/Cloud)
      75749: ACE-2149 Remove references to deployment project in both Ant and Maven build


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@82544 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-09-03 12:07:24 +00:00
Erik Winlof
0546224e23 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
Stefan Kopf
b2d7a39178 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
5599194b2b 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
61aca470a0 Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
78213: Fixed ACE-2280 to allow the Repo Admin access the site admin console.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@78235 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-07-24 15:13:16 +00:00
Mark Rogers
72baa4c274 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
f146545510 Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
77215: Merged PLATFORM1 (5.0/Cloud) to HEAD-BUG-FIX (5.0/Cloud)
      75542: WIP    ACE-2114    SOLR 4 - port query languages - Part 1
      - move to antlr 3.5.2 to resolve library issue between SOLR and alfresco use of antlr


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@78071 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-07-23 16:35:33 +00:00
Mark Rogers
8b87bbf09a Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
77207: Merged PLATFORM1 (5.0/Cloud) to HEAD-BUG-FIX (5.0/Cloud)
      75127: Test a fix for oauth breakage in Cloud build


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@78063 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-07-23 16:31:26 +00:00
Mark Rogers
e0cd637688 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
fb70692bac 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
53eb8be74a Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
77127: Merged PLATFORM1 (5.0/Cloud) to HEAD-BUG-FIX (5.0/Cloud)
      73448: Added SubscriptionServiceRestApiTest (not in any suites) to WebScriptTestSuite


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@77981 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-07-23 15:40:11 +00:00
Mark Rogers
8fbde8d254 Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
77125: Merged PLATFORM1 (5.0/Cloud) to HEAD-BUG-FIX (5.0/Cloud)
      73446: ACE-1685: added transaction usage to failing test (SOLRWebScriptTest.testAclReadersGet()) and added to TestSuite (test wasn't being run in CI)


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@77978 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-07-23 15:36:03 +00:00
Mark Rogers
ac506b2b31 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
100c5e6f93 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
a5e4c44e29 Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
76632: Merged EOL2 to HEAD-BUG-FIX (5.0/Cloud)
      76533: ACE-2219 - EOL external Surf - remove Surf mobile project
      76536: ACE-2219 - Surf external - cleanup of obsolete Eclipse projects, developer local maven projects now mandatory as ANT no longer builds Surf. SVN ignore patterns for Eclipse projects.
      76540: ACE-2219 - Surf external - more cleanup of obsolete Eclipse projects, more SVN ignore patterns.
      76541: ACE-2219 - Surf external - more cleanup of obsolete Eclipse projects, more SVN ignore patterns - 2.
      76542: ACE-2219 - Surf external - restore privatemodules classpath


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@77668 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-07-22 16:11:27 +00:00
Mark Rogers
29973b9124 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
06a2d4a2aa Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
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. 


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@77658 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-07-22 15:57:24 +00:00
Mark Rogers
0dfc1fb49d Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
76576: Merged V4.2-BUG-FIX (4.2.4) to HEAD-BUG-FIX (5.0/Cloud)
      76403: Merged DEV to V4.2-BUG-FIX (4.2.4)
         60219: MNT-10403 : Improve description of provided Services for Documentation
         Improved documentation for webscripts.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@77643 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-07-22 15:41:13 +00:00
Mark Rogers
874f632d1b Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
76575: Merged V4.2-BUG-FIX (4.2.4) to HEAD-BUG-FIX (5.0/Cloud)
      76363: MNT-10977: Workflow process retrieval returns incorrect hasMoreItems value
      Additional fix for build failure: https://bamboo.alfresco.com/bamboo/browse/ALF-ENTERPRISEV42BUGFIX-452


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@77642 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-07-22 15:40:31 +00:00
Mark Rogers
079b879c67 Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
76573: Merged V4.2-BUG-FIX (4.2.4) to HEAD-BUG-FIX (5.0/Cloud)
      76287: MNT-11511 : All tags are not displayed in repository when the number of nodes taggable is over 1000
         - Merge to incorrect branch was removed


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@77640 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-07-22 15:39:29 +00:00
Mark Rogers
ffbd5d1143 Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
76572: Merged V4.2-BUG-FIX (4.2.4) to HEAD-BUG-FIX (5.0/Cloud)
      76284: MNT-11511 : All tags are not displayed in repository when the number of nodes taggable is over 1000
         - Added a test


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@77639 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-07-22 15:38:10 +00:00
Mark Rogers
cd7943b92a Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
76566: Merged V4.2-BUG-FIX (4.2.4) to HEAD-BUG-FIX (5.0/Cloud)
      76181: MNT-10977: Workflow process retrieval returns incorrect hasMoreItems value
      Additional fix for build failure: https://bamboo.alfresco.com/bamboo/browse/ALF-ENTERPRISEV42BUGFIX-447


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@77632 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-07-22 15:31:56 +00:00
Mark Rogers
615d5bf409 Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
76562: Merged V4.2-BUG-FIX (4.2.4) to HEAD-BUG-FIX (5.0/Cloud)
      76043: MNT-10977: Workflow process retrieval returns incorrect hasMoreItems value
      The fix for build failure: https://bamboo.alfresco.com/bamboo/browse/ALF-ENTERPRISEV42BUGFIX-JOB1-446/log


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@77629 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-07-22 15:30:17 +00:00
Mark Rogers
fe8594a249 Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
76558: Merged V4.2-BUG-FIX (4.2.4) to HEAD-BUG-FIX (5.0/Cloud)
      75813: Merged DEV V4.2-BUG-FIX to V4.2-BUG-FIX (4.2.3)
         65552: MNT-10977: Workflow process retrieval returns incorrect hasMoreItems value
           - 'hasMoreItems' value calculation has been modified to take into account skipped elements
         67687: MNT-10977: Workflow process retrieval returns incorrect hasMoreItems value
           - 'org.alfresco.rest.workflow.api.impl.ProcessesImplTest' has been implemented to cover both test cases of the issue


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@77625 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-07-22 15:26:48 +00:00
Mark Rogers
60e59533eb Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
76552: Merged EOL2 to HEAD-BUG-FIX (5.0/Cloud)
      76438: ACE-2219 EOL use of external spring surf (bring spring surf back into Alfresco)
         - SpringSurf is coming home. Part 1 - copy of remaining SpringSurf projects from r1567 and refactor
           of pom files to build in Alfresco parent structure.
      76444: ACE-2219 EOL use of external spring surf (bring spring surf back into Alfresco)
         - Merge of r1568 from SpringSurf - Clear an additional cache in DojoDependencyHandler to
           prevent a cached reference being found for a resource that doesn't exist.
      76445: ACE-2219 EOL use of external spring surf (bring spring surf back into Alfresco)
         - Ignore patterns for surf projects
      76450: ACE-2219 EOL use of external spring surf (bring spring surf back into Alfresco)
         - Surf now building from root alfresco pom - full maven builds for Community,
           Enterprise and Thor all building and working. SURF IS HOME.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@77621 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-07-22 15:21:41 +00:00
Mark Rogers
9e6949acdc Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
76510: ACE-2217 - Node Browser Page not loading & Searching Popup runs forever. WebScript definition of NodeBrowser bean was in the wrong context file - was in WS API context file which has been deleted, nicely done.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@77617 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-07-22 15:15:59 +00:00
Mark Rogers
27ee35dead Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
76356: Remove 'Experimental' warning in pom files. This is not an experiment any more...


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@77598 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-07-22 15:01:17 +00:00
Mark Rogers
3c639cb2d2 Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
76309: Merged EOL2 (5.0.0.EOL2) to HEAD-BUG-FIX (5.0/Cloud)
      76162: ACE-2012 - EOL legacy Abdera libraries and dependants. Updated Surf to 1.2.1-M17.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@77588 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-07-22 14:52:21 +00:00
Mark Rogers
670850ec73 Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
76308: Merged EOL2 (5.0.0.EOL2) to HEAD-BUG-FIX (5.0/Cloud)
      76119: ACE-2012 EOL legacy Facebook API


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@77587 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-07-22 14:50:24 +00:00
Mark Rogers
b0a30c2155 Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
76305: Merged EOL2 (5.0.0.EOL2) to HEAD-BUG-FIX (5.0/Cloud)
      76026: ACE-2012 EOL Original SOAP API (CML) - removed. Based on BRANCHES/DEV/EOL:r73833,73932 and CMIS EOL removal merge.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@77579 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-07-22 14:13:46 +00:00
Mark Rogers
7830993973 Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
76302: Merged EOL2 (5.0.0.EOL2) to HEAD-BUG-FIX (5.0/Cloud)
      75774: ACE-2010 - EOL Legacy CMIS - removed webscript REST APIs pertinent to Alfresco 3.4 CMIS API pt2


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@77576 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-07-22 14:10:36 +00:00
Mark Rogers
2ee09a101d Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
76300: Merged EOL2 (5.0.0.EOL2) to HEAD-BUG-FIX (5.0/Cloud)
      75765: ACE-2010 - EOL Legacy CMIS - removed webscript REST APIs pertinent to Alfresco 3.4 CMIS API pt1


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@77575 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-07-22 14:10:04 +00:00
Mark Rogers
a2a78f0df5 Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
76124: Merged V4.2-BUG-FIX (4.2.3) to HEAD-BUG-FIX (5.0/Cloud)
      75805: Merged DEV to V4.2-BUG-FIX (4.2.3)
         68066 : MNT-11265 : [Public Workflow API] HTTP 500 when enumerating activitiInvitationModerated variables
            - Added working with string values


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@77569 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-07-22 14:06:05 +00:00
Mark Rogers
0283c26c54 Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
76029: Merged V4.2-BUG-FIX (4.2.3) to HEAD-BUG-FIX (5.0/Cloud)
      75747: Merged DEV to V4.2-BUG-FIX (4.2.3)
         75293 : MNT-11811 : Avatar upload fails with IE
            - Using a check for mimetype after it was set


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@77550 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-07-22 13:52:33 +00:00
Mark Rogers
4ee0b4577f Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
75673: Merged EOL into HEAD-BUG-FIX (5.0): ACE-2149: removal of AVM/WCM
      75611: Remove catalina-virtual project, and all mentions of the virtual tomcat
      75619: Remove jndi-client projects and ServletContextFormDataFunctionsAdapter, which references it
      75626: Remove wdr-deployment project
      75637: Remove CompanyFooterBean and PressReleaseBean classes, packaged as resources in web-client and specially compiled.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@77522 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-07-22 13:32:37 +00:00
Mark Rogers
a0351eb95c Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
75640: Merged V4.2-BUG-FIX (4.2.3) to HEAD-BUG-FIX (5.0/Cloud)
      75549: MNT-11808: Missing location/where field in downloaded iCal event from Share site calendar
         - In eventList.get.calendar.ftl was added location tag.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@77516 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-07-22 13:28:07 +00:00
Mark Rogers
91823f070a 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
c9e3990b12 Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
75580: Fix to Share Content Download bean definition since CMIS EOL merge. If DEV branches were synced up first this wouldn't happen.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@77497 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-07-22 13:05:55 +00:00
Mark Rogers
4af2f1fa50 Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
75556: Merged EOL to HEAD-BUG-FIX (5.0/Cloud)
      74583: ACE-2010 EOL Legacey CMIS Inputs (2) in 5.0
         << Broken >>
         - With Kevin - try and bring back ContentGet/ContentInfo so need ReferenceFactory 
      75109: ACE-2010 - EOL Legacey CMIS Inputs (2) in 5.0. Restored ContentGet and ContentInfo functionality without CMIS related infection.
      75110: ACE-2010 - EOL Legacey CMIS Inputs (2) in 5.0. Move content scripts out of cmis folder so it can be safely removed.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@77490 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-07-22 13:00:01 +00:00
Mark Rogers
75b6831d2a 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
d449ca6eaf 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
94597c622a Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
75514: Merged V4.2-BUG-FIX (4.2.3) to HEAD-BUG-FIX (5.0/Cloud)
      75123: Merged DEV to V4.2-BUG-FIX (4.2.3)
         74367: MNT-11725 : Unable to manage permissions when granted coordinator role.
         Changed the order of adding and deleting a permission for the downgrading of permissions use case.
         75098: MNT-11725 : Unable to manage permissions when granted coordinator role.
         Added a test to simulate the issue.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@77476 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-07-22 12:47:56 +00:00
Mark Rogers
8a96e0b8a5 Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
75498: Merged V4.2-BUG-FIX (4.2.3) to HEAD-BUG-FIX (5.0/Cloud)
      74571: MNT-7254 : Deleting checked out item from datalist
             - Hiding of working copies from dataList


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@77460 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-07-22 12:34:00 +00:00
Mark Rogers
3ab630c054 Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
75494: Merged V4.2-BUG-FIX (4.2.3) to HEAD-BUG-FIX (5.0/Cloud)
      74560: Merged DEV to V4.2-BUG-FIX (4.2.3)
         71898: MNT-11444: Locally set permissions on moderated public sites lead to unexpected results
            - Check for a null containerNode variable


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@77456 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-07-22 12:29:56 +00:00
Mark Rogers
c166849c87 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
Will Abson
5f57f29e93 Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
75283: Revert change from findSites() to getSites() when WAT2 r67022 was merged in r74984


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