inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-08-07 17:49:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
78429: Merged EOL (5.0/Cloud) to HEAD-BUG-FIX (5.0/Cloud)
      75801: ACE-2149: EOL AVM / WCM
       - Thorough sweep of 'avm' and 'wcm' references
       - Picked up on many 'deployment' and related classes and configuration
       - Repo starts


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@82558 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Erik Winlof
2014-09-03 12:13:50 +00:00
parent 63678f2980
commit e94f8f8351
93 changed files with 62 additions and 4426 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
source/test-java/org/alfresco/filesys/FTPServerTest.java
View File

@@ -248,28 +248,19 @@ public class FTPServerTest extends TestCase
reply = ftp.getReplyCode();
assertTrue(FTPReply.isPositiveCompletion(reply));
// expect /Alfresco directory
// /AVM directory - avm removed
assertTrue(files.length == 1);
boolean foundAVM=false;
boolean foundAlfresco=false;
for(FTPFile file : files)
{
logger.debug("file name=" + file.getName());
assertTrue(file.isDirectory());
if(file.getName().equalsIgnoreCase("AVM"))
{
foundAVM=true;
}
if(file.getName().equalsIgnoreCase("Alfresco"))
{
foundAlfresco=true;
}
}
// AVM mount point removed
//assertTrue(foundAVM);
assertTrue(foundAlfresco);
// Change to Alfresco Dir that we know exists
@@ -568,8 +559,6 @@ public class FTPServerTest extends TestCase
final String TEST_DIR="/Alfresco/User Homes/" + USER_ONE;
final RetryingTransactionHelper tran = transactionService.getRetryingTransactionHelper();
FTPClient ftpOne = connectClient();
FTPClient ftpTwo = connectClient();
try
@@ -666,8 +655,6 @@ public class FTPServerTest extends TestCase
final String TEST_DIR="/Alfresco/User Homes/" + USER_THREE;
final RetryingTransactionHelper tran = transactionService.getRetryingTransactionHelper();
FTPClient ftpOne = connectClient();
try
{