Changeset 741 for extensions/net.sf.basedb.ftp/trunk/src/net

Timestamp:

Aug 13, 2008, 1:17:55 PM (15 years ago)

Author:

Nicklas Nordborg

Message:

References #114. Upgrading to 1.0.0-M2 release of Apache FTP server.

Location:

extensions/net.sf.basedb.ftp/trunk/src/net/sf/basedb/clients/ftp

Files:

• BaseFtpServer.java (modified) (5 diffs)
• BaseUser.java (modified) (1 diff)
• FtpServiceController.java (modified) (4 diffs)
• FtpServiceControllerFactory.java (modified) (2 diffs)

extensions/net.sf.basedb.ftp/trunk/src/net/sf/basedb/clients/ftp/BaseFtpServer.java

@@ -25 +25 @@
 
 import java.util.EnumSet;
-import java.util.Iterator;
-import java.util.Properties;
-
-import org.apache.ftpserver.ConfigurableFtpServerContext;
+
+//import org.apache.ftpserver.ConfigurableFtpServerContext;
 import org.apache.ftpserver.FtpServer;
-import org.apache.ftpserver.config.PropertiesConfiguration;
-import org.apache.ftpserver.ftplet.Configuration;
-import org.apache.ftpserver.ftplet.FtpException;
-import org.apache.ftpserver.ftplet.Ftplet;
-import org.apache.ftpserver.interfaces.FtpServerContext;
+//import org.apache.ftpserver.config.PropertiesConfiguration;
+//import org.apache.ftpserver.ftplet.Configuration;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.support.DefaultListableBeanFactory;
+import org.springframework.beans.factory.xml.XmlBeanDefinitionReader;
+import org.springframework.core.io.ClassPathResource;
+import org.springframework.core.io.DefaultResourceLoader;
 
 import net.sf.basedb.core.Application;
@@ -138 +137 @@
   }
 
-  private final Configuration config; 
+  private final String configFile;
   private FtpServer server;
   
@@ -146 +145 @@
     added. To start the FTP server call {@link #start()}.
     
-    @param config The configuration settings
+    @param config The path to configuration file (classpath based)
     @throws Exception If there is any problem
   */
-  public BaseFtpServer(Properties config)
+  public BaseFtpServer(String configFile)
     throws Exception
   {
-    this.config = setPropertiesRequiredByBase(config);
+    this.configFile = configFile;
   }
 
@@ -170 +169 @@
     if (isRunning()) return;
     log.info("Starting BASE FTP Server");
-    if (log.isDebugEnabled())
-    {
-      Iterator<String> keys = config.getKeys();
-      while (keys.hasNext())
-      {
-        String key = keys.next();
-        try
-        {
-          log.debug(key + "=" + config.getString(key));
-        }
-        catch (FtpException ex)
-        {} // Should never happen
-      }
-    }
+
     try
     {
-      FtpServerContext context = new ConfigurableFtpServerContext(config);
-      Ftplet baseFtplet = new BaseFtplet();
-      baseFtplet.init(context);
-      context.getFtpletContainer().addFtplet("base", baseFtplet);
-      server = new FtpServer(context);
+      ClassLoader classLoader = FtpServer.class.getClassLoader();
+      
+      DefaultListableBeanFactory factory = new DefaultListableBeanFactory();
+      factory.setBeanClassLoader(classLoader);
+      XmlBeanDefinitionReader reader = new XmlBeanDefinitionReader(factory);
+      reader.setResourceLoader(new DefaultResourceLoader(classLoader));
+      reader.loadBeanDefinitions(new ClassPathResource(configFile, classLoader));
+      server = (FtpServer)factory.getBean("server");
+      
+      //System.out.println("Start FTP server: " + server);
+      //System.out.println("port: " + server.getListener("default").getPort());
+      
       server.start();
     }
@@ -221 +214 @@
     }
     log.info("BASE FTP Server has been stopped");
