Subversion Repositories bacoAlunos

Compare Revisions

Ignore whitespace Rev 1285 → Rev 1286

/impl/src/java/pt/estgp/estgweb/services/ftpservices/FtpService.java
95,11 → 95,12
{
logger.warn("###################");
logger.warn("################### > CANT CONNECT FTP");
return "errors.ftp.timeout";
return server.getErrorMsg();
}
 
String result = "ftp.operation.success";
client.setFileType(FTP.BINARY_FILE_TYPE);
logger.info("changing working path to " + ftpRequestForm.getStartPath());
client.changeWorkingDirectory(ftpRequestForm.getStartPath());
if(ftpRequestForm.getFilesToImport() != null)
{
124,7 → 125,7
}
}
 
 
logger.info("trying to import file: " + name);
if(!client.storeFile(name,item.getInputStream()))
result = "errors.ftp.no.permission";
}
/impl/src/java/pt/estgp/estgweb/web/FtpServer.java
29,6 → 29,7
int port = 21;
String username = null;
String password = null;
String errorMsg = "";
 
 
public FtpServer(String host, int port)
62,6 → 63,7
private static final int FTP_TIMEOUT_SECONDS = pt.estgp.estgweb.Globals.FTP_TIMEOUT_SECONDS;
public FTPClient getClient() throws IOException
{
errorMsg = null;
final FTPClient ftp = new MyFTPClient();
logger.info("CONNECTING... waiting " + FTP_TIMEOUT_SECONDS + " seconds");
Thread t = new Thread(new Runnable() {
87,12 → 89,14
}
if(!ftp.isConnected())
{
errorMsg = "errors.ftp.timeout";
logger.info("Not Connected will interrupt");
t.interrupt();
return null;
}
} catch (InterruptedException e) {
logger.error(e,e);
errorMsg = "errors.ftp.interrupt";
}
 
if (username != null && password != null)
101,7 → 105,13
{
return ftp;
}
else
{
errorMsg = "errors.ftp.no.permission";
logger.warn("Cant login user: " + username);
}
}
errorMsg = "errors.ftp.unknown.error";
return null;
 
/* estava assim
112,6 → 122,11
//return ftp;
}
 
 
public String getErrorMsg() {
return errorMsg;
}
 
public String getHost()
{
return host;
/impl/src/java/pt/estgp/estgweb/web/FtpManager.java
5,12 → 5,10
import org.apache.commons.fileupload.disk.DiskFileItemFactory;
import org.apache.commons.fileupload.servlet.ServletFileUpload;
import org.apache.log4j.Logger;
import pt.estgp.estgweb.domain.views.CourseUnitView;
import pt.estgp.estgweb.services.ftpservices.FtpRequestForm;
import pt.estgp.estgweb.web.controllers.ApplicationDispatchController;
import pt.estgp.estgweb.web.utils.RequestUtils;
import pt.estgp.estgweb.domain.views.CourseUnitView;
import pt.estgp.estgweb.*;
import pt.estgp.estgweb.Globals;
import pt.utl.ist.berserk.logic.serviceManager.IServiceManager;
import pt.utl.ist.berserk.logic.serviceManager.ServiceManager;
 
65,6 → 63,11
{
items2import.add(item);
}
else
{
logger.warn("ITEM:" + item.getName() + " not parameter and has ZERO BYTES will not import");
messageBack.addError(request,"errors.file.zero.bytes",item.getName());
}
}
String username = (String) request.getAttribute("username");
String password = (String) request.getAttribute("password");
123,6 → 126,10
logger.error(throwable,throwable);
}
}
else
{
logger.info("Zero items to import");
}
}
}
catch (FileUploadException e)