hilmer 2004/02/13 06:38:34
Modified: src/conf Tag: branch_2_1_fcs james-assembly.xml
src/java/org/apache/james Tag: branch_2_1_fcs James.xinfo
src/java/org/apache/james/core Tag: branch_2_1_fcs
AbstractJamesService.java
src/java/org/apache/james/nntpserver Tag: branch_2_1_fcs
NNTPServer.xinfo
src/java/org/apache/james/pop3server Tag: branch_2_1_fcs
POP3Server.xinfo
src/java/org/apache/james/remotemanager Tag: branch_2_1_fcs
RemoteManager.xinfo
src/java/org/apache/james/smtpserver Tag: branch_2_1_fcs
SMTPServer.xinfo
src/java/org/apache/james/util/connection Tag:
branch_2_1_fcs SimpleConnectionManager.java
SimpleConnectionManager.xinfo
Added: src/java/org/apache/james/services Tag: branch_2_1_fcs
JamesConnectionManager.java
Log:
PR:JAMES-151
Submitted by:hilmer
Reviewed by:hilmer
Resolved bug. By extending the ConnectionManager interface. And using that extension
in assembly.xml and .xinfo files
Revision Changes Path
No revision
No revision
1.13.4.3 +5 -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.13.4.2
retrieving revision 1.13.4.3
diff -u -r1.13.4.2 -r1.13.4.3
--- james-assembly.xml 30 Aug 2003 18:52:18 -0000 1.13.4.2
+++ james-assembly.xml 13 Feb 2004 14:38:33 -0000 1.13.4.3
@@ -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"
No revision
No revision
1.4.4.1 +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.4
retrieving revision 1.4.4.1
diff -u -r1.4 -r1.4.4.1
--- James.xinfo 15 Aug 2002 07:07:21 -0000 1.4
+++ James.xinfo 13 Feb 2004 14:38:33 -0000 1.4.4.1
@@ -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"/>
No revision
No revision
1.4.4.3 +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.4.4.2
retrieving revision 1.4.4.3
diff -u -r1.4.4.2 -r1.4.4.3
--- AbstractJamesService.java 8 Mar 2003 21:54:02 -0000 1.4.4.2
+++ AbstractJamesService.java 13 Feb 2004 14:38:33 -0000 1.4.4.3
@@ -72,11 +72,10 @@
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.avalon.cornerstone.services.sockets.ServerSocketFactory;
import org.apache.avalon.cornerstone.services.sockets.SocketManager;
-import org.apache.james.util.connection.SimpleConnectionManager;
+import org.apache.james.services.JamesConnectionManager;
import org.apache.james.util.watchdog.ThreadPerWatchdogFactory;
import org.apache.james.util.watchdog.Watchdog;
import org.apache.james.util.watchdog.WatchdogFactory;
@@ -110,7 +109,7 @@
/**
* The ConnectionManager that spawns and manages service connections.
*/
- private ConnectionManager connectionManager;
+ private JamesConnectionManager connectionManager;
/**
* The name of the thread group to be used by this service for
@@ -184,7 +183,7 @@
public void compose(ComponentManager comp) throws ComponentException {
super.compose(comp);
compMgr = comp;
- connectionManager = (ConnectionManager)
compMgr.lookup(ConnectionManager.ROLE);
+ connectionManager = (JamesConnectionManager)
compMgr.lookup(JamesConnectionManager.ROLE);
}
/**
@@ -298,7 +297,7 @@
final String location = "generated:" + getServiceType();
- if (connectionManager instanceof SimpleConnectionManager) {
+ if (connectionManager instanceof JamesConnectionManager) {
String connectionLimitString =
conf.getChild("connectionLimit").getValue(null);
if (connectionLimitString != null) {
try {
@@ -311,7 +310,7 @@
throw new ConfigurationException("Connection limit value cannot
be less than zero.");
}
} else {
- connectionLimit = new
Integer(((SimpleConnectionManager)connectionManager).getMaximumNumberOfOpenConnections());
+ connectionLimit = new
Integer(((JamesConnectionManager)connectionManager).getMaximumNumberOfOpenConnections());
}
infoBuffer = new StringBuffer(128)
.append(getServiceType())
@@ -360,12 +359,12 @@
}
if ((connectionLimit != null) &&
- (connectionManager instanceof SimpleConnectionManager)) {
+ (connectionManager instanceof JamesConnectionManager)) {
if (null != threadPool) {
-
((SimpleConnectionManager)connectionManager).connect(connectionName, serverSocket,
this, threadPool, connectionLimit.intValue());
+ ((JamesConnectionManager)connectionManager).connect(connectionName,
serverSocket, this, threadPool, connectionLimit.intValue());
}
else {
-
((SimpleConnectionManager)connectionManager).connect(connectionName, serverSocket,
this, connectionLimit.intValue()); // default pool
+ ((JamesConnectionManager)connectionManager).connect(connectionName,
serverSocket, this, connectionLimit.intValue()); // default pool
}
} else {
if (null != threadPool) {
No revision
No revision
1.6.4.1 +2 -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.6
retrieving revision 1.6.4.1
diff -u -r1.6 -r1.6.4.1
--- NNTPServer.xinfo 26 Oct 2002 04:15:29 -0000 1.6
+++ NNTPServer.xinfo 13 Feb 2004 14:38:33 -0000 1.6.4.1
@@ -14,7 +14,8 @@
<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"/>
No revision
No revision
1.3.4.1 +1 -1
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.3
retrieving revision 1.3.4.1
diff -u -r1.3 -r1.3.4.1
--- POP3Server.xinfo 26 Oct 2002 04:15:30 -0000 1.3
+++ POP3Server.xinfo 13 Feb 2004 14:38:33 -0000 1.3.4.1
@@ -20,7 +20,7 @@
<service name="org.apache.james.services.UsersStore" version="1.0"/>
</dependency>
<dependency>
- <service
name="org.apache.avalon.cornerstone.services.connection.ConnectionManager"
+ <service name="org.apache.james.services.JamesConnectionManager"
version="1.0"/>
</dependency>
<dependency>
No revision
No revision
1.5.4.1 +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.5
retrieving revision 1.5.4.1
diff -u -r1.5 -r1.5.4.1
--- RemoteManager.xinfo 28 Oct 2002 00:28:15 -0000 1.5
+++ RemoteManager.xinfo 13 Feb 2004 14:38:33 -0000 1.5.4.1
@@ -20,8 +20,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"/>
No revision
No revision
1.1.2.1 +81 -0
james-server/src/java/org/apache/james/services/Attic/JamesConnectionManager.java
No revision
No revision
1.5.4.1 +1 -1
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.5
retrieving revision 1.5.4.1
diff -u -r1.5 -r1.5.4.1
--- SMTPServer.xinfo 28 Oct 2002 19:38:37 -0000 1.5
+++ SMTPServer.xinfo 13 Feb 2004 14:38:33 -0000 1.5.4.1
@@ -23,7 +23,7 @@
<service name="org.apache.james.services.UsersStore" version="1.0"/>
</dependency>
<dependency>
- <service
name="org.apache.avalon.cornerstone.services.connection.ConnectionManager"
+ <service name="org.apache.james.services.JamesConnectionManager"
version="1.0"/>
</dependency>
<dependency>
No revision
No revision
1.2.4.3 +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.2.4.2
retrieving revision 1.2.4.3
diff -u -r1.2.4.2 -r1.2.4.3
--- SimpleConnectionManager.java 8 Mar 2003 21:54:12 -0000 1.2.4.2
+++ SimpleConnectionManager.java 13 Feb 2004 14:38:33 -0000 1.2.4.3
@@ -64,7 +64,7 @@
import org.apache.avalon.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.component.ComponentException;
@@ -87,7 +87,7 @@
* @author Peter M. Goldstein <[EMAIL PROTECTED]>
*/
public class SimpleConnectionManager extends AbstractLogEnabled
- implements ConnectionManager, Composable, Configurable, Disposable {
+ implements JamesConnectionManager, Composable, Configurable, Disposable {
/**
* The default value for client socket idle timeouts. The
1.1.4.1 +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.1.4.1
diff -u -r1.1 -r1.1.4.1
--- SimpleConnectionManager.xinfo 7 Oct 2002 07:16:46 -0000 1.1
+++ SimpleConnectionManager.xinfo 13 Feb 2004 14:38:33 -0000 1.1.4.1
@@ -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]
