hilmer 2004/02/16 15:48:23
Modified: src/conf james-assembly.xml
src/java/org/apache/james James.xinfo
src/java/org/apache/james/core AbstractJamesService.java
src/java/org/apache/james/nntpserver NNTPServer.xinfo
src/java/org/apache/james/pop3server POP3Server.xinfo
src/java/org/apache/james/remotemanager RemoteManager.xinfo
src/java/org/apache/james/smtpserver SMTPServer.xinfo
src/java/org/apache/james/util/connection
SimpleConnectionManager.java
SimpleConnectionManager.xinfo
Added: src/java/org/apache/james/services
JamesConnectionManager.java
Log:
PR: JAMES-151
Submitted by: hilmer
Reviewed by: hilmer
Fixes the connectionlimit bug, by extending the ConnectionManager interface and
using the extended version in assembly.xml
Revision Changes Path
1.16 +6 -5 james-server/src/conf/james-assembly.xml
Index: james-assembly.xml
===================================================================
RCS file: /home/cvs/james-server/src/conf/james-assembly.xml,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- james-assembly.xml 8 Feb 2003 04:12:24 -0000 1.15
+++ james-assembly.xml 16 Feb 2004 23:48:22 -0000 1.16
@@ -30,7 +30,7 @@
<provide name="sockets"
role="org.apache.avalon.cornerstone.services.sockets.SocketManager"/>
<provide name="connections"
-
role="org.apache.avalon.cornerstone.services.connection.ConnectionManager"/>
+ role="org.apache.james.services.JamesConnectionManager"/>
<provide name="scheduler"
role="org.apache.avalon.cornerstone.services.scheduler.TimeScheduler"/>
<provide name="database-connections"
@@ -53,7 +53,7 @@
<provide name="sockets"
role="org.apache.avalon.cornerstone.services.sockets.SocketManager"/>
<provide name="connections"
-
role="org.apache.avalon.cornerstone.services.connection.ConnectionManager"/>
+ role="org.apache.james.services.JamesConnectionManager"/>
<provide name="James" role="org.apache.james.services.MailServer"/>
<provide name="thread-manager"
role="org.apache.avalon.cornerstone.services.threads.ThreadManager" />
@@ -66,7 +66,7 @@
<provide name="sockets"
role="org.apache.avalon.cornerstone.services.sockets.SocketManager"/>
<provide name="connections"
-
role="org.apache.avalon.cornerstone.services.connection.ConnectionManager"/>
+ role="org.apache.james.services.JamesConnectionManager"/>
<provide name="James" role="org.apache.james.services.MailServer"/>
<provide name="thread-manager"
role="org.apache.avalon.cornerstone.services.threads.ThreadManager" />
@@ -80,7 +80,7 @@
<provide name="sockets"
role="org.apache.avalon.cornerstone.services.sockets.SocketManager"/>
<provide name="connections"
-
role="org.apache.avalon.cornerstone.services.connection.ConnectionManager"/>
+ role="org.apache.james.services.JamesConnectionManager"/>
<provide name="James" role="org.apache.james.services.MailServer"/>
<provide name="thread-manager"
role="org.apache.avalon.cornerstone.services.threads.ThreadManager" />
@@ -92,7 +92,7 @@
<provide name="sockets"
role="org.apache.avalon.cornerstone.services.sockets.SocketManager"/>
<provide name="connections"
-
role="org.apache.avalon.cornerstone.services.connection.ConnectionManager"/>
+ role="org.apache.james.services.JamesConnectionManager"/>
<provide name="nntp-repository"
role="org.apache.james.nntpserver.repository.NNTPRepository"/>
<provide name="thread-manager"
@@ -114,6 +114,7 @@
<provide name="scheduler"
role="org.apache.avalon.cornerstone.services.scheduler.TimeScheduler"/>
<provide name="James" role="org.apache.james.services.MailServer"/>
+ <provide name="users-store" role="org.apache.james.services.UsersStore"/>
</block>
<!-- The High Level Storage block -->
1.6 +1 -2 james-server/src/java/org/apache/james/James.xinfo
Index: James.xinfo
===================================================================
RCS file: /home/cvs/james-server/src/java/org/apache/james/James.xinfo,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- James.xinfo 8 Feb 2003 04:12:24 -0000 1.5
+++ James.xinfo 16 Feb 2004 23:48:22 -0000 1.6
@@ -30,8 +30,7 @@
<service name="org.apache.james.services.UsersStore" version="1.0"/>
</dependency>
<dependency>
- <service
name="org.apache.avalon.cornerstone.services.connection.ConnectionManager"
- version="1.0"/>
+ <service name="org.apache.james.services.JamesConnectionManager"
version="1.0"/>
</dependency>
<dependency>
<service name="org.apache.avalon.cornerstone.services.sockets.SocketManager"
version="1.0"/>
1.13 +8 -9
james-server/src/java/org/apache/james/core/AbstractJamesService.java
Index: AbstractJamesService.java
===================================================================
RCS file:
/home/cvs/james-server/src/java/org/apache/james/core/AbstractJamesService.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- AbstractJamesService.java 30 Jan 2004 02:22:07 -0000 1.12
+++ AbstractJamesService.java 16 Feb 2004 23:48:22 -0000 1.13
@@ -24,7 +24,7 @@
import org.apache.avalon.cornerstone.services.connection.AbstractHandlerFactory;
import org.apache.avalon.cornerstone.services.connection.ConnectionHandler;
import org.apache.avalon.cornerstone.services.connection.ConnectionHandlerFactory;
-import org.apache.avalon.cornerstone.services.connection.ConnectionManager;
+import org.apache.james.services.JamesConnectionManager;
import org.apache.avalon.cornerstone.services.sockets.ServerSocketFactory;
import org.apache.avalon.cornerstone.services.sockets.SocketManager;
import org.apache.avalon.cornerstone.services.threads.ThreadManager;
@@ -39,7 +39,6 @@
import org.apache.avalon.framework.configuration.ConfigurationException;
import org.apache.avalon.framework.logger.LogEnabled;
-import org.apache.james.util.connection.SimpleConnectionManager;
import org.apache.james.util.watchdog.ThreadPerWatchdogFactory;
import org.apache.james.util.watchdog.WatchdogFactory;
@@ -129,7 +128,7 @@
/**
* The ConnectionManager that spawns and manages service connections.
*/
- private ConnectionManager connectionManager;
+ private JamesConnectionManager connectionManager;
/**
* Whether this service is enabled.
@@ -165,7 +164,7 @@
super.service( comp );
compMgr = comp;
connectionManager =
- (ConnectionManager)compMgr.lookup(ConnectionManager.ROLE);
+ (JamesConnectionManager)compMgr.lookup(JamesConnectionManager.ROLE);
}
/**
@@ -278,7 +277,7 @@
final String location = "generated:"+getServiceType();
- if(connectionManager instanceof SimpleConnectionManager) {
+ if(connectionManager instanceof JamesConnectionManager) {
String connectionLimitString =
conf.getChild("connectionLimit").getValue(null);
if(connectionLimitString != null) {
@@ -297,7 +296,7 @@
} else {
connectionLimit =
new Integer(
- ((SimpleConnectionManager)connectionManager)
+ ((JamesConnectionManager)connectionManager)
.getMaximumNumberOfOpenConnections());
}
infoBuffer =
@@ -407,13 +406,13 @@
}
if(
(connectionLimit != null)
- &&(connectionManager instanceof SimpleConnectionManager)) {
+ &&(connectionManager instanceof JamesConnectionManager)) {
if(null != threadPool) {
- ((SimpleConnectionManager)connectionManager).connect(
+ ((JamesConnectionManager)connectionManager).connect(
connectionName,serverSocket,this,threadPool,
connectionLimit.intValue());
} else {
- ((SimpleConnectionManager)connectionManager).connect(
+ ((JamesConnectionManager)connectionManager).connect(
connectionName,serverSocket,this,connectionLimit.intValue());
// default pool
}
} else {
1.8 +1 -1
james-server/src/java/org/apache/james/nntpserver/NNTPServer.xinfo
Index: NNTPServer.xinfo
===================================================================
RCS file:
/home/cvs/james-server/src/java/org/apache/james/nntpserver/NNTPServer.xinfo,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- NNTPServer.xinfo 8 Feb 2003 04:12:26 -0000 1.7
+++ NNTPServer.xinfo 16 Feb 2004 23:48:22 -0000 1.8
@@ -9,7 +9,7 @@
<dependencies>
<dependency>
- <service
name="org.apache.avalon.cornerstone.services.connection.ConnectionManager"
version="1.0"/>
+ <service name="org.apache.james.services.JamesConnectionManager"
version="1.0"/>
</dependency>
<dependency>
<service name="org.apache.avalon.cornerstone.services.sockets.SocketManager"
version="1.0"/>
1.5 +1 -2
james-server/src/java/org/apache/james/pop3server/POP3Server.xinfo
Index: POP3Server.xinfo
===================================================================
RCS file:
/home/cvs/james-server/src/java/org/apache/james/pop3server/POP3Server.xinfo,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- POP3Server.xinfo 8 Feb 2003 04:12:26 -0000 1.4
+++ POP3Server.xinfo 16 Feb 2004 23:48:22 -0000 1.5
@@ -15,8 +15,7 @@
<service name="org.apache.james.services.UsersStore" version="1.0"/>
</dependency>
<dependency>
- <service
name="org.apache.avalon.cornerstone.services.connection.ConnectionManager"
- version="1.0"/>
+ <service name="org.apache.james.services.JamesConnectionManager"
version="1.0"/>
</dependency>
<dependency>
<service name="org.apache.avalon.cornerstone.services.sockets.SocketManager"
version="1.0"/>
1.7 +1 -2
james-server/src/java/org/apache/james/remotemanager/RemoteManager.xinfo
Index: RemoteManager.xinfo
===================================================================
RCS file:
/home/cvs/james-server/src/java/org/apache/james/remotemanager/RemoteManager.xinfo,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- RemoteManager.xinfo 8 Feb 2003 04:12:26 -0000 1.6
+++ RemoteManager.xinfo 16 Feb 2004 23:48:22 -0000 1.7
@@ -15,8 +15,7 @@
<service name="org.apache.james.services.UsersStore" version="1.0"/>
</dependency>
<dependency>
- <service
name="org.apache.avalon.cornerstone.services.connection.ConnectionManager"
- version="1.0"/>
+ <service name="org.apache.james.services.JamesConnectionManager"
version="1.0"/>
</dependency>
<dependency>
<service name="org.apache.avalon.cornerstone.services.sockets.SocketManager"
version="1.0"/>
1.2 +81 -0
james-server/src/java/org/apache/james/services/JamesConnectionManager.java
1.7 +1 -2
james-server/src/java/org/apache/james/smtpserver/SMTPServer.xinfo
Index: SMTPServer.xinfo
===================================================================
RCS file:
/home/cvs/james-server/src/java/org/apache/james/smtpserver/SMTPServer.xinfo,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- SMTPServer.xinfo 8 Feb 2003 04:12:26 -0000 1.6
+++ SMTPServer.xinfo 16 Feb 2004 23:48:22 -0000 1.7
@@ -18,8 +18,7 @@
<service name="org.apache.james.services.UsersStore" version="1.0"/>
</dependency>
<dependency>
- <service
name="org.apache.avalon.cornerstone.services.connection.ConnectionManager"
- version="1.0"/>
+ <service name="org.apache.james.services.JamesConnectionManager"
version="1.0"/>
</dependency>
<dependency>
<service name="org.apache.avalon.cornerstone.services.sockets.SocketManager"
version="1.0"/>
1.10 +2 -2
james-server/src/java/org/apache/james/util/connection/SimpleConnectionManager.java
Index: SimpleConnectionManager.java
===================================================================
RCS file:
/home/cvs/james-server/src/java/org/apache/james/util/connection/SimpleConnectionManager.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- SimpleConnectionManager.java 30 Jan 2004 02:22:16 -0000 1.9
+++ SimpleConnectionManager.java 16 Feb 2004 23:48:22 -0000 1.10
@@ -20,7 +20,7 @@
import java.util.HashMap;
import org.apache.excalibur.thread.ThreadPool;
import org.apache.avalon.cornerstone.services.connection.ConnectionHandlerFactory;
-import org.apache.avalon.cornerstone.services.connection.ConnectionManager;
+import org.apache.james.services.JamesConnectionManager;
import org.apache.avalon.cornerstone.services.threads.ThreadManager;
import org.apache.avalon.framework.activity.Initializable;
import org.apache.avalon.framework.service.ServiceException;
@@ -39,7 +39,7 @@
*/
public class SimpleConnectionManager
extends AbstractLogEnabled
- implements ConnectionManager, Serviceable, Configurable, Disposable {
+ implements JamesConnectionManager, Serviceable, Configurable, Disposable {
/**
* The default value for client socket idle timeouts. The
* Java default is 0, meaning no timeout. That's dangerous
1.2 +1 -1
james-server/src/java/org/apache/james/util/connection/SimpleConnectionManager.xinfo
Index: SimpleConnectionManager.xinfo
===================================================================
RCS file:
/home/cvs/james-server/src/java/org/apache/james/util/connection/SimpleConnectionManager.xinfo,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- SimpleConnectionManager.xinfo 7 Oct 2002 07:16:46 -0000 1.1
+++ SimpleConnectionManager.xinfo 16 Feb 2004 23:48:22 -0000 1.2
@@ -11,7 +11,7 @@
<!-- services that are offered by this block -->
<services>
- <service
name="org.apache.avalon.cornerstone.services.connection.ConnectionManager"/>
+ <service name="org.apache.james.services.JamesConnectionManager"/>
</services>
<!-- services that are required by this block -->
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
