james-server-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From n...@apache.org
Subject svn commit: r168005 - in /james/server/branches/merge_v2_and_trunk/src/java/org/apache/james: services/JamesConnectionManager.java transport/JamesSpoolManager.java util/connection/SimpleConnectionManager.java util/watchdog/InaccurateTimeoutWatchdog.java util/watchdog/ThreadPerWatchdogFactory.java
Date Tue, 03 May 2005 22:14:41 GMT
Author: noel
Date: Tue May  3 15:14:39 2005
New Revision: 168005

URL: http://svn.apache.org/viewcvs?rev=168005&view=rev
Log:
more Avalon updates.  Add two methods to JamesConnectionManager that seem to be required and
not inherited anymore)

Modified:
    james/server/branches/merge_v2_and_trunk/src/java/org/apache/james/services/JamesConnectionManager.java
    james/server/branches/merge_v2_and_trunk/src/java/org/apache/james/transport/JamesSpoolManager.java
    james/server/branches/merge_v2_and_trunk/src/java/org/apache/james/util/connection/SimpleConnectionManager.java
    james/server/branches/merge_v2_and_trunk/src/java/org/apache/james/util/watchdog/InaccurateTimeoutWatchdog.java
    james/server/branches/merge_v2_and_trunk/src/java/org/apache/james/util/watchdog/ThreadPerWatchdogFactory.java

Modified: james/server/branches/merge_v2_and_trunk/src/java/org/apache/james/services/JamesConnectionManager.java
URL: http://svn.apache.org/viewcvs/james/server/branches/merge_v2_and_trunk/src/java/org/apache/james/services/JamesConnectionManager.java?rev=168005&r1=168004&r2=168005&view=diff
==============================================================================
--- james/server/branches/merge_v2_and_trunk/src/java/org/apache/james/services/JamesConnectionManager.java
(original)
+++ james/server/branches/merge_v2_and_trunk/src/java/org/apache/james/services/JamesConnectionManager.java
Tue May  3 15:14:39 2005
@@ -78,4 +78,37 @@
                   int maxOpenConnections )
         throws Exception;
 
+    /**
+     * Start managing a connection.
+     * Management involves accepting connections and farming them out to threads
+     * from pool to be handled.
+     *
+     * @param name the name of connection
+     * @param socket the ServerSocket from which to
+     * @param handlerFactory the factory from which to acquire handlers
+     * @param threadPool the thread pool to use
+     * @exception Exception if an error occurs
+     */
+    void connect( String name,
+                  ServerSocket socket,
+                  ConnectionHandlerFactory handlerFactory,
+                  ThreadPool threadPool )
+        throws Exception;
+    
+    /**
+     * Start managing a connection.
+     * Management involves accepting connections and farming them out to threads
+     * from pool to be handled.
+     *
+     * @param name the name of connection
+     * @param socket the ServerSocket from which to
+     * @param handlerFactory the factory from which to acquire handlers
+     * @exception Exception if an error occurs
+     */
+    void connect( String name,
+                  ServerSocket socket,
+                  ConnectionHandlerFactory handlerFactory )
+        throws Exception;
+    
+
 }

Modified: james/server/branches/merge_v2_and_trunk/src/java/org/apache/james/transport/JamesSpoolManager.java
URL: http://svn.apache.org/viewcvs/james/server/branches/merge_v2_and_trunk/src/java/org/apache/james/transport/JamesSpoolManager.java?rev=168005&r1=168004&r2=168005&view=diff
==============================================================================
--- james/server/branches/merge_v2_and_trunk/src/java/org/apache/james/transport/JamesSpoolManager.java
(original)
+++ james/server/branches/merge_v2_and_trunk/src/java/org/apache/james/transport/JamesSpoolManager.java
Tue May  3 15:14:39 2005
@@ -18,7 +18,7 @@
 package org.apache.james.transport;
 
 import org.apache.avalon.cornerstone.services.threads.ThreadManager;
-//import org.apache.avalon.excalibur.thread.ThreadPool;
+//import org.apache.excalibur.thread.ThreadPool;
 import org.apache.avalon.framework.activity.Disposable;
 import org.apache.avalon.framework.activity.Initializable;
 import org.apache.avalon.framework.configuration.Configurable;

