Merged DEV/LIVECYCLE-3.1 to V3.1
12581: Merged V2.1-A to DEV/LIVECYCLE-3.1
8675: Set FileServers configuration properties using system properties
12603: Merged V2.1-A to DEV/LIVECYCLE-3.1
8702: Added bindto as a property-enabled value
8703: Added bindto as a property-enabled value
8705: Filter out a bind to address of '0.0.0.0'
12631: Merged V2.1-A to DEV/LIVECYCLE-3.1
8551: JGroups Channel factory
12633: Merged V2.1-A to DEV\LIVECYCLE-3.1
8552: Wired in JGroups heartbeats
8554: Re-delete file
8573: Failed hearbeat still must still wait before trying again
8582: JGroups EHCache heartbeat fixes for TCP stack
___________________________________________________________________
Modified: svn:mergeinfo
Merged /alfresco/BRANCHES/V2.1-A:r8551-8552,8554,8573,8582,8675,8702-8705
Merged /alfresco/BRANCHES/V3.1:r12893
Merged /alfresco/BRANCHES/DEV/LIVECYCLE-3.1:r12581,12603,12631,12633
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@13517 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
11943: Fix for ETHREEOH-879 & ETHREEOH-783: Multi-valued properties not allowed in Alfresco 3.0 (due to java.lang.UnsupportedOperationException)
11944: Fix for ETHREEOH-865
11947: Build fix for site service unit test failures. This will be reviewed since it works round the issue rather than tackle why runAs is now failing.
11952: ETHREEOH-845, ETHREEOH-871, ETHREEOH-853, ETHREEOH-839
11953: ETHREEOH-483 Unable to upload files [with Flash 10 installed] Fixed to fit into yui 2.6.0
11954: Added missing 'protocolOrder' configuration value.
11956: Fix for ETHREEOH-895
11957: Fix for ETHREEOH-891.
11958: Readded generated source line for RemoteAPI project.
11959: ETHREEOH-483 Unable to upload files [with Flash 10 installed] Missed to add this image
11960: Removed JDK6 specific method.
11962: Fixed missing setup of the share mapper class name when the <class> config tag is used. ALFCOM-2060.
11964: fix for ETHREEOH-266 - restrict length of webapp to 150 chars.
11965: Merged 2.2 to 3.0
11926: Fox for ETHREEOH-725 User doesn't receive email to his box when rule 'Send an Email to specified users' is created
11966: ETHREEOH-872: Editing Email-notify-rules fails w/ ClassCastException
11967: MT - test fixes (post runAs merge)
11968: Changed Windows x64 NetBIOS warning message to be a debug message. ETHREEOH-897.
11971: ETHREEOH-829 Case issue when inserting Document Share links into a discussion using richtext editor
11973: Fix for ETHREEOH-890 - users with apostrophe in their login name can now login to Alfresco Explorer (and Share).
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@12490 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261