5222 Commits

Author SHA1 Message Date
Erik Winlof
e71d0e65f8 Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
81437: Fixing a little bug identified by findbugs. An exception was created and dropped without being thrown.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@83164 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-09-04 06:18:34 +00:00
Erik Winlof
d31a4f0ac1 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
Will Abson
ac4213cd9c Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
80871: Fix for ALF-20896. ScriptNode.childByPath should return null for no child.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@83123 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-09-03 18:07:02 +00:00
Will Abson
0bb93f7aa5 Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
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.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@83121 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-09-03 18:06:43 +00:00
Will Abson
bc794cda30 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
930f2a2edf 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
a740ca67cb 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
5d5409019e 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
3a8e6c7309 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
76e5df2cb7 Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
80628: Merged WAT1 (5.0/Cloud) to HEAD-BUG-FIX (5.0/Cloud)
      76618: Initial commit of Java service changes for facet reordering. Part of ACE-1582.
      Facet persistence has not been changed, but a property has been added to the folder
      which contains the facet nodes. This property 'facetOrder' holds a sequence of strings
      which are the ordered facet IDs.
      Facets are now returned from the SolrFacetService in a sorted order, where this explicit
      'facetOrder' is the primary source for sort order.
      The sorting algorithm falls back to using indexes if no order is available.
      It then falls back to using alphabetic sorting if no index is available.
      These last two scenarios are likely to be corner cases.
      Still to do: some enhancements to the Java service, webscripts as REST API endpoints.
                   the REST API will provide for reordering of existing facets.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@82922 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-09-03 16:12:05 +00:00
Will Abson
f0423115fa Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
80523: Merged WAT1 (5.0/Cloud) to HEAD-BUG-FIX (5.0/Cloud)
      75184: ACE-1582: Fixed Cloud build failures. Also, added CloudSolrFacetService overlay to override the isSearchAdmin method.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@82820 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-09-03 15:53:43 +00:00
Will Abson
26880952a0 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
b0d07f4c04 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
9daa0727d5 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
3b7b9198fa Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
80363: Merged V4.2-BUG-FIX (4.2.4) to HEAD-BUG-FIX (5.0/Cloud)
      80325: Merged DEV to V4.2.N (4.2.4)
         80179 : MNT-10882 : Transparent PNG->JPG Transform Produces Ugly JPG Rendition
            - Removed transparency channel for jpeg target files


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@82741 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-09-03 15:30:34 +00:00
Will Abson
8023f9dd44 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
10ff05205d Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
80349: MNT-11779 Cannot create dynamic transformer transformer.complex.JodConverter... ERRORs in log
      - Allow Enterprise or AMP specific transformers to be ignored.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@82735 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-09-03 15:26:04 +00:00
Will Abson
33334fef52 Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
80110: Merged V4.2-BUG-FIX (4.2.4) to HEAD-BUG-FIX (5.0/Cloud)
      79475: Merged DEV to V4.2-BUG-FIX (4.2.4)
         79324: MNT-11023 Admin Console:Search service. After enable noindex not possible to change search service.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@82713 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-09-03 15:22:43 +00:00
Will Abson
c717551907 Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
79326: Merged EOL to HEAD-BUG-FIX (5.0/Cloud)
      79090: ACE-2013 EOL JCR, JCR-RMI, etc in 5.0
         - Removed references to http://www.jcp.org/jcr (left in web-scripts-application-context.xml
           and multiple versions of opencmis-gnamefilter-context.xml)
      78990: ACE-2013 EOL JCR, JCR-RMI, etc in 5.0
         - Removing references to "jcr-xpath" - Biggest changes were to: DocumentNavigator, NodeServiceXPath and NodeSearcher
         - SearcherComponentTest has a lot of tests removed that appeared to be JCR specific
         - There are still a lot of namespace references in XML files to http://www.jcp.org/jcr/1.0 etc.
         - Left a few  references to "JSR 170" and JCR in java classes as they looked like they might be common with other bits.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@82708 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-09-03 15:21:53 +00:00
