Commit Graph

1293 Commits

Author SHA1 Message Date
Mark Rogers
e44a69e401 Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
85031: Merged PLATFORM1 (5.0/Cloud) to HEAD-BUG-FIX (5.0/Cloud)
      84201: Trivial change as part of ACE-2639. Added some javadoc and some code comments.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@85346 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-09-20 10:26:21 +00:00
Mark Rogers
06f1a662c4 Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
85028: Merged PLATFORM1 (5.0/Cloud) to HEAD-BUG-FIX (5.0/Cloud)
      84196: Addition of what I'm calling 'synthetic' facetable properties to SolrFacetService and REST API as part of ACE-2639.
      A synthetic property is something that is technically *NOT* a property, but which can be treated as such for the purposes
      of SOLR facetting/filtering.
      Currently we only support two synthetic properties: size and mimetype, which are defined within any Alfresco property of
      type d:content. This includes, but is not limited to, the cm:content property in all cm:content types in Alfresco.
      (Be careful with your cm:content. That name is heavily overloaded.)
      This checkin only supports what we need for 5.0. It is expressly not designed for resuse/extension in a general way.
      However, I have tried to push the less stable parts of this work into the implementation of the service and REST API
      and limit what's in the service interface to the more stable parts of the work.
      Also note that I had to add some l10n/i18n key-values for these synthetic properties. I've called the mimetype 'MIME type'
      in the l10n'd text as I have translations for that in all languages.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@85343 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-09-20 10:24:57 +00:00
Mark Rogers
b1478db657 Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
85015: Merged PLATFORM1 (5.0/Cloud) to HEAD-BUG-FIX (5.0/Cloud)
      84136: Fix for ACE-1696    SOLR 4 - Support for name path - index only


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@85330 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-09-20 10:18:43 +00:00
Mark Rogers
ec01efb150 Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
84975: Merged PLATFORM1 (5.0/Cloud) to HEAD-BUG-FIX (5.0/Cloud)
      83854: Removing a System.out call.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@85290 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-09-20 09:59:36 +00:00
Mark Rogers
7968213a8d Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
84974: Merged PLATFORM1 (5.0/Cloud) to HEAD-BUG-FIX (5.0/Cloud)
      83853: As part of ACE-2639, this adds an optional locale query parameter to the facetableproperties.get webscript.
      We may revisit the use of a URL query parameter to get the requester's locale and consider e.g. an accept-languages HTTP header, but for now, ?locale=fr, will receive french titles and descriptions for property definitions. ?locale=rubbish or "" will result in the use of the server's default locale.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@85289 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-09-20 09:59:08 +00:00
Mark Rogers
ef4e6c076e Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
84958: Merged PLATFORM1 (5.0/Cloud) to HEAD-BUG-FIX (5.0/Cloud)
      83712: ACE-2612: Added option to lower case Suggester term (addressing the review comments). Also refactored the Suggester service to take 'SuggesterParameters' as a method parameter.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@85273 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-09-20 09:27:37 +00:00
Mark Rogers
6d28d27188 Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
84954: Merged PLATFORM1 (5.0/Cloud) to HEAD-BUG-FIX (5.0/Cloud)
      83702: ACE-2639. Added javadoc stating that inherited properties are included in results for a single type/aspect, which they are.
      Added content class qname (type/aspect) to the JSON rsp as it's very helpful.
      Improved FacetablePropertyData's compareTo impl to properly sort on model,type,prop.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@85271 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-09-20 09:26:40 +00:00
Mark Rogers
9c0de55e32 Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
84951: Merged PLATFORM1 (5.0/Cloud) to HEAD-BUG-FIX (5.0/Cloud)
      83689: ACE-2248 "Move Events and Messaging Framework into Core"
      Fix up side effects of changes to messaging and events services code


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@85268 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-09-20 09:25:14 +00:00
Mark Rogers
e2382dbb42 Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
84950: Merged PLATFORM1 (5.0/Cloud) to HEAD-BUG-FIX (5.0/Cloud)
      83670: Moved the FacetablePropertyData inner class from SolrFacetService (Java API layer) into FacetablePropertiesGet (REST API layer) as that is a better place for it. ACE-2639.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@85267 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-09-20 09:24:45 +00:00
