20128: Reverse part of previous build fix that breaks other tests ...
20129: ALF-202, ALF-1488: Fixed portlets in alfresco.war
- Stop excluding portlet.xml from alfresco.war
- Used JSR 286 ResourceURL solution to get upload iframes to work in portlets
- Removed horrific hacks concerning faces session map resolution in portlets and upload servlet
- WebClientPortletAuthenticator now dispatches to a helper servlet, AuthenticatorServlet, allowing it to use identical servlet mechanisms to authenticate / sign-on the user
- Portlet Authenticated user now set consistently in application-scoped attribute, so web client, web script portlets and client portlet share same notion of user ID
- Application.inPortalServer flag now thread local (and thread safe!)
20130: Merged BRANCHES/V2.2 to BRANCHES/V3.3
13819: *RECORD ONLY* ACT-6420 - Office 2003 "Install for all users" - DO NOT MERGE
20131: Merged BRANCHES/V3.1 to BRANCHES/V3.3
19600: *RECORD ONLY* ALF-2205 - CLONE: Office Plugin: filename overlaps the plugin UI if longer than 40 characters without spaces
Merged V3.2 to V3.1 (Adobe)
17499: ETHREEOH-2322 - Office Plugin: filename overlaps the plugin UI if longer than 40 characters without spaces
19443: ALF-2131 - Office webscripts: Missing close brace, '}'
20132: ALF-2749 - temporarily skip couple of -ve checks (for MS SQL Server only)
20133: Merged BRANCHES/V3.2 to BRANCHES/V3.3
19550: *RECORD ONLY* ALF-1091 - Only 15 tags displayed in Tags section in Browser pane
20134: Adding files missed during first commit of Meeting Workspace code
20135: Merged V3.2 to V3.3
19814: *RECORD ONLY* Fix for ALF-2322 - discussion topic containing non-ascii characters cannot be saved
19934: *RECORD ONLY* Fix for ALF-2512 - ability to execute JavaScript via cmd servlet by a non-admin user disabled by default.
- user script execution privileges can be reactivated if required via web-client-config flag <allow-user-script-execute>
19935: *RECORD ONLY* Corrected imports for 3.2 compatability
20136: Merge Dev to V3.3
20104 : ALF-676 - imapFolders patch fails if versionable aspect is mandatory on cm:content
20137: Workaround for ALF-2639: Sharepoint: Share Edit Online uses Share protocol rather than Alfresco protocol to build link
- Replace "https:" protocol with "http:" when generating "Edit Online" URL
20138: Merged V3.1 to V3.3
18204: *RECORD ONLY* Merged DEV/TEMPORARY to 3.1
17837: ETHREEOH-3801: Creating users via the api does not add them to the user store
18577: *RECORD ONLY* Fix for ETHREEOH-4117, based on CHK-11154
19373: *RECORD ONLY* Merged V3.2 to V3.1
19216: ENH-506 - allow script compilation to be disabled for repository tier. Fix to unreported issue with return aspect array from a ScriptNode.
20139: Merged V2.2 to V3.3
18518: *RECORD ONLY* Fix for ETWOTWO-1375
18522: *RECORD ONLY* Merged DEV-TEMPORARY to V2.2
18440: TinyMCE HTML Image gets invalid path
18503: ETWOTWO-1035: Error message when bypassing the 'close' and directly clicking on breadcrumb link after a deployment
18504: ETWOTWO-1035: Error message when bypassing the 'close' and directly clicking on breadcrumb link after a deployment
18578: Merged DEV-TEMPORARY to V2.2
18528: ETWOTWO-1114: Missing 'Required' items are not highlighted in the error when missed
19094: *RECORD ONLY* Merged V3.1 to V2.2
14015: Fixes for ETHREEOH-1864 and ETHREEOH-1840
20140: Remove unwanted @overide
20141: Lazy schema introspection to shave off a few seconds on startup
- Saves about 5s on dev machine
- Hibernate still has to look at the DB metadata, though
20144: Merged V2.2 to V3.3
18859: (RECORD ONLY) ALF-1882: Merged V3.2 to V2.2
17292: ETHREEOH-1842: Ticket association with HttpSession IDs tracked so that we don't invalidate a ticket in use by multiple sessions prematurely
- AuthenticationService validate, getCurrentTicket, etc. methods now take optional sessionId arguments
18864: (RECORD ONLY) ALF-1882: Fixed compilation error from previous checkin.
20145: Merged V3,1 to V3.3
19584: (RECORD ONLY) ALF-2207: Merged V3.2 to V3.1 (Adobe)
18277: Merged DEV_TEMPORARY to V3.2
18178: ETHREEOH-3222: ERROR [org.alfresco.webdav.protocol] WebDAV method not implemented - PROPPATCH
19660: (RECORD ONLY) ALF-2266: Merged V3.2 to V3.1 (Adobe)
19562: Merged DEV/BELARUS/V3.2-2010_02_24 to V3.2
19244: ALF-1816: Email templates can no longer be selected when creating a rule for the action 'Send email to specified users' following an upgrade
- New patch has been created to create invite email templates and notify email templates folders if those are absent. Also it moves default notify and invite templates into appropriate folders.
19662: (RECORD ONLY) Incremented version label
19663: (RECORD ONLY) Corrected version label
19779: (RECORD ONLY) Incremented version label
20148: Merged PATCHES/V3.2.r to V3.3
20029: ALF-2624: Avoid NPE in LDAP sync when there are dangling references and improve logging
20053: (RECORD ONLY) Incremented version number
20151: ALF-2749 - unit test fix (re-arranged -ve checks for txn boundaries, functionally equivalent)
20152: Merged HEAD to BRANCHES/V3.3: (RECORD ONLY)
20050: Fix ALF-2637: objectTypeId updatability reported as "readonly" rather then "oncreate"
20051: Fix for ALF-2609: CMIS ACL mapping improvements
20052: Fix for ALF-2609: CMIS ACL mapping improvements
20086: Fix re-opened ALF-2637: "objectTypeId" updatability reported as "readonly" rather then "oncreate"
20125: Fix ALF-2728: AtomPub renditions are not rendered as part of cmis:object, although their rel links are.
20153: Merged HEAD to BRANCHES/V3.3: (RECORD ONLY)
20067: Fix ALF-2691: Choice display names in Type Definition are not escaped properly in AtomPub binding
20154: ALF-1598: Share - Edit online missing on preview page
- Note: The details page doesn't know when Office opens the file, so may show stale information.
20156: Build/unit test - comment-out force re-index (IndexCheckServiceImplTest)
20157: Office add-in: Missing i18n string found whilst investigating ALF-605: Script error appears when start typing not-existent user in "Assign to" filed
- Changed behaviour slightly so that "start workflow" panel remains if error occurred during submit
20164: Fix trailing commas that MSIE doesn't like. Plus fix for renamed webscript reference.
20168: Attempting to fix failing test in ThumbnailService.
The change adds some extra logging and exception info too.
20169: Build/unit test - temporarily put back "force re-index" (IndexCheckServiceImplTest)
- TODO: re-work test for build env
20170: Fix NPE (AVMStoreImpl.createSnapshot)
- see DBC-HEADPOSTGRESQL-34
20173: Propagate IOExceptions from retryable write transactions in AlfrescoDiskDriver
20176: Merge from V3.2 to V3.3. Merge ok'ed by Steve.
20175: JMX configuration of enterprise logging broken
20178: JodConverter loggers are now exposed in JMX.
This follows on from check-ins 20175 (on V32) and 20176 (on V33) which fixed the JMX logging for enterprise code.
20180: Fixes ALF-2021 by adding new date format properties and exposing YUI widget options.
20185: Various core fixes and additional debug output. Part of ALF-1554.
20186: Fix for OpenOffice multiple versions per edit problem. ALF-1554.
20187: Merged BRANCHES/DEV/V3.3-BUG-FIX to BRANCHES/V3.3:
20181: IndexCheckServiceImplTest - by default, check test store only (reduces current ent build time by nearly 1 hour !)
20188: Fix -exploded build target for Share to copy core classes folder
20191: Merged HEAD to BRANCHES/V3.3: (RECORD ONLY)
20190: Fix ALF-2774: Atompub createDocument with versioningState=checkedout followed by checkin does not create major version, Fix ALF-2782: AtomPub binding incorrectly handles atom:title when no value is provided (often done for compliant atom entry)
20193: Merge 3.2 to 3.3:
19759: Fix for CIFS/CheckInOut.exe save of working copy breaks lock on original file. ALF-2028. (Record-only)
19760: Fix for working copy checked out via CIFS is not accessible until FileStateReaper expires file state. ALF-962. (Record-only)
20195: Form fields for numbers are now rendered much smaller that text fields following feedback from meetups. Must be included in 3.3 as requested by Paul.
20197: Rules: Size property is now more userfriendly & IE bugs are solved
- Numbers and booleans where posted as strings to the server making property comparisons against properties such as "Size" to fail on the server
- Size, encoding & mimetype are now options by default in the "IF/Unless" drop downs
- When comparing Size properties a "bytes" label is placed to the right of the text field
- "Show more..." menu now displays aspect/type ids on mouse hover in the tree
- "Show more..." menu now displays a new column for the property name in the list next to the property displayLabel
- The list in the "Show more..." menu now stays in its place instead of being pushed down in some browsers
- IE css fixes to make rules look good in IE 6, 7 & 8
- Fixed IE 6 & 7 issue with generateDomId & getAttribute("id") not being in sync
- Fixed IE 6 & 7 issue where Selector.query only worked with "id" as root attribute
20199: Merge 3.1 to 3.3 (All record-only):
14483: Merged HEAD to v3.1:
13942 Added FTP IPv6 support. MOB-714.
14484: Merged HEAD to v3.1:
13943 Added FTP IPv6 configuration. Added the ftp.ipv6 property. MOB-714.
14523: Add trailing 'A' to CIFS server name, removed by recent checkin.
14916: Fixes for local domain lookup when WINS is configured. ETHREEOH-2263.
14921: Merge HEAD to V3.1:
14599: Fixes to file server ACL parsing, part of ETHREEOH-2177
14930: Updated svn:mergeinfo
15231: Fix for cut/paste file between folders on CIFS. ETHREEOH-2323.
15570: Merge 3.2 to 3.1:
15548: CIFS server memory leak fixes (clear auth context, session close). ETHREEOH-2538
15571: Merge 3.2 to 3.1:
15549: Check for null ClientInfo in the setCurrentUser() method and clear the auth context. Part of ETHREEOH-2538.
15550: Fixed performance issue in the continue search code, add warn level output of folder search timing.
15572: Update svn:mergeinfo
15627: Merge 3.2 to 3.1:
15626: Fixed NetBIOS reports an invalid packet during session connection, and connection stalls for a while. JLAN-86.
15628: Update svn:mergeinfo
15780: Fix for MS Office document locking issue. ETHREEOH-2579.
15827: Fixed bug in delete node event processing.
16160: Minor change to debug output
16162: Add support for the . and .. pseudo entries in a folder search.
16163: Added timstamp tracking via the file state cache, blend cached timestamps into file info/folder search results.
16555: Fix for processing of NetBIOS packets over 64K in the older JNI code. Part of ETHREEOH-2882.
16556: Fix for CIFS session leak and 100% CPU when connect/disconnecting quickly. ETHREEOH-2881.
16559: Fix for ACL parsing in the standalone JLAN Server build. JLAN-89.
16666: Fix for CIFS cannot handle requests over 64K in JNI code, causes session disconnect, standalone server. JLAN-91.
16709: Fixed the FTP not logged on status return code, now uses reply code 530. JLAN-90.
16710: Added CIFS NT status code/text for the 'account locked' status, 0xC0000234. ETHREEOH-2897.
16717: Fixed setAllowConsoleShutdown setting in standalone server can cause infinite loop. JLAN-38.
16718: Fix for Alfresco and AVM spaces are empty when viewed by FTP and Alfresco is run as non-root. ETHREEOH-2652.
16727: Fix for unable to connect via FTP via Firefox (when anonymous logons are not enabled). ETHREEOH-2012.
16987: Merge 2.2 to 3.1:
13089: (record-only) Fix "Read-Write transaction" exception, when the user does not exist. ETWOTWO-1055.
13091: (record-only) Fix for NFS server "Read-Write transaction started within read-only transaction" exception. ETWOTWO-1054.
14190: (record-only) Fix for cut/paste a folder from Alfresco CIFS to local drive loses folder contents. ETWOTWO-1159.
14191: (record-only) Additional fix for CIFS 'No more connections' error. ETWOTWO-556
14199: (record-only) Fix for NFS problem with Solaris doing an Access check on the share level handle. ETWOTWO-1225.
14210: (record-only) Added support for FTP EPRT and EPSV commands, on IPv4 only. ETWOTWO-325.
14216: (record-only) Fixed FTP character encoding, ported UTF8 normalizer code from v3.x. ETWOTWO-1151.
14229: (record-only) Remove unused import.
14655: (record-only) Convert content I/O exceptions to file server exceptions during write and truncate. ETWOTWO-1241.
14825: (record-only) Add support for the extended response to the CIFS NTCreateAndX call, back port of ETWOTWO-1232.
15869: (record-only) Port of desktop action client side EXE fixes from v3.x. ETWOTWO-1374.
17130: Fix for cannot delete file via CIFS that has a thumbnail associated with it. ETHREEOH-3143 and ETHREEOH-3115.
17359: Fix for CIFS/Kerberos/SPNEGO logon problem with Win2008/Win7 client. ETHREEOH-3225.
17839: Rewrite the rename file logic to handle MS Office file rename patterns. ETHREEOH-1951.
17842: Missing file from previous checkin.
17843: Re-use open files for the same session/process id so that writes on each file handle go to the same file. Port of ETWOTWO-1250.
17861: Merge 2.2 to 3.1:
17803: Re-use open files for the same session/process id so that writes on each file handle go to the same file. ETWOTWO-1250. (Record-only)
18432: Added FTP data port range configuration via <dataPorts>n:n</dataPorts> config value. ETHREEOH-4103.
18451: Fixed incorrect FTP debug level name.
20200: Merge PATCHES/V3.2.1 to 3.3:
20142: Added debug output to dump the restart file name for FindFirst/FindNext folder searches (via the 'Search' debug output level).
20201: Merge PATCHES/V3.2.1 to 3.3:
20143: Fix for files being skipped during a long folder listing via CIFS, ALF-2730.
20202: Update svn:mergeinfo
20219: Fix for ALF-2791 - correction to changes in rev 20129 so the upload file servlet path is generated for all cases.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@20567 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
18450: Port of FTP data port configuration values. ETHREEOH-4103.
18559: NFS fixes, NFS/FTP/CIFS config properties. ETHREEOH-4102, ETHREEOH-4101, ETHREEOH-4104 (partial)
18642: Do not allow null NFS authentication type, core NFS/mount server code now allows null requests with null authentication type.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@18654 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
17667: Branch for SpringSurf integration - from HEAD r17665
17668: Fix to ensure included scripts files are not loaded from a cached classpath loader.
17670: Part 1 of SpringSurf integration - changes relating to spring-surf-core-1.0.0.CI-SNAPSHOT.jar
17674: Part 2 of SpringSurf integration - changes relating to spring-surf-core-configservice-1.0.0.CI-SNAPSHOT.jar
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@17788 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
15128: Merge 3.1 to 3.2:
15114: Added support for impersonation level sharing mode check, to fix Office2007 file open issue. ETHREEOH-2320.
15130: Record-only
15340: Merge 3.1 to 3.2:
14359: Fixed native call being used when <disableNative/> was configured. ETHREEOH-2105. (Record-only)
14484: Merged HEAD to v3.1: (Record-only)
13943 Added FTP IPv6 configuration, via the <IPv6 state="enabled|disabled"/> tag. Added the ftp.ipv6 property. MOB-714.
14523: Add trailing 'A' to CIFS server name, removed by recent checkin. (Record-only)
14561: Change the file server config bean to use the 'org.alfresco.fileserver' logging level.
14916: Fixes for local domain lookup when WINS is configured. ETHREEOH-2263.
14922: Merge HEAD to V3.1
14626: Fixes for the client side Windows desktop action application. part of ETHREEOH-401
15155: Fixes to client side desktop action exe handling of paths that are not mapped to the root of the Alfresco share. ETHREEOH-1613
15341: Record-only
15549: Check for null ClientInfo in the setCurrentUser() method and clear the auth context. Part of ETHREEOH-2538.
15550: Fixed performance issue in the continue search code, add warn level output of folder search timing.
15564: Merge 3.1 to 3.2:
14964: Port fix for convert content I/O exceptions to file server exceptions during write and truncate (part 2). ETWOTWO-1241
15233: Ignore nodes that no longer exist during the second stage of a file server folder search.
15234: Fixed incorrect length check when buffering MSOffice document writes.
15565: Record-only
15568: Fix for cut/paste file between folders on CIFS. ETHREEOH-2323 + ENH-515.
15569: Record-only
15644: Changed filesystem debug setting so it works with old and new config styles.
15786: Record-only
15787: Port of repo filesystem MS Office document locking fix. ETHREEOH-2579
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@16122 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
- An authentication chain of size 1 configured by default
- DefaultChildApplicationContextManager supports dynamic configuration of the authentication chain via Spring or JMX. Any number of instances of any type allowed in chain.
- SubsystemChainingAuthenticationComponent and SubsystemChainingAuthenticationService iterate across configured chain for Authentication
- SSO (NTLM / Kerberos) and CIFS authentication independently activatable for any component in chain (where supported).
- SubsystemChainingProxyFactory used to proxy directly to first active CIFS authenticator or SSO filter in the chain
- CIFS server knows not to bother starting if authentication chain doesn't have an active CIFS authenticator (e.g. LDAP only)
- Rationalization of subsystem configuration folder structure and JMX object naming
- Classpath based extension mechanism for community edition - alfresco/extension/subsystems/<category>/<typeName>/<id>/*.properties in classpath can be used to configure specific subsystem instances
- Simplification of JMX infrastructure. No longer Spring bean definition based, thus allowing dynamic creation/registration of new instances at runtime.
- New AuthenticationChainTest unit test
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@14030 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
- Minor JLAN changes (backward compatible)
- CIFSAuthenticator implements an interface (to allow dynamic proxying to authentication subsystem)
- CIFSAuthenticator accesses ServerConfiguration via ServerConfigurationAccessor interface and doesn't retain references to config sections (again to allow dynamic proxying and hot swapping)
- ConfigSections have way of directly setting container initialised authenticators, sharemappers, etc.
- Authenticators, etc. still support initialisation from config service in backward compatible manner.
- Most of ServerConfigurationBean moved to AbstractServerConfigurationBean superclass.
- New org.alfresco.filesys.config package with ServerConfigurationBean implementation and supporting classes that can be initialised by a Spring container.
- File server authenticators moved into authentication subsystem. TODO: Kerberos and NTLM
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@13795 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
13314: Fix for CIFS offline sync, reconnect updated file to properties/history. ETHREEOH-1247.
13334: Added attribute to allow CIFS host announcement to be switched off via custom config. ETHREEOH-1356. Fixed bug in Windows domain name config.
13335: Changed error message to warning, and removed stacktrace, when resolving the server name.
13336: Renamed file-servers-custom.xml out of the way, to .sample2. Seems to be from an Adobe merge.
13377: Hack to enable basic CIFS IPv6 support, enabled via <tcpipSMB ipv6="enabled"/> in the xml config file.
13399: Fixed confusing debug message.
13431: Added missing parsing of 'offlineCheckInterval' parameter.
13457: Added support for file locking on in-memory pseudo files. Fix for problem with __AlfrescoClient.url files ETHREEOH-1311
13485: Added the missing CIFS sessionTimeout config value parsing.
13521: Updated file-servers.xml default config to match previous file-servers-custom.xml settings
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@13762 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
13033: Back end support for ETHREEOH-1179
13038: JAWS-436 - refactor WCM submit dialog to use WCM sandbox service + update unit tests
13046: Merged V3.0 to V3.1
13043: Merged V2.2 to V3.0
13016: Fix for ETWOTWO-1088 (reset layer using flatten rather than delete & add, users can flatten in stores they own but not delete)
13049: Build/test fix (WCM AssetTest)
13057: Merged V2.1-A to V3.1
8770: Added Flex SDK module
8771: Added Flex SDK binary (swc)
DH: I'm not sure about the svn:eol-style property appearing here. SVN Clients?
13059: Added 'AIX' as a platform type, from Adobe V2.1A, missed checkin.
13060: [no comments]
13061: [no comments]
13063: [no comments]
13064: [no comments]
13066: [no comments]
13067: Add NodeService.getChildrenByName
13072: Added new NodeService.getChildrenByName() method to public-services-security-context.
___________________________________________________________________
Modified: svn:mergeinfo
Merged /alfresco/BRANCHES/V3.0:r13043
Merged /alfresco/BRANCHES/V2.2:r13016
Merged /alfresco/BRANCHES/V3.1:r13033,13038,13046,13049,13057,13059-13061,13063-13064,13066-13067,13072
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@13552 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
12999: Fixed read-only bootstrap of SiteAVMBootstrap and removed incorrect use of 'assert'
13000: Added log4j to Eclipse classpath (unexported)
13001: Merged V2.1-A to V3.1
9127: Performance improvement to folder copy
9151: *RECORD-ONLY* Fix index back up failing with missing files
13002: Merged V2.1-A to V3.1
9174: Further fixes for ACT-2588 (Lucene backup read-write locks)
9279: Fix ADB-84. PHP module is not restricted by the upper version
10191: Fix for ADB-77: Need to have as the sender's email address the email address of the user triggering the rule
13006: Merged V2.1-A to V3.1
10893: Fixes for ADB-78 & ADB-98
- Fixed service getter/setter pattern as well
10903: Fix for ADB-115 ACT-4355
13010: Made AVMLockingBootstrap resilient to read-only mode
13011: Better message for InvalidStoreRefException
13013: Merged V2.1-A to V3.1
9189: Composite Conditions Support Part 1 of 2 (repo)
9190: Composite Conditions Support Part 1a of 2 ( missed file from repo)
13015: Port of Adobe CIFS/FTP configuration changes
13017: Convert avoids folders given by '--svn-status' option
13018: Merge V2.1A to V3.1
7746: (record-only) Added ability to specify a custom CIFS authenticator class
8533: (record-only) Added the <disableNativeCode/> configuration tag, disable use of JNI code on Windows
8700: (record-only) Update to prevent any native calls via configuration code
8705: (record-only) Filer out the '0.0.0.0' bind address
8864: (record-only) Added the getBean() method for custom authenticators to get access to beans
9054: (record-only) Added the 'AIX' platform type for use in the platforms="..." attribute
8863: (record-only) Fix passthru socket connection timeout, added 'protocolOrder' and 'offlineCheckInterval' config values
12144: (record-only) CIFS virtual circuit fixes
13020: Merged V2.1-A to V3.1 (Composite Actions)
9191: Composite Conditions Support Part 2 of 2 (client)
9243: Composite Conditions Support Part 1 of 2 (client)
9245: Composite Conditions Support Part 2 of 2 (repo)
13021: Merged V3.0 to V3.1
13008: Merged V2.2 to V3.0
12824: (record only) Change admin access to the web project staging store to be read-only in the virtualization view - ETWOTWO-933
13024: Ported CIFS configuration changes from Adobe V2.1A, missed checkin.
___________________________________________________________________
Modified: svn:mergeinfo
Merged /alfresco/BRANCHES/V2.1-A:r9127,9151,9174,9189-9191,9243,9245,9279,10191,10893,10903
Merged /alfresco/BRANCHES/V3.1:r12999-13002,13006,13010-13011,13013,13015,13017-13018,13020-13021,13024
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@13550 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
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
