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/11 10:23:43 UTC
svn commit: r647074 - in
/mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver:
ConfigurableFtpServerContext.java DefaultFtpServerContext.java
interfaces/FtpServerContext.java interfaces/IpRestrictor.java iprestrictor/
Author: ngn
Date: Fri Apr 11 01:23:39 2008
New Revision: 647074
URL: http://svn.apache.org/viewvc?rev=647074&view=rev
Log:
Removing IpRestrictor since we now use the BlackListFilter from MINA
Removed:
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/interfaces/IpRestrictor.java
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/iprestrictor/
Modified:
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/ConfigurableFtpServerContext.java
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/DefaultFtpServerContext.java
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/interfaces/FtpServerContext.java
Modified: mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/ConfigurableFtpServerContext.java
URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/ConfigurableFtpServerContext.java?rev=647074&r1=647073&r2=647074&view=diff
==============================================================================
--- mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/ConfigurableFtpServerContext.java (original)
+++ mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/ConfigurableFtpServerContext.java Fri Apr 11 01:23:39 2008
@@ -37,9 +37,7 @@
import org.apache.ftpserver.ftplet.UserManager;
import org.apache.ftpserver.interfaces.CommandFactory;
import org.apache.ftpserver.interfaces.FtpServerContext;
-import org.apache.ftpserver.interfaces.IpRestrictor;
import org.apache.ftpserver.interfaces.MessageResource;
-import org.apache.ftpserver.iprestrictor.FileIpRestrictor;
import org.apache.ftpserver.listener.Listener;
import org.apache.ftpserver.listener.mina.MinaListener;
import org.apache.ftpserver.message.MessageResourceImpl;
@@ -60,7 +58,6 @@
private final Logger LOG = LoggerFactory.getLogger(ConfigurableFtpServerContext.class);
private Bean messageResourceBean;
- private Bean ipRestrictorBean;
private Bean userManagerBean;
private Bean fileSystemManagerBean;
private Bean ftpletContainerBean;
@@ -91,7 +88,6 @@
// create all the components
messageResourceBean = createComponent(conf, "message", MessageResourceImpl.class.getName());
- ipRestrictorBean = createComponent(conf, "ip-restrictor", FileIpRestrictor.class.getName());
userManagerBean = createComponent(conf, "user-manager", PropertiesUserManager.class.getName());
fileSystemManagerBean = createComponent(conf, "file-system-manager", NativeFileSystemManager.class.getName());
statisticsBean = createComponent(conf, "statistics", FtpStatisticsImpl.class.getName());
@@ -243,13 +239,6 @@
}
/**
- * Get IP restrictor.
- */
- public IpRestrictor getIpRestrictor() {
- return (IpRestrictor) ipRestrictorBean.getBean();
- }
-
- /**
* Get file system manager.
*/
public FileSystemManager getFileSystemManager() {
@@ -308,10 +297,6 @@
if(userManagerBean != null && userManagerBean.getBean() != null) {
userManagerBean.destroyBean();
- }
-
- if(ipRestrictorBean != null && ipRestrictorBean.getBean() != null) {
- ipRestrictorBean.destroyBean();
}
if(fileSystemManagerBean != null && fileSystemManagerBean.getBean() != null) {
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=647074&r1=647073&r2=647074&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 11 01:23:39 2008
@@ -35,9 +35,7 @@
import org.apache.ftpserver.ftplet.UserManager;
import org.apache.ftpserver.interfaces.CommandFactory;
import org.apache.ftpserver.interfaces.FtpServerContext;
-import org.apache.ftpserver.interfaces.IpRestrictor;
import org.apache.ftpserver.interfaces.MessageResource;
-import org.apache.ftpserver.iprestrictor.FileIpRestrictor;
import org.apache.ftpserver.listener.Listener;
import org.apache.ftpserver.listener.mina.MinaListener;
import org.apache.ftpserver.message.MessageResourceImpl;
@@ -58,7 +56,6 @@
.getLogger(DefaultFtpServerContext.class);
private MessageResource messageResource;
- private IpRestrictor ipRestrictor;
private UserManager userManager;
private FileSystemManager fileSystemManager;
private FtpletContainer ftpletContainer;
@@ -91,8 +88,6 @@
((MessageResourceImpl) messageResource)
.configure();
- ipRestrictor = new FileIpRestrictor();
-
userManager = new PropertiesUserManager();
((PropertiesUserManager) userManager).configure();
@@ -166,13 +161,6 @@
}
/**
- * Get IP restrictor.
- */
- public IpRestrictor getIpRestrictor() {
- return ipRestrictor;
- }
-
- /**
* Get file system manager.
*/
public FileSystemManager getFileSystemManager() {
@@ -237,10 +225,6 @@
((Component) userManager).dispose();
}
- if (ipRestrictor != null && ipRestrictor instanceof Component) {
- ((Component) ipRestrictor).dispose();
- }
-
if (fileSystemManager != null && fileSystemManager instanceof Component) {
((Component) fileSystemManager).dispose();
}
@@ -296,10 +280,6 @@
public void setFtpletContainer(FtpletContainer ftpletContainer) {
this.ftpletContainer = ftpletContainer;
- }
-
- public void setIpRestrictor(IpRestrictor ipRestrictor) {
- this.ipRestrictor = ipRestrictor;
}
public void setMessageResource(MessageResource messageResource) {
Modified: mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/interfaces/FtpServerContext.java
URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/interfaces/FtpServerContext.java?rev=647074&r1=647073&r2=647074&view=diff
==============================================================================
--- mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/interfaces/FtpServerContext.java (original)
+++ mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/interfaces/FtpServerContext.java Fri Apr 11 01:23:39 2008
@@ -39,11 +39,6 @@
MessageResource getMessageResource();
/**
- * Get IP restrictor.
- */
- IpRestrictor getIpRestrictor();
-
- /**
* Get ftplet container.
*/
FtpletContainer getFtpletContainer();