Mark Rogers
40eec10e44 Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
84948: Merged PLATFORM1 (5.0/Cloud) to HEAD-BUG-FIX (5.0/Cloud)
      83656: Addition of standard paging to FacetableProperties result sets. Part of ACE-2639.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@85265 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-09-20 09:23:46 +00:00
Mark Rogers
0f32ea24ae Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
84944: Merged PLATFORM1 (5.0/Cloud) to HEAD-BUG-FIX (5.0/Cloud)
      83563: Added support into faceted-search web scripts to convert short-form QName into fully qualified QName.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@85261 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-09-20 09:21:49 +00:00
Mark Rogers
69f25229d2 Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
84938: Merged PLATFORM1 (5.0/Cloud) to HEAD-BUG-FIX (5.0/Cloud)
      83536: Added support for a namespace query parameter (nsp) as part of ACE-2639.
      Improved the .desc.xml documentation.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@85255 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-09-20 09:18:56 +00:00
Mark Rogers
b605e62834 Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
84937: Merged PLATFORM1 (5.0/Cloud) to HEAD-BUG-FIX (5.0/Cloud)
      83533: ACE-2640: Added filterId validation to the remote-api's faceted search configuration.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@85254 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-09-20 09:18:27 +00:00
Mark Rogers
22e9af3abc Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
84922: Merged PLATFORM1 (5.0/Cloud) to HEAD-BUG-FIX (5.0/Cloud)
      83457: Refactoring the facetable properties.get response and some of the service API. Part of ACE-2639.
      This checkin changes the JSON structure slightly (array, not map), adds a displayName.
      The localised title and displayName are still in the server locale. I'll fix that to client locale next. Also need to add paging.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@85239 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-09-20 09:11:04 +00:00
Mark Rogers
8ea31336da Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
84921: Merged PLATFORM1 (5.0/Cloud) to HEAD-BUG-FIX (5.0/Cloud)
      83449: ACE-2612: Added auto-suggest web script. Also, minor modification to Share search service. 


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@85238 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-09-20 09:10:28 +00:00
Mark Rogers
9abe30d450 Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
84917: Merged PLATFORM1 (5.0/Cloud) to HEAD-BUG-FIX (5.0/Cloud)
      83444: ACE-2639. Added property title (where available) to JSON rsp.
      As the title can only be retrieved using a getTitle(MessageLookup) call, I had to get the titles from the Java layer, rather than a straight get call in the FTL. Makes the API a bit messier. I may get to tidy it as part of ongoing work on ACE-2639.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@85235 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-09-20 09:08:52 +00:00
Mark Rogers
be04629fec Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
84902: Merged PLATFORM1 (5.0/Cloud) to HEAD-BUG-FIX (5.0/Cloud)
      83412: Preliminary implementation of ACE-2639.
      This check-in allows any user to hit the repo at http://localhost:8080/alfresco/service/api/facet/facetable-properties
      or at http://localhost:8080/alfresco/service/api/facet/classes/cm:thumbnail/facetable-properties and get details on facetable properties for all properties in the system or all properties on the specified type/aspect, respectively.
      I'm checking this in in order to start to get some feedback on what the global list contains and how we might restrict it. The JSON response is very basic currently and it will be enhanced also.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@85222 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-09-20 09:02:07 +00:00
Mark Rogers
e0918e6e2f Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
84758: Merged PLATFORM1 (5.0/Cloud) to HEAD-BUG-FIX (5.0/Cloud)
      80284: ACE-2213


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@85123 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-09-19 22:28:29 +00:00
Alan Davis
a8cf4f2372 Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
84257: ACE-2644 - Administrator Node Browser (in-process) functional parity of Explorer
      Fixed Session serialization of QNameBean classes.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@84652 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-09-18 17:32:43 +00:00
