You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mina.apache.org by ng...@apache.org on 2008/04/04 12:34:59 UTC
svn commit: r644672 - in
/mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver:
DefaultFtpServerContext.java FtpStatisticsImpl.java
iprestrictor/FileIpRestrictor.java
Author: ngn
Date: Fri Apr 4 03:34:51 2008
New Revision: 644672
URL: http://svn.apache.org/viewvc?rev=644672&view=rev
Log:
Cleaning up FtpStatisticsImpl and FileIpRestrictor
Modified:
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/DefaultFtpServerContext.java
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/FtpStatisticsImpl.java
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/iprestrictor/FileIpRestrictor.java
Modified: mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/DefaultFtpServerContext.java
URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/DefaultFtpServerContext.java?rev=644672&r1=644671&r2=644672&view=diff
==============================================================================
--- mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/DefaultFtpServerContext.java (original)
+++ mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/DefaultFtpServerContext.java Fri Apr 4 03:34:51 2008
@@ -102,8 +102,6 @@
fileSystemManager = new NativeFileSystemManager();
statistics = new FtpStatisticsImpl();
- ((FtpStatisticsImpl) statistics)
- .configure(EmptyConfiguration.INSTANCE);
commandFactory = new DefaultCommandFactory();
Modified: mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/FtpStatisticsImpl.java
URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/FtpStatisticsImpl.java?rev=644672&r1=644671&r2=644672&view=diff
==============================================================================
--- mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/FtpStatisticsImpl.java (original)
+++ mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/FtpStatisticsImpl.java Fri Apr 4 03:34:51 2008
@@ -24,10 +24,7 @@
import java.util.Date;
import java.util.Hashtable;
-import org.apache.ftpserver.ftplet.Component;
-import org.apache.ftpserver.ftplet.Configuration;
import org.apache.ftpserver.ftplet.FileObject;
-import org.apache.ftpserver.ftplet.FtpException;
import org.apache.ftpserver.ftplet.User;
import org.apache.ftpserver.interfaces.FileObserver;
import org.apache.ftpserver.interfaces.FtpIoSession;
@@ -37,7 +34,7 @@
/**
* This is ftp statistice implementation.
*/
-public class FtpStatisticsImpl implements ServerFtpStatistics, Component {
+public class FtpStatisticsImpl implements ServerFtpStatistics {
private StatisticsObserver observer = null;
private FileObserver fileObserver = null;
@@ -71,18 +68,6 @@
Hashtable<String, Hashtable<String, Integer>> userLoginTable = new Hashtable<String, Hashtable<String, Integer>>();
public static final String LOGIN_NUMBER = "login_number";
-
- /**
- * Configure component - does nothing.
- */
- public void configure(Configuration conf) throws FtpException {
- }
-
- /**
- * Dispose component - does nothing.
- */
- public void dispose() {
- }
/**
* Set the observer.
Modified: mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/iprestrictor/FileIpRestrictor.java
URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/iprestrictor/FileIpRestrictor.java?rev=644672&r1=644671&r2=644672&view=diff
==============================================================================
--- mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/iprestrictor/FileIpRestrictor.java (original)
+++ mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/iprestrictor/FileIpRestrictor.java Fri Apr 4 03:34:51 2008
@@ -27,8 +27,6 @@
import java.net.InetAddress;
import java.util.ArrayList;
-import org.apache.ftpserver.ftplet.Component;
-import org.apache.ftpserver.ftplet.Configuration;
import org.apache.ftpserver.ftplet.FtpException;
import org.apache.ftpserver.interfaces.IpRestrictor;
import org.apache.ftpserver.util.IoUtils;
@@ -39,32 +37,16 @@
/**
* File based IP restrictor.
*/
-public
-class FileIpRestrictor implements IpRestrictor, Component {
+public class FileIpRestrictor implements IpRestrictor {
private final Logger LOG = LoggerFactory.getLogger(FileIpRestrictor.class);
private final static String LINE_SEP = System.getProperty("line.separator", "\n");
- private String file;
+ private File file = new File("./res/ip.gen");
private Object[][] permissions;
/**
- * Configure the IP restrictor.
- */
- public void configure(Configuration config) throws FtpException {
- file = config.getString("file", "./res/ip.gen");
- File dir = new File(file).getParentFile();
- if( (!dir.exists()) && (!dir.mkdirs()) ) {
- String dirName = dir.getAbsolutePath();
- LOG.error("Cannot create directory - " + dirName);
- throw new FtpException("Cannot create directory : " + dirName);
- }
-
- permissions = getPermissions();
- }
-
- /**
* Has the permission?
*/
public boolean hasPermission(InetAddress address) throws FtpException {
@@ -87,7 +69,7 @@
public Object[][] getPermissions() throws FtpException {
ArrayList<Object[]> permList = new ArrayList<Object[]>();
- if(new File(file).exists()) {
+ if(file.exists()) {
BufferedReader br = null;
try {
br = new BufferedReader(new FileReader(file));
@@ -150,9 +132,20 @@
}
}
- /**
- * Release all the resources
- */
- public void dispose() {
- }
+ public File getFile() {
+ return file;
+ }
+
+ public void setFile(File file) throws FtpException {
+ this.file = file;
+
+ File dir = file.getParentFile();
+ if( (!dir.exists()) && (!dir.mkdirs()) ) {
+ String dirName = dir.getAbsolutePath();
+ LOG.error("Cannot create directory - " + dirName);
+ throw new FtpException("Cannot create directory : " + dirName);
+ }
+
+ permissions = getPermissions();
+ }
}