inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-10-15 15:02:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)

Browse Source 
104252: Merged 5.0.N (5.0.2) to HEAD-BUG-FIX (5.1/Cloud)
      104183: Merged DEV to V5.0.N (5.0.2)
         104081 : MNT-12874: FTP: 0kb file when uploading file via ftp (drop network connection)
            - Added timeout for server session.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@104394 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Tatyana Valkevych
2015-05-18 15:12:34 +00:00
parent 867a183447
commit 7027a0871e
5 changed files with 97 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
source/java/org/alfresco/filesys/AbstractServerConfigurationBean.java
View File

@@ -1,19 +1,19 @@
/*
* Copyright (C) 2005-2010 Alfresco Software Limited.
*
* This file is part of Alfresco
*
* Alfresco is free software: you can redistribute it and/or modify
* it under the terms of the GNU Lesser General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* Alfresco is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public License
* Copyright (C) 2005-2015 Alfresco Software Limited.
*
* This file is part of Alfresco
*
* Alfresco is free software: you can redistribute it and/or modify
* it under the terms of the GNU Lesser General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* Alfresco is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public License
* along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
*/
package org.alfresco.filesys;
@@ -97,7 +97,10 @@ public abstract class AbstractServerConfigurationBean extends ServerConfiguratio
// Default FTP server port
protected static final int DefaultFTPServerPort = 21;
// Default FTP server session timeout
protected static final int DefaultFTPSrvSessionTimeout = 5000;
// Default FTP anonymous account name
protected static final String DefaultFTPAnonymousAccount = "anonymous";