-  }
-
-  /**
-    Makes a copy of the properties and set BASE-specific ones. Returned
-    as a {@link Configuration} object.
-  */
-  private Configuration setPropertiesRequiredByBase(Properties config)
-  {
-    Properties cfg = (Properties)config.clone();
-    cfg.setProperty("config.create-default-user", "false");
-    cfg.setProperty("config.connection-manager.anonymous-login-enabled", "false");
-    cfg.setProperty("config.user-manager.class", "net.sf.basedb.clients.ftp.BaseUserManager");
-    cfg.setProperty("config.file-system-manager.class", "net.sf.basedb.clients.ftp.BaseFileSystem");
-    if (log.isDebugEnabled())
-    {
-      log.debug("Creating new FTP Server configuration");
-      for (Object key : cfg.keySet())
-      {
-        log.debug(key + "=" + cfg.getProperty(key.toString()));
-      }
-    }
-    return new PropertiesConfiguration(cfg);
-  }
-  
-  
+  } 
 }

extensions/net.sf.basedb.ftp/trunk/src/net/sf/basedb/clients/ftp/BaseUser.java

@@ -177 +177 @@
 
   @Override
-  public Authority[] getAuthorities(Class<Authority> clazz) 
+  public Authority[] getAuthorities(Class<? extends Authority> clazz) 
   {
     List<Authority> selected = new ArrayList<Authority>();

extensions/net.sf.basedb.ftp/trunk/src/net/sf/basedb/clients/ftp/FtpServiceController.java

@@ -26 +26 @@
 import java.io.InputStream;
 import java.net.URL;
-import java.util.Properties;
 
 import org.slf4j.Logger;
@@ -49 +48 @@
   private static final Logger log = LoggerFactory.getLogger(FtpServiceController.class);
 
-  private final String config;
+  private final String configFile;
   private BaseFtpServer server;
   
@@ -55 +54 @@
     Creates a new service controller action for controlling
     a single ftp server service
-    @param server The server to control with this action
+    @param configFile The path to configuration file (classpath based),
+      if null the default (/ftp-config.xml) is used
   */
-  public FtpServiceController(String config)
+  public FtpServiceController(String configFile)
   {
-    this.config = config == null ? "/ftp.config" : config;
+    this.configFile = configFile == null ? "/ftp-config.xml" : configFile;
   }
   
@@ -119 +119 @@
       try
       {
-        log.debug("config=" + config);
-        URL configUrl = BaseFtpServer.class.getResource(config);
+        log.debug("configuration file=" + configFile);
+        URL configUrl = BaseFtpServer.class.getResource(configFile);
         InputStream is = configUrl == null ? null : configUrl.openStream();
         if (is == null)
         {
-          throw new ConfigurationException("Can't find the properties file. " +
-              "Make sure '" + config + "' is in the CLASSPATH.");
+          throw new ConfigurationException("Can't find the configuration file. " +
+              "Make sure '" + configFile + "' is in the CLASSPATH.");
         }
-        Properties config = new Properties();
-        config.load(is);
-        is.close();
-        server = new BaseFtpServer(config);
+        server = new BaseFtpServer(configFile);
         log.info("BASE FTP Server created successfully");
       }

extensions/net.sf.basedb.ftp/trunk/src/net/sf/basedb/clients/ftp/FtpServiceControllerFactory.java

@@ -40 +40 @@
   <ul>
   <li>{@link #setConfig(String)}: The path to the configuration file. The
-    default is: <code>/ftp.config</code>
+    default is: <code>/ftp-config.xml</code>
   </ul>
   
@@ -83 +83 @@
     Set the path to the configuration file to use. The path
     should be a path on the CLASSPATH. 
-    @param config The path, or null to use the default path (/ftp.config)
+    @param config The path, or null to use the default path (/ftp-config.xml)
   */
   public void setConfig(String config)