5313 Commits

Author SHA1 Message Date
Mark Rogers
1ae074b266 ACE-2735 : CIFS desktop actions should be re-worked to use Share URLs
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@85925 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-09-29 14:59:20 +00:00
Neil McErlean
5e0e2fd200 Minor tweak related to ACE-2952 to be certain of no NPEs.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@85896 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-09-29 11:22:28 +00:00
Neil McErlean
aad2fbcaba Fix for ACE-2952. Slight refactor to safely use Long.equals instead of Long == Long.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@85895 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-09-29 11:20:26 +00:00
Pavel Yurke
82bf270d41 ACE-2181 : Merged DEV to HEAD (5.0)
76214 : MNT-10946 : Admin is no longer able to unlock files 
      - Drop check for lockowner from AbstractLockStore.set. Fix related test 


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@85881 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-09-29 10:23:20 +00:00
Pavel Yurke
c77ab4b347 ACE-2181 : Reverse Merge HEAD (5.0)
<< Implementing another approach for MNT-10946 and ACE-2181 >>
   Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (4.3/Cloud)
      71600: Merged V4.2-BUG-FIX (4.2.3) to HEAD-BUG-FIX (4.3/Cloud)
         70349: Merged DEV to V4.2-BUG-FIX (4.2.3)
            70294 : MNT-10946 : Admin is no longer able to unlock files
               - Check if node is locked before unlock for non-admin or System users. Fix related test


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@85880 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-09-29 10:22:06 +00:00
Steven Glover
9b40d6977c MNT-12369 "CryptoDoc: Cluster: removeMasterKey operation removes master key alias only on one cluster node"
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@85879 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-09-29 10:09:47 +00:00
Neil McErlean
9e9357088b Refactoring 'special facet id' handling as the injection of special values has broken the build. ACE-2639.
Sadly I'm going back to hard-coded special values.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@85798 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-09-26 14:13:45 +00:00
Kevin Roast
f3fb147553 ACE-2620 - ResultSet off by one errors.
- Missing "more..." link in LiveSearch when page boundary (e.g. 6 results in total, page size of 5, no More... link shown)

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@85781 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-09-26 11:16:32 +00:00
Neil McErlean
061793131f Fix for ACE-2639. Recent changes injected the SolrFacetHelper as a spring bean, but it was still being constructed within the Search constructor.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@85734 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-09-25 15:14:37 +00:00
Neil McErlean
e52aede98f Additional handling for "special" facet IDs (SITE, TAG etc). Part of ACE-2639.
This check-in ensures that those facet IDs are not prefixed with the '@' char like all other facet IDs.
The list is currently injected from solr-facets-context.xml, which required a slight refactoring of spring beans to make SolrFacetHelper a bean.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@85711 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-09-25 11:29:05 +00:00
Kevin Roast
0f73edbd0a ACE-2620 - ensure ResultSetMeta.hasMore is always available even if a search fails due to query parser error.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@85704 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-09-25 10:35:22 +00:00
Matt Ward
0758dc4431 ACE-2682: MT: Failure occurs when creating tenant with specified contentstore directory
This is not a nice solution, nicer would be if we could allow Spring's ProxyFactoryBean to discover all the interfaces implemented by the underlying bean.

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@85696 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-09-25 09:56:02 +00:00
Steven Glover
40f3283ee3 ACE-2816 "Ensure that Behaviour Bindings are Removed on Event Subsystem Stop"
Fix up policy component class behaviour listeners for removal of behaviour

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@85600 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-09-24 11:28:31 +00:00
Matt Ward
ab8bd84a7b ACE-2857: Solr 4: Index backup fails.
Fixed to use XML rather than the javabin protocol. Will revert if it is a performance issue.

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@85554 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-09-23 18:10:51 +00:00
Alan Davis
df4b037784 ACE-2780: Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
85504: Reverse merged HEAD-BUG-FIX (5.0/Cloud)
      << Build failure was fixed >>
      84534: Reverse merged HEAD-BUG-FIX (5.0/Cloud)
         << Causes build problem with Cloud >>
         84123: Merged V4.2-BUG-FIX (4.2.4) to HEAD-BUG-FIX (5.0/Cloud)
            83401: Merged V4.1-BUG-FIX (4.1.10) to V4.2-BUG-FIX (4.2.4)
               83366: Merged DEV to V4.1-BUG-FIX (4.1.10)
                  82671 : MNT-12278 : Activity processing is single-threaded
                     - Refactoring for multithreading.
                  83343 : MNT-12278 : Activity processing is single-threaded
         84124: Merged V4.2-BUG-FIX (4.2.4) to HEAD-BUG-FIX (5.0/Cloud)
            83678: MNT-12278 : Activity processing is single-threaded
               - Fixed build failure


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@85531 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-09-23 16:10:34 +00:00
Mark Rogers
85f1e5b819 Merged DEV to HEAD : 54690, 54691 : ACE-2783 - Opening and closing a *.xls and *.ppt files with the CIFS interface(without saving) creates a new version
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@85530 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-09-23 16:08:15 +00:00
Mark Rogers
030183ae6c Merged DEV to HEAD (5.0/Cloud) ACE-2689 : SMTP authentication fails. But mail.smtp.auth=false
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@85521 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-09-23 15:01:21 +00:00
Pavel Yurke
e862da0715 ACE-281: Merged DEV to HEAD (5.0/Cloud)
80201: ACE-281: Problems with renditions and permissions
      - On owner change clear nodeOwnerCache for renditions of the node. Add unit test.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@85519 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-09-23 14:43:01 +00:00