Alan Davis
a248cdf074 Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
84249: ACE-2644 - Administrator Node Browser (in-process) functional parity of Explorer
      Changes requested after Support review:
        Button to expand/hide the advanced search bigger.
        Different colours per row.
      Fixed Session serialization of node browser classes.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@84649 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-09-18 17:31:43 +00:00
Alan Davis
bff1e27004 Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
84047: Merged V4.2-BUG-FIX (4.2.4) to HEAD-BUG-FIX (5.0/Cloud)
      83804: Merged V4.1-BUG-FIX (4.1.10) to V4.2-BUG-FIX (4.2.4)
         83716: MNT-11355: Merged DEV to V4.1-BUG-FIX (4.1.10)
            83675: MNT-11355: PostSubParamInjection and HeaderParamManipulation attacks identified by HP Web Inspect
               - Hide SQLException from stacktrace that is sent in error response to client. Add unit test.
         -----------------------------------------------
         M /alfresco/BRANCHES/DEV/V4.1-BUG-FIX
         M /alfresco/BRANCHES/DEV/V4.1-BUG-FIX/root/projects/core/source/java/org/alfresco/error/AlfrescoRuntimeException.java
         M /alfresco/BRANCHES/DEV/V4.1-BUG-FIX/root/projects/remote-api/source/java/org/alfresco/repo/web/scripts/RepositoryContainer.java
         M /alfresco/BRANCHES/DEV/V4.1-BUG-FIX/root/projects/remote-api/source/test-java/org/alfresco/repo/web/scripts/RepositoryContainerTest.java


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@84623 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-09-18 17:21:26 +00:00
Alan Davis
7fe1374edb Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
83943: Merged V4.2-BUG-FIX (4.2.4) to HEAD-BUG-FIX (5.0/Cloud)
      82504: Merged V4.1-BUG-FIX (4.1.10) to V4.2-BUG-FIX (4.2.4)
         81668: Merged DEV to V4.1-BUG-FIX (4.1.10)
            80985 : MNT-12082 : Consumers can add comments using URL parameters, although they are not allowed to do so
               - Fixed the issue. Implemented a test to simulate the issue.
      82513: Fix build failure after:
         Merged DEV to V4.1-BUG-FIX (4.1.10)
            80985 : MNT-12082 : Consumers can add comments using URL parameters, although they are not allowed to do so
               - Fixed the issue. Implemented a test to simulate the issue.
      83418: Add further hacks to the CommentsApiTest, which needs to be refactored to use RetryingTransactionHelper.
      83679: MNT-12082 : Consumers can add comments using URL parameters, although they are not allowed to do so
         - Fixed build failure


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@84601 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-09-18 17:17:42 +00:00
Alan Davis
7d5bf5ce5a Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
83864: Merged KEVINR1 (5.0/Cloud) to HEAD-BUG-FIX (5.0/Cloud)
      83697: ACE-2644 - Administrator Node Browser (in-process) functional parity of Explorer
         Permissions, owner, inherits.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@84585 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-09-18 17:15:06 +00:00
Alan Davis
3e965f0111 Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
83859: Merged KEVINR1 (5.0/Cloud) to HEAD-BUG-FIX (5.0/Cloud)
      83356: ACE-2644 - Administrator Node Browser (in-process) functional parity of Explorer
         Node info, properties list, properties value rendering, parents list, parent navigation.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@84581 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-09-18 17:14:35 +00:00
