You are viewing a plain text version of this content. The canonical link for it is here.
Posted to server-dev@james.apache.org by no...@apache.org on 2010/01/29 16:16:03 UTC

svn commit: r904516 - in /james/server/trunk: mina-socket-library/src/main/java/org/apache/james/socket/mina/ smtpserver-function/src/main/java/org/apache/james/smtpserver/mina/ spring-deployment/src/main/config/james/

Author: norman
Date: Fri Jan 29 15:16:03 2010
New Revision: 904516

URL: http://svn.apache.org/viewvc?rev=904516&view=rev
Log:
connection timeout in mina is specified in seconds

Modified:
    james/server/trunk/mina-socket-library/src/main/java/org/apache/james/socket/mina/AbstractAsyncServer.java
    james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/mina/AsyncSMTPServer.java
    james/server/trunk/spring-deployment/src/main/config/james/james-config.xml

Modified: james/server/trunk/mina-socket-library/src/main/java/org/apache/james/socket/mina/AbstractAsyncServer.java
URL: http://svn.apache.org/viewvc/james/server/trunk/mina-socket-library/src/main/java/org/apache/james/socket/mina/AbstractAsyncServer.java?rev=904516&r1=904515&r2=904516&view=diff
==============================================================================
--- james/server/trunk/mina-socket-library/src/main/java/org/apache/james/socket/mina/AbstractAsyncServer.java (original)
+++ james/server/trunk/mina-socket-library/src/main/java/org/apache/james/socket/mina/AbstractAsyncServer.java Fri Jan 29 15:16:03 2010
@@ -61,7 +61,7 @@
     /**
      * The default value for the connection timeout.
      */
-    private static final int DEFAULT_TIMEOUT = 5* 60 * 1000;
+    private static final int DEFAULT_TIMEOUT = 5* 60;
 
     /**
      * The name of the parameter defining the connection timeout.

Modified: james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/mina/AsyncSMTPServer.java
URL: http://svn.apache.org/viewvc/james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/mina/AsyncSMTPServer.java?rev=904516&r1=904515&r2=904516&view=diff
==============================================================================
--- james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/mina/AsyncSMTPServer.java (original)
+++ james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/mina/AsyncSMTPServer.java Fri Jan 29 15:16:03 2010
@@ -22,7 +22,6 @@
 package org.apache.james.smtpserver.mina;
 
 
-import java.nio.charset.Charset;
 
 import javax.annotation.PostConstruct;
 

Modified: james/server/trunk/spring-deployment/src/main/config/james/james-config.xml
URL: http://svn.apache.org/viewvc/james/server/trunk/spring-deployment/src/main/config/james/james-config.xml?rev=904516&r1=904515&r2=904516&view=diff
==============================================================================
--- james/server/trunk/spring-deployment/src/main/config/james/james-config.xml (original)
+++ james/server/trunk/spring-deployment/src/main/config/james/james-config.xml Fri Jan 29 15:16:03 2010
@@ -902,7 +902,9 @@
             <!-- Change the default login/password. -->
             <account login="root" password="root"/>
          </administrator_accounts>
-         <connectiontimeout> 60000 </connectiontimeout>
+         
+         <!-- connection timeout in secconds -->
+         <connectiontimeout> 600 </connectiontimeout>
          
          <!-- Set the maximum simultaneous incoming connections for this service -->
          <connectionLimit> 0 </connectionLimit>
@@ -962,7 +964,8 @@
          <!--
          <helloName autodetect="true">myMailServer</helloName>
          -->
-         <connectiontimeout>120000</connectiontimeout>
+         <!-- connection timeout in secconds -->
+         <connectiontimeout>1200</connectiontimeout>
       
          <!-- Set the maximum simultaneous incoming connections for this service -->
          <connectionLimit> 0 </connectionLimit>
@@ -1022,7 +1025,9 @@
          <!--
          <helloName autodetect="true">myMailServer</helloName>
          -->
-         <connectiontimeout>360000</connectiontimeout>
+         
+         <!-- connection timeout in secconds -->
+         <connectiontimeout>360</connectiontimeout>
 
          <!-- Set the maximum simultaneous incoming connections for this service -->
          <connectionLimit> 0 </connectionLimit>
@@ -1133,7 +1138,9 @@
          <!--
          <helloName autodetect="true">myMailServer</helloName>
          -->
-         <connectiontimeout>360000</connectiontimeout>
+         
+         <!-- connection timeout in secconds -->
+         <connectiontimeout>360</connectiontimeout>
             
          <!-- Set the maximum simultaneous incoming connections for this service -->
          <connectionLimit> 0 </connectionLimit>



---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org