Modified: james/server/branches/merge_v2_and_trunk/src/java/org/apache/james/util/connection/SimpleConnectionManager.java
URL: http://svn.apache.org/viewcvs/james/server/branches/merge_v2_and_trunk/src/java/org/apache/james/util/connection/SimpleConnectionManager.java?rev=168005&r1=168004&r2=168005&view=diff
==============================================================================
--- james/server/branches/merge_v2_and_trunk/src/java/org/apache/james/util/connection/SimpleConnectionManager.java
(original)
+++ james/server/branches/merge_v2_and_trunk/src/java/org/apache/james/util/connection/SimpleConnectionManager.java
Tue May  3 15:14:39 2005
@@ -257,14 +257,12 @@
     }
     /**
      * NOTE this method is a placeholder required until org.apache.avalon.cornerstone.services.connection.ConnectionManager
is updated
-     * NOTE/SJM placeholder not required is using 2.X
      * @deprecated 
      * @see org.apache.avalon.cornerstone.services.connection.ConnectionManager#connect(java.lang.String,
java.net.ServerSocket, org.apache.avalon.cornerstone.services.connection.ConnectionHandlerFactory,
ThreadPool)
      */
-    /*
-    public void connect(String arg0, ServerSocket arg1, ConnectionHandlerFactory arg2, ThreadPool
arg3)
+
+    public void connect(String arg0, ServerSocket arg1, ConnectionHandlerFactory arg2, org.apache.avalon.excalibur.thread.ThreadPool
arg3)
         throws Exception {
         connect(arg0,arg1,arg2,arg3,getMaximumNumberOfOpenConnections());
     }
-    */
 }

Modified: james/server/branches/merge_v2_and_trunk/src/java/org/apache/james/util/watchdog/InaccurateTimeoutWatchdog.java
URL: http://svn.apache.org/viewcvs/james/server/branches/merge_v2_and_trunk/src/java/org/apache/james/util/watchdog/InaccurateTimeoutWatchdog.java?rev=168005&r1=168004&r2=168005&view=diff
==============================================================================
--- james/server/branches/merge_v2_and_trunk/src/java/org/apache/james/util/watchdog/InaccurateTimeoutWatchdog.java
(original)
+++ james/server/branches/merge_v2_and_trunk/src/java/org/apache/james/util/watchdog/InaccurateTimeoutWatchdog.java
Tue May  3 15:14:39 2005
@@ -1,5 +1,5 @@
 /***********************************************************************
- * Copyright (c) 2000-2004 The Apache Software Foundation.             *
+ * Copyright (c) 2000-2005 The Apache Software Foundation.             *
  * All rights reserved.                                                *
  * ------------------------------------------------------------------- *
  * Licensed under the Apache License, Version 2.0 (the "License"); you *
@@ -17,7 +17,7 @@
 
 package org.apache.james.util.watchdog;
 
-import org.apache.avalon.excalibur.thread.ThreadPool;
+import org.apache.excalibur.thread.ThreadPool;
 import org.apache.avalon.framework.activity.Disposable;
 import org.apache.avalon.framework.logger.AbstractLogEnabled;
 

Modified: james/server/branches/merge_v2_and_trunk/src/java/org/apache/james/util/watchdog/ThreadPerWatchdogFactory.java
URL: http://svn.apache.org/viewcvs/james/server/branches/merge_v2_and_trunk/src/java/org/apache/james/util/watchdog/ThreadPerWatchdogFactory.java?rev=168005&r1=168004&r2=168005&view=diff
==============================================================================
--- james/server/branches/merge_v2_and_trunk/src/java/org/apache/james/util/watchdog/ThreadPerWatchdogFactory.java
(original)
+++ james/server/branches/merge_v2_and_trunk/src/java/org/apache/james/util/watchdog/ThreadPerWatchdogFactory.java
Tue May  3 15:14:39 2005
@@ -22,7 +22,7 @@
 import org.apache.avalon.excalibur.pool.ObjectFactory;
 import org.apache.avalon.excalibur.pool.Pool;
 import org.apache.avalon.excalibur.pool.Poolable;
-import org.apache.avalon.excalibur.thread.ThreadPool;
+import org.apache.excalibur.thread.ThreadPool;
 import org.apache.avalon.framework.activity.Disposable;
 import org.apache.avalon.framework.activity.Initializable;
 import org.apache.avalon.framework.logger.AbstractLogEnabled;



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


Mime
View raw message