Alan Davis
1565069584 Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
83759: Merge WAT2 to HEADBUGFIX: r83494  When package items are added/removed it dispatches an Activiti VARIABLE_UPDATED event


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@84576 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-09-18 17:13:54 +00:00
Alan Davis
01aba183d1 Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
83757: Merged V4.2-BUG-FIX (4.2.4) to HEAD-BUG-FIX (5.0/Cloud)
      << Bringing back the commit just reverted. Needed to revert another commit
         80358 which changed pom.xml files to include the correct versions of
   	  external libs including open cmiss 0.11 >>
      80966: Revere merged HEAD-BUG-FIX (5.0/Cloud)
         << Take out all OpenCMIS changes merged to HEAD-BUG-FIX that have come from V4.2-BUG-FIX >>
         80355: Reverse Merge HEAD-BUG-FIX (5.0/Cloud)
            << And added alfresco-opencmis-extension 1.0 >>
            79170: Merged V4.2-BUG-FIX (4.2.4) to HEAD-BUG-FIX (5.0/Cloud)
               << Commit is actually a reverse merge of the original merges from V4.2-BUG-FIX 79113,79128
                  rather than the changes from V4.2-BUG-FIX >>
               79166: Reverse merged V4.2-BUG-FIX (4.2.4)
                  << Need a new version of alfresco-opencmis-extension as 0.9 is incompatible with OpenCMIS 0.11.0
                     and Steve is on holiday for a week. >>
                  << The original commits are already merged to HBF for ACE-484 so will revert them too. >>
                  79070: Merged DEV to V4.2-BUG-FIX (4.2.4)
                     67851: MNT-11223 : Upgrade OpenCMIS library to 0.11.0 on 4.2 code line
                        Updated OpenCMIS to 0.11 version.
                  79120: MNT-11223: Merged V4.1-BUG-FIX (4.1.10) to V4.2-BUG-FIX (4.2.4) 
                     79117: MNT-11596 Fix dependencies declared in pom files after upgrade of OpenCMIS to 0.11.0, and all related upgrades
         80358: Merged V4.2-BUG-FIX (4.2.4) to HEAD-BUG-FIX (5.0/Cloud)
            79166: Reverse merged V4.2-BUG-FIX (4.2.4)
               << Need a new version of alfresco-opencmis-extension as 0.9 is incompatible with OpenCMIS 0.11.0
                  and Steve is on holiday for a week. >>
               << The original commits are already merged to HBF for ACE-484 so will revert them too. >>
               79070: Merged DEV to V4.2-BUG-FIX (4.2.4)
                  67851: MNT-11223 : Upgrade OpenCMIS library to 0.11.0 on 4.2 code line
                  Updated OpenCMIS to 0.11 version.
               79120: MNT-11223: Merged V4.1-BUG-FIX (4.1.10) to V4.2-BUG-FIX (4.2.4) 
                  79117: MNT-11596 Fix dependencies declared in pom files after upgrade of OpenCMIS to 0.11.0, and all related upgrades
         80365: Merged V4.2-BUG-FIX (4.2.4) to HEAD-BUG-FIX (5.0/Cloud)
            80356: MNT-11223 : Upgrade OpenCMIS library to 0.11.0 on 4.2 code line
               - Commit missed delete of old alfresco-opencmis-extension-0.9 sources/javadoc
         80366: Merged V4.2-BUG-FIX (4.2.4) to HEAD-BUG-FIX (5.0/Cloud)
            80337: MNT-11223 follow-up: bring back test dependencies in web-framework-commons pom, to make the Maven build pass again
         80814: MNT-11223: Fix build (pt1)
            - 80366: pom.xml contained a reference to an external surf which is now back in house.
         80858: Merged V4.2-BUG-FIX (4.2.4) to HEAD-BUG-FIX (5.0/Cloud)
            80373: MNT-11223 : Upgrade OpenCMIS library to 0.11.0 on 4.2 code line
               - Found another reference to version 0.9 rather than 1.0 of alfresco-opencmis-extensions
         80861: Merged V4.2-BUG-FIX (4.2.4) to HEAD-BUG-FIX (5.0/Cloud)
            80397: MNT-11223 : Upgrade OpenCMIS library to 0.11.0 on 4.2 code line
            Fixed TestCMIS.testMNT10430. Excluded sys:localized aspect from returned set in CMIS.
         80865: Merged V4.2-BUG-FIX (4.2.4) to HEAD-BUG-FIX (5.0/Cloud)
            80840: MNT-11223 : Upgrade OpenCMIS library to 0.11.0 on 4.2 code line
            Fix for CMISTCKCRUD test. Added special handling of content stream file name property via accessor.
         80866: Merged V4.2-BUG-FIX (4.2.4) to HEAD-BUG-FIX (5.0/Cloud)
            80841: MNT-11223 : Upgrade OpenCMIS library to 0.11.0 on 4.2 code line
            Changed Solr to Lucene for tests.
      83745: Reverse Merge HEAD-BUG-FIX (5.0/Cloud)
         83699: ACE-484: Merged V4.2-BUG-FIX (4.2.4) to HEAD-BUG-FIX (5.0/Cloud) VIA EOL
            81016: MNT-11223 : Upgrade OpenCMIS library to 0.11.0 on 4.2 code line
            Fixed TestCMIS to check for secondary types list to be null.
            81017: MNT-11223 : Upgrade OpenCMIS library to 0.11.0 on 4.2 code line
            Disabled assert for tests run by maven.
            82255: Merged V4.2-BUG-FIX (4.2.4) to EOL (5.0/Cloud)
               82252: MNT-11223 : Upgrade OpenCMIS library to 0.11.0 on 4.2 code line
               Disabled QueryRootFolderTest.
            - RECORD ONLY merge from V4.2-BUG-FIX extra commits not required on HEAD-BUG-FIX: 80373,80397,80840-80841,81707,81741,82245


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@84575 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-09-18 17:13:46 +00:00
Alan Davis
3ec6b5b747 Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
83663: ALF-21093 Remove dependency to Apache Axis - it was only used for a util class


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@84571 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-09-18 17:12:10 +00:00
Alan Davis
caf361cd61 Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
83541: Merged V4.2-BUG-FIX (4.2.4) to HEAD-BUG-FIX (5.0/Cloud)
      82261: Merged DEV to V4.2-BUG-FIX (4.2.4)
         80345 : MNT-11990 : vti sharepoint server does not respect If: HTTP headers as defined in rfc2518
            - LockMethod was corrected to prevent lock refresh for non-locked files.
            - Unit test added.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@84561 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-09-18 17:08:49 +00:00