Alan Davis
35496888c5 Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
85449: trivial build difference,


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@85460 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-09-22 15:59:38 +00:00
Mark Rogers
0f69ce51fe Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
85093: Merged PLATFORM1 (5.0/Cloud) to HEAD-BUG-FIX (5.0/Cloud)
      84714: Fixed NPE when spellcheck def is not present in search.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@85408 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-09-20 10:56:42 +00:00
Mark Rogers
5142297ac0 Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
85082: Merged PLATFORM1 (5.0/Cloud) to HEAD-BUG-FIX (5.0/Cloud)
      84493: ACE-2637: Initial implementation of spell-check feature.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@85397 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-09-20 10:51:27 +00:00
Mark Rogers
2aef07876d Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
85071: Merged PLATFORM1 (5.0/Cloud) to HEAD-BUG-FIX (5.0/Cloud)
      84416: This is the repo-tier part of MNT-12701. Adds a "take ownership" repository action.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@85386 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-09-20 10:46:03 +00:00
Mark Rogers
5a504fce07 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
238448f7b5 Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
85023: Merged PLATFORM1 (5.0/Cloud) to HEAD-BUG-FIX (5.0/Cloud)
      84171: ACE-1692: system property security.anyDenyDenies is respected by AbstractQParser (when SolrQueryHTTPClient sends authority filter in json)


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@85338 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-09-20 10:22:30 +00:00
Mark Rogers
c4ee02ff38 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
2e795d71c5 Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
84978: Merged PLATFORM1 (5.0/Cloud) to HEAD-BUG-FIX (5.0/Cloud)
      83886: ACE-2269 - unit test fix.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@85293 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-09-20 10:01:01 +00:00
Mark Rogers
6bba4fe0e8 Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
84969: Merged PLATFORM1 (5.0/Cloud) to HEAD-BUG-FIX (5.0/Cloud)
      83756: ACE-2269	 - Allow AMPs to include literals in version number (e.g. -SNAPSHOT)


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@85284 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-09-20 09:56:48 +00:00
Mark Rogers
57da7bc775 Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
84968: Merged PLATFORM1 (5.0/Cloud) to HEAD-BUG-FIX (5.0/Cloud)
      83751: ACE-2612: Added a dummy Suggester for Lucene, Solr1.4 and noindex search subsystems (addressing the review comments).


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@85283 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-09-20 09:32:28 +00:00
Mark Rogers
f4a6f63498 Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
84967: Merged PLATFORM1 (5.0/Cloud) to HEAD-BUG-FIX (5.0/Cloud)
      83743: Fix for     ACE-1037  SOLR 4 - Information server implementation - the rest
      - fix filter queries added when using specified search handlers
      - fixed DBID to be Single valued for SOLR 4 and multi-valued for SOLR 1.4
      - fixed TXID and ACLTXID to be doc values for fast index validation


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@85282 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-09-20 09:31:57 +00:00
Mark Rogers
7a1d7666f5 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
e0b69f6ca7 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
bbbbfc1dbe 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
1d5aa5d15c 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
dd26455cf4 Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
84926: Merged PLATFORM1 (5.0/Cloud) to HEAD-BUG-FIX (5.0/Cloud)
      83488: ACE-2639. Added a natural ordering (alphabetical) to FacetablePropertyData to ensure predictable result ordering.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@85243 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-09-20 09:13:04 +00:00
