Index: jakarta-james/src/conf/james-assembly.xml
===================================================================
RCS file: /home/cvs/jakarta-james/src/conf/james-assembly.xml,v
retrieving revision 1.9
diff -u -r1.9 james-assembly.xml
--- jakarta-james/src/conf/james-assembly.xml	24 Sep 2002 15:38:40 -0000	1.9
+++ jakarta-james/src/conf/james-assembly.xml	27 Sep 2002 20:28:10 -0000
@@ -127,7 +127,7 @@
   </block>
 
   <!-- The Connection Manager block -->
-  <block class="org.apache.avalon.cornerstone.blocks.connection.DefaultConnectionManager"
+  <block class="org.apache.james.util.connection.SimpleConnectionManager"
            name="connections">
     <provide name="thread-manager"
              role="org.apache.avalon.cornerstone.services.threads.ThreadManager" />
Index: jakarta-james/src/conf/james-config.xml
===================================================================
RCS file: /home/cvs/jakarta-james/src/conf/james-config.xml,v
retrieving revision 1.33
diff -u -r1.33 james-config.xml
--- jakarta-james/src/conf/james-config.xml	27 Sep 2002 16:31:06 -0000	1.33
+++ jakarta-james/src/conf/james-config.xml	27 Sep 2002 20:28:11 -0000
@@ -566,6 +566,24 @@
          </repository>
       </repositories>
    </objectstorage>
+   <!-- The Connection Manager block -->
+   <!-- -->
+   <!-- The idle-timeout is the number of milliseconds that it will take for idle -->
+   <!-- client connections managed by this connection manager to be marked at timed out. -->
+   <!-- If no value is specified, the value defaults to 5 minutes, 300000 milliseconds -->
+   <!-- A value of 0 means that client sockets will not timeout. -->
+   <!-- -->
+   <!-- The max-connections parameter specifies the maximum number of client connections -->
+   <!-- that this connection manager will allow per managed server socket. -->
+   <!-- If no value is specified, the value defaults to 30. -->
+   <!-- A value of 0 means that there is no limit imposed by the connection manager, although -->
+   <!-- resource limitations imposed by other components (i.e. max # of threads) may -->
+   <!-- serve to limit the number of open connections. -->
+   <!-- -->
+   <connections>
+      <idle-timeout>300000<idle-timeout>
+      <max-connections>30<max-connections>
+   </connections>
    <!-- The Socket Manager block -->
    <sockets>
       <server-sockets>