Tatyana Valkevych
7f5633fbdd Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
83848: Merged DEV to HEAD-BUG-FIX (5.0)
      83749: ACE-2699: Could not edit documents via WebDAV
       - Set missing poster for ActivityPoster in WebDAVServlet. 
      83839: ACE-2699: Could not edit documents via WebDAV:
       - Replace unused ActivityService with ActivityPoster in ActivityPosterImpl constructor. 


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@84127 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-09-15 10:23:55 +00:00
Will Abson
17106127f0 ACE-2433: Adapt repository script to allow SOLR 4
- Changed default value of stats field to content.size for compatibility with solr4 (was contentsize, for solr 1.4)
  - Value can be updated by overriding the bean def for webscript.org.alfresco.repository.solr.stats.get

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@83721 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-09-09 15:27:40 +00:00
Erik Winlof
673ba419e9 Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
82415: Merged WAT2 (5.0/Cloud) to HEAD-BUG-FIX (5.0/Cloud)
      80297: Publishes an event on WebDav.GET, does not write an activity feed entry.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@83252 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-09-04 07:04:24 +00:00
Erik Winlof
9f7a5d3bfe Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
82400: Merged WAT2 (5.0/Cloud) to HEAD-BUG-FIX (5.0/Cloud)
      80250: ACE-2276	 - Update Activiti to 5.16.1


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@83240 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-09-04 07:00:28 +00:00
Erik Winlof
f1583306ca Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
82376: Merged WAT2 (5.0/Cloud) to HEAD-BUG-FIX (5.0/Cloud)
      76481: Removed content downloaded event, its now part of the activity stream


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@83219 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-09-04 06:51:12 +00:00
Erik Winlof
7954be61aa Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
82375: Merged WAT2 (5.0/Cloud) to HEAD-BUG-FIX (5.0/Cloud)
      76480: Re-worked download activity posting following Kev's changes


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@83218 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-09-04 06:50:52 +00:00
Erik Winlof
d2afc32068 Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
82373: Merged WAT2 (5.0/Cloud) to HEAD-BUG-FIX (5.0/Cloud)
      76479: Supporting Client class from alfresco-events


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@83217 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-09-04 06:50:19 +00:00
Erik Winlof
3071b55a6a Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
82371: Merged WAT2 (5.0/Cloud) to HEAD-BUG-FIX (5.0/Cloud)
      76477: Removed the Raise Browser Event logic on webpreview. No longer required.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@83215 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-09-04 06:49:39 +00:00