Mark Rogers
2798ba02dd 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
f9dee792a5 Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
84919: Merged PLATFORM1 (5.0/Cloud) to HEAD-BUG-FIX (5.0/Cloud)
      83447: ACE-2612: Initial implementation of the Suggester service to support the auto-suggest web script.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@85237 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-09-20 09:09:54 +00:00
Mark Rogers
48dbf73041 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
2731b9a7bb 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
6f3e0aa430 Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
84894: Merged PLATFORM1 (5.0/Cloud) to HEAD-BUG-FIX (5.0/Cloud)
      83381: Deprecated the Replicating content store


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@85214 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-09-20 08:58:12 +00:00
Mark Rogers
07ebc6818c Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
84891: Merged PLATFORM1 (5.0/Cloud) to HEAD-BUG-FIX (5.0/Cloud)
      83367: ACE-2664 - AggregatingContentStore


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@85211 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-09-20 08:56:48 +00:00
Mark Rogers
0dac120b1c Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
84822: Merged PLATFORM1 (5.0/Cloud) to HEAD-BUG-FIX (5.0/Cloud)
      82523: Fix for     ACE-1044  SOLR 4 - Back up and recovery
      - added baseUrl configuration
      - improved admin


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@85181 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-09-20 08:42:16 +00:00
Mark Rogers
afe200fbd5 Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
84811: Merged PLATFORM1 (5.0/Cloud) to HEAD-BUG-FIX (5.0/Cloud)
      82464: ACE-1246 "Allow the customer to change the document encryption key"
      Encrypting content store


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@85170 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-09-20 08:36:54 +00:00
Mark Rogers
567bf7ed83 Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
84774: Merged PLATFORM1 (5.0/Cloud) to HEAD-BUG-FIX (5.0/Cloud)
      80889: ACE-2213


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@85136 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-09-19 22:34:18 +00:00
Mark Rogers
3350046e5c Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
84769: Merged PLATFORM1 (5.0/Cloud) to HEAD-BUG-FIX (5.0/Cloud)
      80836: ACE-2081


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@85132 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-09-19 22:32:31 +00:00
Mark Rogers
1481a5481e 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
Mark Rogers
f87babaeb4 Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
84756: Merged PLATFORM1 (5.0/Cloud) to HEAD-BUG-FIX (5.0/Cloud)
      79998: ACE-2213


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@85121 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-09-19 22:27:16 +00:00
Mark Rogers
81fccf253a Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
84736: Merged PLATFORM1 (5.0/Cloud) to HEAD-BUG-FIX (5.0/Cloud)
      79097: Improvements in logging and configuration for HostConfigurableSocketFactory to help diagnose or workaround BDE-91


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@85107 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-09-19 22:21:09 +00:00
Mark Rogers
6d398a5ba9 Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
84733: Merged PLATFORM1 (5.0/Cloud) to HEAD-BUG-FIX (5.0/Cloud)
      78807: ACE-2083	 - Only allow document encryption if the capability has been licensed


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@85104 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-09-19 22:19:44 +00:00
Mark Rogers
4e0c564d02 Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
84690: Merged ACE-2801 to HEAD-BUG-FIX (5.0.0)
      Fix ACE-2801: Method signature change for AlfrescoTransactionSupport.bindListener
         - Added tests for the older method as well.
         - Deprecated repo version of the TransactionListenerAdapter


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@85097 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-09-19 22:16:42 +00:00
Mark Rogers
31af7c47cd Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
84689: Merged ACE-2801 to HEAD-BUG-FIX (5.0.0)
      84505: Fix ACE-2801: Method signature change for AlfrescoTransactionSupport.bindListener
         - Added overloaded method that accepts the old TransactionListener as well.


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