Will Abson
ef18c89175 Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
79314: Merged V4.2-BUG-FIX (4.2.4) to HEAD-BUG-FIX (5.0/Cloud)
      79222: MNT-12063: Merged V4.2.1 (4.2.1) to V4.2-BUG-FIX (4.2.2)
         79141: MNT-12079 : CLONE - IMAP client failing to retrieve all folders
            - Ignore mount point if it is not exists or user has no permissions to retrieve path


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@82704 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-09-03 15:21:08 +00:00
Will Abson
caa836cf1d Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
79306: Merged V4.2-BUG-FIX (4.2.4) to HEAD-BUG-FIX (5.0/Cloud)
      79078: Merged V4.2.3 (4.2.3) to V4.2-BUG-FIX (4.2.4)
         78985: MNT-12049 : After uploading a document via WebDAV using DnD or copy/paste, the document appears as locked to Alfresco
            - Fixed property comparison


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@82698 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-09-03 15:20:13 +00:00
Will Abson
8097a243ca Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
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@82692 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-09-03 15:17:48 +00:00
Will Abson
3ba3b255cf Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
79113: ACE-484: Merged V4.2-BUG-FIX (4.2.4) to HEAD-BUG-FIX (5.0/Cloud)
      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.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@82687 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-09-03 15:16:06 +00:00
Will Abson
dc673d6a25 Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
79089: Merged V4.2-BUG-FIX (4.2.4) to HEAD-BUG-FIX (5.0/Cloud)
      78998: Merged V4.1-BUG-FIX (4.1.10) to V4.2-BUG-FIX (4.2.4)
         78962: Merged DEV to V4.1-BUG-FIX (4.1.10)
            78800: MNT-12055 : IMAP causing high CPU/heap usage
            Added a shortcut for favorite sites listing if mount point is sites' root.
            78924: MNT-12055 : IMAP causing high CPU/heap usage
            Optimized ImapServiceImpl.getFavouriteSites(String) to check the preferences and then check access to each site.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@82685 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-09-03 15:14:22 +00:00
Will Abson
b91927c48c Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
79033: Merged V4.2-BUG-FIX (4.2.4) to HEAD-BUG-FIX (5.0/Cloud)
      78970: Merged DEV to V4.2-BUG-FIX (4.2.4)
         78847: MNT-11760 : No auditing entries generated for failed logins with audit.alfresco-access.enabled=true configured
         Fixed audit logging for failed logins.
         78848: MNT-11760 : No auditing entries generated for failed logins with audit.alfresco-access.enabled=true configured
         Fixed tests to highlight the issue.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@82681 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-09-03 15:12:17 +00:00
Erik Winlof
08501d9b8e Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
78913: Merged V4.2-BUG-FIX (4.2.4) to HEAD-BUG-FIX (5.0/Cloud)
      78866: Merged V4.1-BUG-FIX (4.1.10) to V4.2-BUG-FIX (4.2.4)
         78729: MNT-9257: Incorrect behaviour with password protected MS office documents
         Check if failover transformers support transformation for mimetype before calling it. Add unit test.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@82655 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-09-03 13:21:27 +00:00
Erik Winlof
2204f2443a Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
78782: Merged V4.2-BUG-FIX (4.2.4) to HEAD-BUG-FIX (5.0/Cloud)
      78471: Merged dev. V4.2-BUG-FIX-2014_06_06 to V4.2-BUG-FIX (4.2.4)
         73309: MNT-11631: CMIS property isPrivateWorkingCopy not set for the checked out object
           - Property value accessor for 'cmis:isPrivateWorkingCopy' has been implemented. This property is introduced in CMIS 1.1
      78473: MNT-11631: CMIS property isPrivateWorkingCopy not set for the checked out object
         Test for 'cmis:isPrivateWorkingCopy' has been added into 'org.alfresco.rest.api.tests.TestCMIS'. Also this test class has been a bit refactored


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@82639 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-09-03 12:55:12 +00:00
Erik Winlof
b4ca4268d7 Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
78747: Merged V4.2-BUG-FIX (4.2.4) to HEAD-BUG-FIX (5.0/Cloud)
      78624: Merged V4.2.1 (4.2.1.10) to V4.2-BUG-FIX (4.2.4)
         77969: MNT-11926: Unable to start a workflow from a taskListener
         When activity workflow is started suspend CommandContext propogation (if any exists) so that new ProcessInstance could be flushed and correctly converted to WorkflowPath. Add unit test.


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