Erik Winlof
22be126dec Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
80966: Revere merged HEAD-BUG-FIX (5.0/Cloud)
      << Take out all OpenCMIS changes merged to HEAD-BUG-FIX that have come from V4.2-BUG-FIX >>
      80355: Reverse Merge HEAD-BUG-FIX (5.0/Cloud)
         << And added alfresco-opencmis-extension 1.0 >>
         79170: Merged V4.2-BUG-FIX (4.2.4) to HEAD-BUG-FIX (5.0/Cloud)
            << Commit is actually a reverse merge of the original merges from V4.2-BUG-FIX 79113,79128
               rather than the changes from V4.2-BUG-FIX >>
            79166: Reverse merged V4.2-BUG-FIX (4.2.4)
               << Need a new version of alfresco-opencmis-extension as 0.9 is incompatible with OpenCMIS 0.11.0
                  and Steve is on holiday for a week. >>
               << The original commits are already merged to HBF for ACE-484 so will revert them too. >>
               79070: Merged DEV to V4.2-BUG-FIX (4.2.4)
                  67851: MNT-11223 : Upgrade OpenCMIS library to 0.11.0 on 4.2 code line
                     Updated OpenCMIS to 0.11 version.
               79120: MNT-11223: Merged V4.1-BUG-FIX (4.1.10) to V4.2-BUG-FIX (4.2.4) 
                  79117: MNT-11596 Fix dependencies declared in pom files after upgrade of OpenCMIS to 0.11.0, and all related upgrades
      80358: Merged V4.2-BUG-FIX (4.2.4) to HEAD-BUG-FIX (5.0/Cloud)
         79166: Reverse merged V4.2-BUG-FIX (4.2.4)
            << Need a new version of alfresco-opencmis-extension as 0.9 is incompatible with OpenCMIS 0.11.0
               and Steve is on holiday for a week. >>
            << The original commits are already merged to HBF for ACE-484 so will revert them too. >>
            79070: Merged DEV to V4.2-BUG-FIX (4.2.4)
               67851: MNT-11223 : Upgrade OpenCMIS library to 0.11.0 on 4.2 code line
               Updated OpenCMIS to 0.11 version.
            79120: MNT-11223: Merged V4.1-BUG-FIX (4.1.10) to V4.2-BUG-FIX (4.2.4) 
               79117: MNT-11596 Fix dependencies declared in pom files after upgrade of OpenCMIS to 0.11.0, and all related upgrades
      80365: Merged V4.2-BUG-FIX (4.2.4) to HEAD-BUG-FIX (5.0/Cloud)
         80356: MNT-11223 : Upgrade OpenCMIS library to 0.11.0 on 4.2 code line
            - Commit missed delete of old alfresco-opencmis-extension-0.9 sources/javadoc
      80366: Merged V4.2-BUG-FIX (4.2.4) to HEAD-BUG-FIX (5.0/Cloud)
         80337: MNT-11223 follow-up: bring back test dependencies in web-framework-commons pom, to make the Maven build pass again
      80814: MNT-11223: Fix build (pt1)
         - 80366: pom.xml contained a reference to an external surf which is now back in house.
      80858: Merged V4.2-BUG-FIX (4.2.4) to HEAD-BUG-FIX (5.0/Cloud)
         80373: MNT-11223 : Upgrade OpenCMIS library to 0.11.0 on 4.2 code line
            - Found another reference to version 0.9 rather than 1.0 of alfresco-opencmis-extensions
      80861: Merged V4.2-BUG-FIX (4.2.4) to HEAD-BUG-FIX (5.0/Cloud)
         80397: MNT-11223 : Upgrade OpenCMIS library to 0.11.0 on 4.2 code line
         Fixed TestCMIS.testMNT10430. Excluded sys:localized aspect from returned set in CMIS.
      80865: Merged V4.2-BUG-FIX (4.2.4) to HEAD-BUG-FIX (5.0/Cloud)
         80840: MNT-11223 : Upgrade OpenCMIS library to 0.11.0 on 4.2 code line
         Fix for CMISTCKCRUD test. Added special handling of content stream file name property via accessor.
      80866: Merged V4.2-BUG-FIX (4.2.4) to HEAD-BUG-FIX (5.0/Cloud)
         80841: MNT-11223 : Upgrade OpenCMIS library to 0.11.0 on 4.2 code line
         Changed Solr to Lucene for tests.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@83142 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-09-04 06:01:21 +00:00
