pgoldstein    2002/08/12 11:51:11

  Modified:    src/java/org/apache/james/smtpserver SMTPServer.java
               src/java/org/apache/james/pop3server POP3Server.java
               src/java/org/apache/james/remotemanager RemoteManager.java
  Log:
  This patch adds the bind address to the listening string returned by the
  servers.  Adds dispose to POP3Server, which was the only one missing it.
  Corrects minor spelling errors, removes tabs, changes hardcoded 4554
  port to 4555 to match james-config.xml and documentation.
  
  Thanks to Noel Bergman for the patch
  
  Revision  Changes    Path
  1.7       +3 -3      
jakarta-james/src/java/org/apache/james/smtpserver/SMTPServer.java
  
  Index: SMTPServer.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-james/src/java/org/apache/james/smtpserver/SMTPServer.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- SMTPServer.java   7 Aug 2002 23:55:00 -0000       1.6
  +++ SMTPServer.java   12 Aug 2002 18:51:11 -0000      1.7
  @@ -72,9 +72,9 @@
           super.dispose();
          
           // This is needed to make sure sockets are promptly closed on Windows 2000
  -         System.gc();
  -     
  -     getLogger().info( "SMTPServer ...dispose end" );
  +        System.gc();
  +
  +        getLogger().info( "SMTPServer ...dispose end" );
       }
   }
   
  
  
  
  1.6       +16 -1     
jakarta-james/src/java/org/apache/james/pop3server/POP3Server.java
  
  Index: POP3Server.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-james/src/java/org/apache/james/pop3server/POP3Server.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- POP3Server.java   7 Aug 2002 23:39:59 -0000       1.5
  +++ POP3Server.java   12 Aug 2002 18:51:11 -0000      1.6
  @@ -62,11 +62,26 @@
                   .append("POP3Listener using ")
                   .append(m_serverSocketType)
                   .append(" on port ")
  -                .append(m_port);
  +                .append(m_port)
  +                .append(" at ")
  +                .append(m_bindTo);
           getLogger().info( logBuffer.toString() );
           super.initialize();
           getLogger().info( "POP3Server ...init end" );
           System.out.println("Started POP3 Server " + m_connectionName);
       }
  +
  +    public void dispose()
  +    {
  +        getLogger().info( "POP3Server dispose..." );
  +        getLogger().info( "POP3Server dispose..." + m_connectionName);
  +        super.dispose();
  +
  +        // This is needed to make sure sockets are promptly closed on Windows 2000
  +        System.gc();
  +
  +        getLogger().info( "POP3Server ...dispose end" );
  +    }
  +
   }
   
  
  
  
  1.7       +4 -2      
jakarta-james/src/java/org/apache/james/remotemanager/RemoteManager.java
  
  Index: RemoteManager.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-james/src/java/org/apache/james/remotemanager/RemoteManager.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- RemoteManager.java        7 Aug 2002 23:40:17 -0000       1.6
  +++ RemoteManager.java        12 Aug 2002 18:51:11 -0000      1.7
  @@ -38,7 +38,7 @@
       public void configure( final Configuration configuration )
           throws ConfigurationException {
   
  -        m_port = configuration.getChild( "port" ).getValueAsInteger( 4554 );
  +        m_port = configuration.getChild( "port" ).getValueAsInteger( 4555 );
   
           try
           {
  @@ -68,7 +68,9 @@
                       .append("RemoteManager using ")
                       .append(m_serverSocketType)
                       .append(" on port ")
  -                    .append(m_port);
  +                    .append(m_port)
  +                    .append(" at ")
  +                    .append(m_bindTo);
           getLogger().info(infoBuffer.toString());
           super.initialize();
           getLogger().info("RemoteManager ...init end");
  
  
  

--
To unsubscribe, e-mail:   <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>

Reply via email to