Merge 3.1 to HEAD:

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
This commit is contained in:
Gary Spencer
2009-03-27 13:27:03 +00:00
parent 436f79cb78
commit 26d5c95982
10 changed files with 3099 additions and 2784 deletions

View File

@@ -57,7 +57,7 @@ public class FileState
// File status
public enum FileStateStatus { NotExist, FileExists, FolderExists, Renamed };
public enum FileStateStatus { NotExist, FileExists, FolderExists, Renamed, DeleteOnClose };
// File name/path