Erik Winlof
dfc91becc7 Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
80924: Merged EOL (5.0/Cloud) to HEAD-BUG-FIX (5.0/Cloud)
      80469: ACE-2091 EOL Explorer.
      ACE-2014 EOL URL Addressibility API
       - 90% of the Explorer Client config, pages and assets moved to privatemodules/thor
       - Explorer client available via mvn -Pcloud build only
       - Alfresco minimal index page added
       - Deprecated and disabled: Servlets related to Explorer e.g. ExternalAccessServlet, CommandServlet - will be removed fully in 5.1
       - Removed: Explorer liferay portlet context, jboss portlet context, collaboration WebScript remoteapi (Explorer), old web assets no longer used
       - Tested: Enterprise build, Cloud build, build unit tests, NTLM SSO/Cookie SSO path


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@83132 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-09-04 05:52:30 +00:00
Will Abson
72f0e836a4 Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
80736: Merged WAT1 (5.0/Cloud) to HEAD-BUG-FIX (5.0/Cloud)
      78923: ACE-2370: Changed facet config web-scripts URL from /api/solr/facet-config TO /api/facet/facet-config to fix the facets retrieval when Solr SSL is enabled.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@83034 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-09-03 16:46:01 +00:00
Will Abson
ffb416a5f8 Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
80709: Merged WAT1 (5.0/Cloud) to HEAD-BUG-FIX (5.0/Cloud)
      78667: ACE-1582: Made the facet config service and the relevant web scripts to accept single/multiple value(s) update (to support inline edits).


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@83007 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-09-03 16:41:45 +00:00
Will Abson
dcb3bc2934 Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
80698: Merged WAT1 (5.0/Cloud) to HEAD-BUG-FIX (5.0/Cloud)
      78457: ACE-1582: - Fixed facet's custom properties.
                - Made the GET facets web-script to be accessed by all authenticated users rather than just the Search-Admin/Network-Admin users. 
                - Fixed FacetRestApiTests and added more tests.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@82996 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-09-03 16:30:54 +00:00
Will Abson
9f2d601915 Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
80673: Merged WAT1 (5.0/Cloud) to HEAD-BUG-FIX (5.0/Cloud)
      78188: Made facet's "scope" and "scopedSites" properties, optional when updating/saving a facet.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@82970 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-09-03 16:19:21 +00:00
Will Abson
383b977c08 Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
80669: Merged WAT1 (5.0/Cloud) to HEAD-BUG-FIX (5.0/Cloud)
      78166: ACE-1582: Enhancements to the facet service to persist only the modified value(s) rather than the whole facet's properties. Also fixed facets cache and facets reordering NPE.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@82966 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-09-03 16:18:39 +00:00
