incubator-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ran...@apache.org
Subject cvs commit: incubator-ftpserver/src/java/org/apache/ftpserver FtpServer.java
Date Thu, 06 Oct 2005 05:57:56 GMT
rana_b      2005/10/05 22:57:56

  Modified:    src/java/org/apache/ftpserver FtpServer.java
  Log:
  commons-logging used
  
  Revision  Changes    Path
  1.2       +6 -3      incubator-ftpserver/src/java/org/apache/ftpserver/FtpServer.java
  
  Index: FtpServer.java
  ===================================================================
  RCS file: /home/cvs/incubator-ftpserver/src/java/org/apache/ftpserver/FtpServer.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- FtpServer.java	7 Sep 2005 05:00:32 -0000	1.1
  +++ FtpServer.java	6 Oct 2005 05:57:56 -0000	1.2
  @@ -21,6 +21,7 @@
   import java.net.ServerSocket;
   import java.net.Socket;
   
  +import org.apache.commons.logging.Log;
   import org.apache.ftpserver.config.PropertiesConfiguration;
   import org.apache.ftpserver.config.XmlConfigurationHandler;
   import org.apache.ftpserver.ftplet.Configuration;
  @@ -44,6 +45,7 @@
       private Thread m_runner;
       private ServerSocket m_serverSocket;
       private IFtpConfig m_ftpConfig;
  +    private Log m_log;
       private boolean m_suspended;
       
   
  @@ -52,6 +54,7 @@
        */
       public FtpServer(IFtpConfig ftpConfig) {
           m_ftpConfig = ftpConfig;
  +        m_log = m_ftpConfig.getLogFactory().getInstance(getClass());
       }
   
       /**
  @@ -63,7 +66,7 @@
               m_runner = new Thread(this);
               m_runner.start();
               System.out.println("Server ready :: Apache FTP Server");
  -            m_ftpConfig.getLogger().info("------- Apache FTP Server started ------");
  +            m_log.info("------- Apache FTP Server started ------");
           }
       }
   
  @@ -246,7 +249,7 @@
           FileInputStream in = null;
           try {
               if( (args.length == 1) && args[0].equals("-default") ) {
  -                config = new EmptyConfiguration();
  +                config = EmptyConfiguration.INSTANCE;
               }
               else if( (args.length == 2) && args[0].equals("-xml") ) {
                   in = new FileInputStream(args[1]);
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: cvs-unsubscribe@incubator.apache.org
For additional commands, e-mail: cvs-help@incubator.apache.org


Mime
View raw message