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

Fix FTPServerTest to use configured (non-privileged) FTP port

Browse Source 
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@28401 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Dave Ward
2011-06-15 10:57:43 +00:00
parent 38dd3a04fb
commit 32bda0d6ab
1 changed files with 10 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
source/java/org/alfresco/filesys/FTPServerTest.java
View File

@@ -21,35 +21,29 @@ package org.alfresco.filesys;
import java.io.BufferedReader; import java.io.BufferedReader;
import java.io.ByteArrayInputStream; import java.io.ByteArrayInputStream;
import java.io.IOException; import java.io.IOException;
import java.io.InputStream;
import java.io.InputStreamReader; import java.io.InputStreamReader;
import java.io.PrintWriter; import java.io.PrintWriter;
import java.io.Reader; import java.io.Reader;
import java.io.StringWriter; import java.io.StringWriter;
import org.alfresco.filesys.repo.ContentDiskDriverTest; import junit.framework.TestCase;
import org.alfresco.jlan.ftp.FTPConfigSection;
import org.alfresco.jlan.server.config.ServerConfigurationAccessor;
import org.alfresco.model.ContentModel; import org.alfresco.model.ContentModel;
import org.alfresco.repo.model.Repository; import org.alfresco.repo.model.Repository;
import org.alfresco.repo.security.authentication.AuthenticationComponent; import org.alfresco.repo.security.authentication.AuthenticationComponent;
import org.alfresco.repo.transaction.RetryingTransactionHelper; import org.alfresco.repo.transaction.RetryingTransactionHelper;
import org.alfresco.repo.transaction.RetryingTransactionHelper.RetryingTransactionCallback; import org.alfresco.repo.transaction.RetryingTransactionHelper.RetryingTransactionCallback;
import org.alfresco.service.cmr.repository.ChildAssociationRef;
import org.alfresco.service.cmr.repository.ContentService;
import org.alfresco.service.cmr.repository.NodeRef; import org.alfresco.service.cmr.repository.NodeRef;
import org.alfresco.service.cmr.repository.NodeService; import org.alfresco.service.cmr.repository.NodeService;
import org.alfresco.service.cmr.security.MutableAuthenticationService; import org.alfresco.service.cmr.security.MutableAuthenticationService;
import org.alfresco.service.cmr.security.PermissionService; import org.alfresco.service.cmr.security.PermissionService;
import org.alfresco.service.cmr.security.PersonService; import org.alfresco.service.cmr.security.PersonService;
import org.alfresco.service.namespace.NamespaceService;
import org.alfresco.service.namespace.QName;
import org.alfresco.service.transaction.TransactionService; import org.alfresco.service.transaction.TransactionService;
import org.alfresco.util.ApplicationContextHelper; import org.alfresco.util.ApplicationContextHelper;
import org.alfresco.util.BaseAlfrescoSpringTest;
import org.alfresco.util.PropertyMap; import org.alfresco.util.PropertyMap;
import java.io.InputStream;
import junit.framework.TestCase;
import org.apache.commons.logging.Log; import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory; import org.apache.commons.logging.LogFactory;
import org.apache.commons.net.PrintCommandListener; import org.apache.commons.net.PrintCommandListener;
@@ -90,6 +84,7 @@ public class FTPServerTest extends TestCase
private TransactionService transactionService; private TransactionService transactionService;
private Repository repositoryHelper; private Repository repositoryHelper;
private PermissionService permissionService; private PermissionService permissionService;
private FTPConfigSection ftpConfigSection;
@Override @Override
protected void setUp() throws Exception protected void setUp() throws Exception
@@ -103,6 +98,9 @@ public class FTPServerTest extends TestCase
transactionService = (TransactionService)applicationContext.getBean("transactionService"); transactionService = (TransactionService)applicationContext.getBean("transactionService");
repositoryHelper = (Repository)applicationContext.getBean("repositoryHelper"); repositoryHelper = (Repository)applicationContext.getBean("repositoryHelper");
permissionService = (PermissionService)applicationContext.getBean("permissionService"); permissionService = (PermissionService)applicationContext.getBean("permissionService");
ServerConfigurationAccessor fileServerConfiguration = (ServerConfigurationAccessor)applicationContext.getBean("fileServerConfiguration");
ftpConfigSection = (FTPConfigSection) fileServerConfiguration.getConfigSection( FTPConfigSection.SectionName);
assertNotNull("nodeService is null", nodeService); assertNotNull("nodeService is null", nodeService);
assertNotNull("reporitoryHelper is null", repositoryHelper); assertNotNull("reporitoryHelper is null", repositoryHelper);
@@ -604,10 +602,7 @@ public class FTPServerTest extends TestCase
ftp.addProtocolCommandListener(new PrintCommandListener( ftp.addProtocolCommandListener(new PrintCommandListener(
new PrintWriter(System.out))); new PrintWriter(System.out)));
} }
ftp.connect(HOSTNAME, ftpConfigSection.getFTPPort());
String server = HOSTNAME;
ftp.connect(server);
return ftp; return ftp;
} }