Will Abson
14f95a1a31 Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
80656: Merged WAT1 (5.0/Cloud) to HEAD-BUG-FIX (5.0/Cloud)
      77535: Adding first JUnit test of facet config rest api. Part of ACE-1582.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@82950 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-09-03 16:16:41 +00:00
Will Abson
1e6ba3e86c Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
80643: Merged WAT1 (5.0/Cloud) to HEAD-BUG-FIX (5.0/Cloud)
      76831: Enhancement to the /api/solr/facet-config REST endpoint to support facet reordering.
      If you add a query parameter like so: /api/solr/facet-config/{filterID}?relativePos={relativePos?}
      then the specified filterID will be moved by the specified relative position.
      '3' means move it 3 places down the list. '-1' means move it one place up the list.
      Note that currently you cannot provide a HTTP request body (JSON) at the same time as the relativePos param,
      in other words you cannot update the facet metadata and reposition in in one REST call. It is either or.
      We may enhance the webscript to support simultaneous edits of metadata and position at a future date.
      Also added automatic management of facet position on facet create and delete. New facets are put at the
      end of the list - this can easily be changed if it is not what's wanted.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@82937 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-09-03 16:14:31 +00:00
Will Abson
fa0b3b7ab4 Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
80520: Merged WAT1 (5.0/Cloud) to HEAD-BUG-FIX (5.0/Cloud)
      74961: ACE-1582: Added index control and custom data support for the facet configs.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@82817 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-09-03 15:53:15 +00:00
Will Abson
69d382274b Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
80509: Merged WAT1 (5.0/Cloud) to HEAD-BUG-FIX (5.0/Cloud)
      74144: ACE-1582: added:
           - more facet props to the Model and the related JSON response
           - GET one facet API
           - Sorting by facet index


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@82806 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-09-03 15:51:24 +00:00
Will Abson
126b6c04cd Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
80504: Merged WAT1 (5.0/Cloud) to HEAD-BUG-FIX (5.0/Cloud)
      73946: ACE-1582: First cut of Solr faceted-search configuration.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@82802 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-09-03 15:50:43 +00:00
Will Abson
f9a98f5466 Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
80355: Reverse Merge HEAD-BUG-FIX (5.0/Cloud)
      << And added alfresco-opencmis-extension 1.0 >>
      79170: Merged V4.2-BUG-FIX (4.2.4) to HEAD-BUG-FIX (5.0/Cloud)
         << Commit is actually a reverse merge of the original merges from V4.2-BUG-FIX 79113,79128
            rather than the changes from V4.2-BUG-FIX >>
         79166: Reverse merged V4.2-BUG-FIX (4.2.4)
            << Need a new version of alfresco-opencmis-extension as 0.9 is incompatible with OpenCMIS 0.11.0
               and Steve is on holiday for a week. >>
            << The original commits are already merged to HBF for ACE-484 so will revert them too. >>
            79070: Merged DEV to V4.2-BUG-FIX (4.2.4)
               67851: MNT-11223 : Upgrade OpenCMIS library to 0.11.0 on 4.2 code line
                  Updated OpenCMIS to 0.11 version.
            79120: MNT-11223: Merged V4.1-BUG-FIX (4.1.10) to V4.2-BUG-FIX (4.2.4) 
               79117: MNT-11596 Fix dependencies declared in pom files after upgrade of OpenCMIS to 0.11.0, and all related upgrades


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@82736 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-09-03 15:29:34 +00:00
Will Abson
bac8ab52c2 Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
80111: Merged V4.2-BUG-FIX (4.2.4) to HEAD-BUG-FIX (5.0/Cloud)
      79532: MNT-11450: Merged DEV to V4.2-BUG-FIX (4.2.4)
         70775: MNT-11450: New filter works incorrect on Discussions Topic List.
            - "New" discussion topics section displays the topics created or updated in the past seven days


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@82714 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-09-03 15:22:52 +00:00