directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From akaras...@apache.org
Subject svn commit: rev 43401 - in incubator/directory/seda/trunk/impl/src/java/org/apache/eve: . buffer decoder encoder event input listener output seda
Date Mon, 06 Sep 2004 04:07:50 GMT
Author: akarasulu
Date: Sun Sep  5 21:07:49 2004
New Revision: 43401

Modified:
   incubator/directory/seda/trunk/impl/src/java/org/apache/eve/DefaultFrontend.java
   incubator/directory/seda/trunk/impl/src/java/org/apache/eve/buffer/BufferPoolMonitorAdapter.java
   incubator/directory/seda/trunk/impl/src/java/org/apache/eve/buffer/DefaultBufferPool.java
   incubator/directory/seda/trunk/impl/src/java/org/apache/eve/buffer/LoggingBufferMonitor.java
   incubator/directory/seda/trunk/impl/src/java/org/apache/eve/decoder/DecodeStageHandler.java
   incubator/directory/seda/trunk/impl/src/java/org/apache/eve/decoder/DecoderManagerMonitorAdapter.java
   incubator/directory/seda/trunk/impl/src/java/org/apache/eve/decoder/DefaultDecoderManager.java
   incubator/directory/seda/trunk/impl/src/java/org/apache/eve/encoder/DefaultEncoderManager.java
   incubator/directory/seda/trunk/impl/src/java/org/apache/eve/encoder/EncoderManagerMonitorAdapter.java
   incubator/directory/seda/trunk/impl/src/java/org/apache/eve/event/AbstractSubscriber.java
   incubator/directory/seda/trunk/impl/src/java/org/apache/eve/event/DefaultEventRouter.java
   incubator/directory/seda/trunk/impl/src/java/org/apache/eve/input/DefaultInputManager.java
   incubator/directory/seda/trunk/impl/src/java/org/apache/eve/input/InputManagerMonitorAdapter.java
   incubator/directory/seda/trunk/impl/src/java/org/apache/eve/listener/DefaultListenerManager.java
   incubator/directory/seda/trunk/impl/src/java/org/apache/eve/listener/DefaultServerListener.java
   incubator/directory/seda/trunk/impl/src/java/org/apache/eve/output/DefaultOutputManager.java
   incubator/directory/seda/trunk/impl/src/java/org/apache/eve/output/LoggingOutputMonitor.java
   incubator/directory/seda/trunk/impl/src/java/org/apache/eve/output/OutputMonitorAdapter.java
   incubator/directory/seda/trunk/impl/src/java/org/apache/eve/seda/DefaultStage.java
Log:
more cleanup

Modified: incubator/directory/seda/trunk/impl/src/java/org/apache/eve/DefaultFrontend.java
==============================================================================
--- incubator/directory/seda/trunk/impl/src/java/org/apache/eve/DefaultFrontend.java	(original)
+++ incubator/directory/seda/trunk/impl/src/java/org/apache/eve/DefaultFrontend.java	Sun Sep
 5 21:07:49 2004
@@ -16,6 +16,8 @@
  */
 package org.apache.eve ;
 
+import org.apache.seda.Frontend;
+
 
 /**
  * A container neutral implementation of the Eve frontend.  There really is 

Modified: incubator/directory/seda/trunk/impl/src/java/org/apache/eve/buffer/BufferPoolMonitorAdapter.java
==============================================================================
--- incubator/directory/seda/trunk/impl/src/java/org/apache/eve/buffer/BufferPoolMonitorAdapter.java
(original)
+++ incubator/directory/seda/trunk/impl/src/java/org/apache/eve/buffer/BufferPoolMonitorAdapter.java
Sun Sep  5 21:07:49 2004
@@ -17,6 +17,9 @@
 package org.apache.eve.buffer ;
 
 
+import org.apache.seda.buffer.BufferPoolMonitor;
+import org.apache.seda.buffer.BufferPool;
+
 import java.nio.ByteBuffer ;
 
 

Modified: incubator/directory/seda/trunk/impl/src/java/org/apache/eve/buffer/DefaultBufferPool.java
==============================================================================
--- incubator/directory/seda/trunk/impl/src/java/org/apache/eve/buffer/DefaultBufferPool.java
(original)
+++ incubator/directory/seda/trunk/impl/src/java/org/apache/eve/buffer/DefaultBufferPool.java
Sun Sep  5 21:07:49 2004
@@ -22,7 +22,10 @@
 import java.util.ArrayList ;
 
 import org.apache.commons.lang.Validate ;
-import org.apache.eve.ResourceException ;
+import org.apache.seda.ResourceException ;
+import org.apache.seda.buffer.BufferPool;
+import org.apache.seda.buffer.BufferPoolConfig;
+import org.apache.seda.buffer.BufferPoolMonitor;
 
 
 /**
@@ -74,7 +77,7 @@
 
     
     /* (non-Javadoc)
-     * @see org.apache.eve.buffer.BufferPool#getBuffer(java.lang.Object)
+     * @see org.apache.seda.buffer.BufferPool#getBuffer(java.lang.Object)
      */
     public synchronized ByteBuffer getBuffer( Object party ) 
         throws ResourceException
@@ -112,7 +115,7 @@
 
     
     /* (non-Javadoc)
-     * @see org.apache.eve.buffer.BufferPool#claimInterest(java.nio.ByteBuffer, 
+     * @see org.apache.seda.buffer.BufferPool#claimInterest(java.nio.ByteBuffer,
      * java.lang.Object)
      */
     public synchronized void claimInterest( ByteBuffer buffer, 
@@ -132,7 +135,7 @@
 
     
     /* (non-Javadoc)
-     * @see org.apache.eve.buffer.BufferPool#releaseClaim(java.nio.ByteBuffer, 
+     * @see org.apache.seda.buffer.BufferPool#releaseClaim(java.nio.ByteBuffer,
      * java.lang.Object)
      */
     public synchronized void releaseClaim( ByteBuffer buffer, Object party )
@@ -149,7 +152,7 @@
         {
             m_monitor.unregisteredParty( this, buffer, party ) ;
             throw new IllegalStateException( 
-                    "Party never registered interest with buffer" ) ;
+                    "Party nsedar registered interest with buffer" ) ;
         }
         
         l_list.remove( party ) ;
@@ -167,7 +170,7 @@
 
     /*
      * (non-Javadoc)
-     * @see org.apache.eve.buffer.BufferPool#getConfig()
+     * @see org.apache.seda.buffer.BufferPool#getConfig()
      */
     public BufferPoolConfig getConfig()
     {
@@ -176,7 +179,7 @@
     
     
     /* (non-Javadoc)
-     * @see org.apache.eve.buffer.BufferPool#size()
+     * @see org.apache.seda.buffer.BufferPool#size()
      */
     public synchronized int size()
     {
@@ -185,7 +188,7 @@
     
 
     /* (non-Javadoc)
-     * @see org.apache.eve.buffer.BufferPool#getName()
+     * @see org.apache.seda.buffer.BufferPool#getName()
      */
     public String getName()
     {
@@ -194,7 +197,7 @@
     
     
     /* (non-Javadoc)
-     * @see org.apache.eve.buffer.BufferPool#getFreeCount()
+     * @see org.apache.seda.buffer.BufferPool#getFreeCount()
      */
     public synchronized int getFreeCount()
     {
@@ -203,7 +206,7 @@
     
     
     /* (non-Javadoc)
-     * @see org.apache.eve.buffer.BufferPool#getInUseCount()
+     * @see org.apache.seda.buffer.BufferPool#getInUseCount()
      */
     public synchronized int getInUseCount()
     {
@@ -212,7 +215,7 @@
     
     
     /* (non-Javadoc)
-     * @see org.apache.eve.buffer.BufferPool#getInterestedCount(
+     * @see org.apache.seda.buffer.BufferPool#getInterestedCount(
      * java.nio.ByteBuffer)
      */
     public int getInterestedCount( ByteBuffer buffer )

Modified: incubator/directory/seda/trunk/impl/src/java/org/apache/eve/buffer/LoggingBufferMonitor.java
==============================================================================
--- incubator/directory/seda/trunk/impl/src/java/org/apache/eve/buffer/LoggingBufferMonitor.java
(original)
+++ incubator/directory/seda/trunk/impl/src/java/org/apache/eve/buffer/LoggingBufferMonitor.java
Sun Sep  5 21:07:49 2004
@@ -21,6 +21,8 @@
 
 import org.apache.commons.logging.Log ;
 import org.apache.commons.logging.LogFactory ;
+import org.apache.seda.buffer.BufferPool;
+import org.apache.seda.buffer.BufferPoolMonitor;
 
 
 /**
@@ -104,7 +106,7 @@
      * @see org.apache.eve.buffer.BufferPoolMonitor#interestClaimed(
      * org.apache.eve.buffer.BufferPool, java.nio.ByteBuffer, java.lang.Object)
      */
-    public void interestClaimed( BufferPool bp, ByteBuffer buffer, 
+    public void interestClaimed( BufferPool bp, ByteBuffer buffer,
                                  Object claimer )
     {
         if ( log.isDebugEnabled() )

Modified: incubator/directory/seda/trunk/impl/src/java/org/apache/eve/decoder/DecodeStageHandler.java
==============================================================================
--- incubator/directory/seda/trunk/impl/src/java/org/apache/eve/decoder/DecodeStageHandler.java
(original)
+++ incubator/directory/seda/trunk/impl/src/java/org/apache/eve/decoder/DecodeStageHandler.java
Sun Sep  5 21:07:49 2004
@@ -23,9 +23,9 @@
 import org.apache.commons.codec.DecoderException ;
 import org.apache.commons.codec.stateful.StatefulDecoder ;
 
-import org.apache.eve.event.InputEvent ;
-import org.apache.eve.seda.StageHandler ;
-import org.apache.eve.listener.ClientKey ;
+import org.apache.seda.event.InputEvent ;
+import org.apache.seda.stage.StageHandler ;
+import org.apache.seda.listener.ClientKey ;
 
 
 /**
@@ -58,7 +58,7 @@
      * stateful decoder.  The decoder's decodeNonBlocking method is called and control is
      * returned.  Error handling is left upto the decoder's monitor.
      * 
-     * @see org.apache.eve.seda.StageHandler#handleEvent(java.util.EventObject)
+     * @see org.apache.seda.stage.StageHandler#handleEvent(java.util.EventObject)
      */
     public void handleEvent( EventObject event )
     {

Modified: incubator/directory/seda/trunk/impl/src/java/org/apache/eve/decoder/DecoderManagerMonitorAdapter.java
==============================================================================
--- incubator/directory/seda/trunk/impl/src/java/org/apache/eve/decoder/DecoderManagerMonitorAdapter.java
(original)
+++ incubator/directory/seda/trunk/impl/src/java/org/apache/eve/decoder/DecoderManagerMonitorAdapter.java
Sun Sep  5 21:07:49 2004
@@ -19,7 +19,8 @@
 
 import java.util.EventObject ; 
 
-import org.apache.eve.event.Subscriber ;
+import org.apache.seda.event.Subscriber ;
+import org.apache.seda.decoder.DecoderManagerMonitor;
 
 
 /**

Modified: incubator/directory/seda/trunk/impl/src/java/org/apache/eve/decoder/DefaultDecoderManager.java
==============================================================================
--- incubator/directory/seda/trunk/impl/src/java/org/apache/eve/decoder/DefaultDecoderManager.java
(original)
+++ incubator/directory/seda/trunk/impl/src/java/org/apache/eve/decoder/DefaultDecoderManager.java
Sun Sep  5 21:07:49 2004
@@ -23,19 +23,22 @@
 
 import java.nio.ByteBuffer;
 
-import org.apache.eve.event.InputEvent;
-import org.apache.eve.seda.StageConfig;
-import org.apache.eve.event.EventRouter;
-import org.apache.eve.seda.DefaultStage;
-import org.apache.eve.listener.ClientKey;
-import org.apache.eve.event.ConnectEvent;
-import org.apache.eve.event.RequestEvent;
-import org.apache.eve.event.DisconnectEvent;
-import org.apache.eve.event.InputSubscriber;
-import org.apache.eve.event.ConnectSubscriber;
+import org.apache.seda.event.InputEvent;
+import org.apache.seda.stage.StageConfig;
+import org.apache.seda.event.EventRouter;
+import org.apache.seda.listener.ClientKey;
+import org.apache.seda.event.ConnectEvent;
+import org.apache.seda.event.RequestEvent;
+import org.apache.seda.event.DisconnectEvent;
+import org.apache.seda.event.InputSubscriber;
+import org.apache.seda.event.ConnectSubscriber;
 import org.apache.eve.seda.LoggingStageMonitor;
+import org.apache.eve.seda.DefaultStage;
 import org.apache.eve.event.AbstractSubscriber;
-import org.apache.eve.event.DisconnectSubscriber;
+import org.apache.seda.event.DisconnectSubscriber;
+import org.apache.seda.decoder.DecoderManager;
+import org.apache.seda.decoder.DecoderManagerMonitor;
+import org.apache.seda.decoder.ClientDecoder;
 
 import org.apache.commons.codec.DecoderException;
 import org.apache.commons.codec.stateful.DecoderCallback;
@@ -51,7 +54,7 @@
  * @version $Rev$
  */
 public class DefaultDecoderManager extends DefaultStage
-    implements 
+    implements
     DecoderManager,
     InputSubscriber,
     ConnectSubscriber, 
@@ -93,9 +96,9 @@
     /**
      * Routes the event to the appropriate typed <code>inform()</code> method.
      * 
-     * @see org.apache.eve.event.Subscriber#inform(java.util.EventObject)
-     * @see org.apache.eve.event.AbstractSubscriber#inform(
-     *      org.apache.eve.event.Subscriber, java.util.EventObject)
+     * @see org.apache.seda.event.Subscriber#inform(java.util.EventObject)
+     * @see org.apache.seda.event.AbstractSubscriber#inform(
+     *      org.apache.seda.event.Subscriber, java.util.EventObject)
      */
     public void inform( EventObject event )
     {
@@ -111,10 +114,10 @@
 
     
     /**
-     * Enqueues the event onto this Stages event queue for processing. 
+     * Enqueues the event onto this Stages event queue for processing.
      * 
-     * @see org.apache.eve.event.InputSubscriber#inform(
-     * org.apache.eve.event.InputEvent)
+     * @see org.apache.seda.event.InputSubscriber#inform(
+     * org.apache.seda.event.InputEvent)
      */
     public void inform( InputEvent event )
     {
@@ -127,8 +130,8 @@
     /**
      * Removes the clients decoder from the map of decoders.
      * 
-     * @see org.apache.eve.event.DisconnectSubscriber#inform(
-     * org.apache.eve.event.DisconnectEvent)
+     * @see org.apache.seda.event.DisconnectSubscriber#inform(
+     * org.apache.seda.event.DisconnectEvent)
      */
     public void inform( DisconnectEvent event )
     {
@@ -158,8 +161,8 @@
      * We basically create a new client decoder and put it into a map for
      * use later when we are processing input events from the client.
      * 
-     * @see org.apache.eve.event.ConnectSubscriber#inform(
-     * org.apache.eve.event.ConnectEvent)
+     * @see org.apache.seda.event.ConnectSubscriber#inform(
+     * org.apache.seda.event.ConnectEvent)
      */
     public void inform( ConnectEvent event )
     {

Modified: incubator/directory/seda/trunk/impl/src/java/org/apache/eve/encoder/DefaultEncoderManager.java
==============================================================================
--- incubator/directory/seda/trunk/impl/src/java/org/apache/eve/encoder/DefaultEncoderManager.java
(original)
+++ incubator/directory/seda/trunk/impl/src/java/org/apache/eve/encoder/DefaultEncoderManager.java
Sun Sep  5 21:07:49 2004
@@ -23,18 +23,20 @@
 import org.apache.commons.codec.EncoderException;
 import org.apache.commons.lang.NotImplementedException;
 
-import org.apache.eve.event.EventRouter;
-import org.apache.eve.event.OutputEvent;
-import org.apache.eve.event.ResponseEvent;
-import org.apache.eve.event.ResponseSubscriber;
-import org.apache.eve.event.AbstractSubscriber;
+import org.apache.seda.event.EventRouter;
+import org.apache.seda.event.OutputEvent;
+import org.apache.seda.event.ResponseEvent;
+import org.apache.seda.event.ResponseSubscriber;
+
+import org.apache.seda.stage.StageHandler;
 
+import org.apache.seda.listener.ClientKey;
+import org.apache.seda.encoder.EncoderManager;
+import org.apache.seda.encoder.EncoderManagerMonitor;
 import org.apache.eve.seda.DefaultStage;
-import org.apache.eve.seda.StageHandler;
 import org.apache.eve.seda.DefaultStageConfig;
 import org.apache.eve.seda.LoggingStageMonitor;
-
-import org.apache.eve.listener.ClientKey;
+import org.apache.eve.event.AbstractSubscriber;
 
 
 /**
@@ -46,7 +48,7 @@
  * Apache Directory Project</a>
  * @version $Rev$
  */
-public class DefaultEncoderManager extends DefaultStage 
+public class DefaultEncoderManager extends DefaultStage
     implements EncoderManager, ResponseSubscriber
 {
     /** the event router used to publish and subscribe to events on */
@@ -72,7 +74,7 @@
     
     
     /* (non-Javadoc)
-     * @see org.apache.eve.event.Subscriber#inform(java.util.EventObject)
+     * @see org.apache.seda.event.Subscriber#inform(java.util.EventObject)
      */
     public void inform( EventObject event )
     {
@@ -88,8 +90,8 @@
     
     
     /* (non-Javadoc)
-     * @see org.apache.eve.event.ResponseSubscriber#inform(
-     * org.apache.eve.event.ResponseEvent)
+     * @see org.apache.seda.event.ResponseSubscriber#inform(
+     * org.apache.seda.event.ResponseEvent)
      */
     public void inform( ResponseEvent event )
     {

Modified: incubator/directory/seda/trunk/impl/src/java/org/apache/eve/encoder/EncoderManagerMonitorAdapter.java
==============================================================================
--- incubator/directory/seda/trunk/impl/src/java/org/apache/eve/encoder/EncoderManagerMonitorAdapter.java
(original)
+++ incubator/directory/seda/trunk/impl/src/java/org/apache/eve/encoder/EncoderManagerMonitorAdapter.java
Sun Sep  5 21:07:49 2004
@@ -17,6 +17,9 @@
 package org.apache.eve.encoder;
 
 
+import org.apache.seda.encoder.EncoderManagerMonitor;
+import org.apache.seda.encoder.EncoderManager;
+
 import java.util.EventObject;
 
 

Modified: incubator/directory/seda/trunk/impl/src/java/org/apache/eve/event/AbstractSubscriber.java
==============================================================================
--- incubator/directory/seda/trunk/impl/src/java/org/apache/eve/event/AbstractSubscriber.java
(original)
+++ incubator/directory/seda/trunk/impl/src/java/org/apache/eve/event/AbstractSubscriber.java
Sun Sep  5 21:07:49 2004
@@ -26,6 +26,8 @@
 
 import org.apache.commons.lang.Validate ;
 import org.apache.commons.lang.ClassUtils ;
+import org.apache.seda.event.Subscriber;
+import org.apache.seda.event.SubscriberMonitor;
 
 
 /**

Modified: incubator/directory/seda/trunk/impl/src/java/org/apache/eve/event/DefaultEventRouter.java
==============================================================================
--- incubator/directory/seda/trunk/impl/src/java/org/apache/eve/event/DefaultEventRouter.java
(original)
+++ incubator/directory/seda/trunk/impl/src/java/org/apache/eve/event/DefaultEventRouter.java
Sun Sep  5 21:07:49 2004
@@ -17,6 +17,8 @@
 package org.apache.eve.event ;
 
 
+import org.apache.seda.event.*;
+
 import java.util.Set ;
 import java.util.HashSet ;
 import java.util.Iterator ;
@@ -76,8 +78,8 @@
 
     
     /**
-     * @see org.apache.eve.event.EventRouter#unsubscribe(
-     * org.apache.eve.event.Subscriber)
+     * @see org.apache.seda.event.EventRouter#unsubscribe(
+     * org.apache.seda.event.Subscriber)
      */
     public void unsubscribe( Subscriber subscriber )
     {
@@ -100,8 +102,8 @@
 
     /**
      * (non-Javadoc)
-     * @see org.apache.eve.event.EventRouter#unsubscribe(java.lang.Class, 
-     * org.apache.eve.event.Subscriber)
+     * @see org.apache.seda.event.EventRouter#unsubscribe(java.lang.Class,
+     * org.apache.seda.event.Subscriber)
      */
     public void unsubscribe( Class type, Subscriber subscriber )
     {
@@ -125,8 +127,8 @@
 
     /**
      * (non-Javadoc)
-     * @see org.apache.eve.event.EventRouter#unsubscribe(java.lang.Class, 
-     * org.apache.eve.event.Subscriber)
+     * @see org.apache.seda.event.EventRouter#unsubscribe(java.lang.Class,
+     * org.apache.seda.event.Subscriber)
      */
     public void unsubscribe( Class type, Filter filter, 
                              Subscriber subscriber )
@@ -149,7 +151,7 @@
 
     /**
      * (non-Javadoc)
-     * @see org.apache.eve.event.EventRouter#publish(org.apache.eve.event.Event)
+     * @see org.apache.seda.event.EventRouter#publish(java.util.EventObject)
      */
     public void publish( EventObject event ) 
     {

Modified: incubator/directory/seda/trunk/impl/src/java/org/apache/eve/input/DefaultInputManager.java
==============================================================================
--- incubator/directory/seda/trunk/impl/src/java/org/apache/eve/input/DefaultInputManager.java
(original)
+++ incubator/directory/seda/trunk/impl/src/java/org/apache/eve/input/DefaultInputManager.java
Sun Sep  5 21:07:49 2004
@@ -26,17 +26,19 @@
 import java.nio.channels.SelectionKey ;
 import java.nio.channels.SocketChannel ;
 
-import org.apache.eve.event.InputEvent ;
-import org.apache.eve.ResourceException ;
-import org.apache.eve.buffer.BufferPool ;
-import org.apache.eve.event.EventRouter ;
-import org.apache.eve.listener.ClientKey ;
-import org.apache.eve.event.ConnectEvent ;
-import org.apache.eve.event.DisconnectEvent ;
-import org.apache.eve.event.ConnectSubscriber ;
-import org.apache.eve.event.AbstractSubscriber ;
-import org.apache.eve.event.DisconnectSubscriber ;
-import org.apache.eve.listener.KeyExpiryException ;
+import org.apache.seda.event.InputEvent ;
+import org.apache.seda.ResourceException ;
+import org.apache.seda.input.InputManagerMonitor;
+import org.apache.seda.input.InputManager;
+import org.apache.seda.buffer.BufferPool ;
+import org.apache.seda.event.EventRouter ;
+import org.apache.seda.listener.ClientKey ;
+import org.apache.seda.event.ConnectEvent ;
+import org.apache.seda.event.DisconnectEvent ;
+import org.apache.seda.event.ConnectSubscriber ;
+import org.apache.seda.event.DisconnectSubscriber ;
+import org.apache.seda.listener.KeyExpiryException ;
+import org.apache.eve.event.AbstractSubscriber;
 
 
 /**
@@ -114,8 +116,6 @@
          */
         while ( m_hasStarted.booleanValue() ) 
         {
-            int l_count = 0 ;
-            
             try
             {
                 /*
@@ -135,7 +135,7 @@
                  * connections lingering around.  We remove them since they
                  * are prematurely triggering selection to return w/o input.
                  */  
-                if ( 0 == ( l_count = m_selector.select() ) )
+                if ( 0 == m_selector.select() )
                 {
                     Iterator l_list = m_selector.selectedKeys().iterator() ;
                     while( l_list.hasNext() )
@@ -210,8 +210,7 @@
     
     
     /**
-     * @see org.apache.eve.event.ConnectListener#
-     * connectPerformed(org.apache.eve.event.ConnectEvent)
+     * @see org.apache.seda.event.ConnectSubscriber#inform(org.apache.seda.event.ConnectEvent)
      */
     public void inform( ConnectEvent an_event )
     {
@@ -225,8 +224,7 @@
 
     
     /**
-     * @see org.apache.eve.event.DisconnectListener#
-     * inform(org.apache.eve.event.DisconnectEvent)
+     * @see org.apache.seda.event.DisconnectSubscriber#inform(org.apache.seda.event.DisconnectEvent)
      */
     public void inform( DisconnectEvent an_event )
     {
@@ -296,7 +294,7 @@
     /**
      *  Cancel/Unregister dropped connections since the last call to select.
      * 
-     * @see created in response to a <a href=
+     * @see <a href=
      * "http://nagoya.apache.org/jira/secure/ViewIssue.jspa?id=13574">JIRA Issue
      * </a>
      */
@@ -379,9 +377,8 @@
                 try
                 {
                     l_buf = m_bp.getBuffer( this ) ;
-                    int l_count = 0 ;
-                    
-                    if ( ( l_count = l_channel.read( l_buf ) ) == -1 )
+
+                    if ( l_channel.read( l_buf ) == -1 )
                     {
                         l_channel.socket().close() ;
                         l_channel.close() ;

Modified: incubator/directory/seda/trunk/impl/src/java/org/apache/eve/input/InputManagerMonitorAdapter.java
==============================================================================
--- incubator/directory/seda/trunk/impl/src/java/org/apache/eve/input/InputManagerMonitorAdapter.java
(original)
+++ incubator/directory/seda/trunk/impl/src/java/org/apache/eve/input/InputManagerMonitorAdapter.java
Sun Sep  5 21:07:49 2004
@@ -26,10 +26,11 @@
 
 import org.apache.commons.lang.exception.ExceptionUtils ;
 
-import org.apache.eve.ResourceException ;
-import org.apache.eve.buffer.BufferPool ;
-import org.apache.eve.listener.ClientKey ;
-import org.apache.eve.listener.KeyExpiryException ;
+import org.apache.seda.ResourceException ;
+import org.apache.seda.input.InputManagerMonitor;
+import org.apache.seda.buffer.BufferPool ;
+import org.apache.seda.listener.ClientKey ;
+import org.apache.seda.listener.KeyExpiryException ;
 
 
 /**
@@ -42,8 +43,8 @@
 public class InputManagerMonitorAdapter implements InputManagerMonitor
 {
     /* (non-Javadoc)
-     * @see org.apache.eve.input.InputManagerMonitor#
-     * disconnectedClient(org.apache.eve.listener.ClientKey)
+     * @see org.apache.seda.input.InputManagerMonitor#
+     * disconnectedClient(org.apache.seda.listener.ClientKey)
      */
     public void disconnectedClient( ClientKey key )
     {
@@ -51,8 +52,8 @@
     
 
     /* (non-Javadoc)
-     * @see org.apache.eve.input.InputManagerMonitor#
-     * registeredChannel(org.apache.eve.listener.ClientKey, 
+     * @see org.apache.seda.input.InputManagerMonitor#
+     * registeredChannel(org.apache.seda.listener.ClientKey,
      * java.nio.channels.Selector)
      */
     public void registeredChannel( ClientKey key, Selector selector )
@@ -61,7 +62,7 @@
 
     
     /* (non-Javadoc)
-     * @see org.apache.eve.input.InputManagerMonitor#
+     * @see org.apache.seda.input.InputManagerMonitor#
      * selectorReturned(java.nio.channels.Selector)
      */
     public void selectorReturned( Selector selector )
@@ -70,8 +71,8 @@
 
     
     /* (non-Javadoc)
-     * @see org.apache.eve.input.InputManagerMonitor#
-     * inputRecieved(org.apache.eve.listener.ClientKey)
+     * @see org.apache.seda.input.InputManagerMonitor#
+     * inputRecieved(org.apache.seda.listener.ClientKey)
      */
     public void inputRecieved( ClientKey key )
     {
@@ -79,7 +80,7 @@
 
     
     /* (non-Javadoc)
-     * @see org.apache.eve.input.InputManagerMonitor#
+     * @see org.apache.seda.input.InputManagerMonitor#
      * selectFailure(java.nio.channels.Selector, java.io.IOException)
      */
     public void selectFailure( Selector selector, IOException fault )
@@ -89,9 +90,9 @@
 
     
     /* (non-Javadoc)
-     * @see org.apache.eve.input.InputManagerMonitor#keyExpiryFailure(
-     * org.apache.eve.listener.ClientKey, 
-     * org.apache.eve.listener.KeyExpiryException)
+     * @see org.apache.seda.input.InputManagerMonitor#keyExpiryFailure(
+     * org.apache.seda.listener.ClientKey,
+     * org.apache.seda.listener.KeyExpiryException)
      */
     public void keyExpiryFailure( ClientKey key, KeyExpiryException fault )
     {
@@ -100,8 +101,8 @@
 
     
     /* (non-Javadoc)
-     * @see org.apache.eve.input.InputManagerMonitor#
-     * readFailed(org.apache.eve.listener.ClientKey, java.io.IOException)
+     * @see org.apache.seda.input.InputManagerMonitor#
+     * readFailed(org.apache.seda.listener.ClientKey, java.io.IOException)
      */
     public void readFailed( ClientKey key, IOException fault ) 
     {
@@ -110,9 +111,9 @@
     
 
     /* (non-Javadoc)
-     * @see org.apache.eve.input.InputManagerMonitor#
-     * bufferUnavailable(org.apache.eve.buffer.BufferPool, 
-     * org.apache.eve.ResourceException)
+     * @see org.apache.seda.input.InputManagerMonitor#
+     * bufferUnavailable(org.apache.seda.buffer.BufferPool,
+     * org.apache.seda.ResourceException)
      */
     public void bufferUnavailable( BufferPool bp, ResourceException fault )
     {
@@ -121,7 +122,7 @@
 
     
     /* (non-Javadoc)
-     * @see org.apache.eve.input.InputManagerMonitor#
+     * @see org.apache.seda.input.InputManagerMonitor#
      * channelRegistrationFailure(java.nio.channels.Selector, 
      * java.nio.channels.SocketChannel, int, java.io.IOException)
      */
@@ -133,7 +134,7 @@
 
     
     /* (non-Javadoc)
-     * @see org.apache.eve.input.InputManagerMonitor#
+     * @see org.apache.seda.input.InputManagerMonitor#
      * channelCloseFailure(java.nio.channels.SocketChannel, java.io.IOException)
      */
     public void channelCloseFailure( SocketChannel channel, 
@@ -144,7 +145,7 @@
     
     
     /* (non-Javadoc)
-     * @see org.apache.eve.input.InputManagerMonitor#enteringSelect(
+     * @see org.apache.seda.input.InputManagerMonitor#enteringSelect(
      * java.nio.channels.Selector)
      */
     public void enteringSelect( Selector selector )
@@ -153,7 +154,7 @@
 
     
     /* (non-Javadoc)
-     * @see org.apache.eve.input.InputManagerMonitor#selectTimedOut(
+     * @see org.apache.seda.input.InputManagerMonitor#selectTimedOut(
      * java.nio.channels.Selector)
      */
     public void selectTimedOut( Selector selector )
@@ -162,8 +163,8 @@
     
     
     /* (non-Javadoc)
-     * @see org.apache.eve.input.InputManagerMonitor#inputRecieved(
-     * java.nio.ByteBuffer, org.apache.eve.listener.ClientKey)
+     * @see org.apache.seda.input.InputManagerMonitor#inputRecieved(
+     * java.nio.ByteBuffer, org.apache.seda.listener.ClientKey)
      */
     public void inputRecieved( ByteBuffer buffer, ClientKey key )
     {
@@ -171,7 +172,7 @@
     
     
     /* (non-Javadoc)
-     * @see org.apache.eve.input.InputManagerMonitor#cleanedStaleKey(
+     * @see org.apache.seda.input.InputManagerMonitor#cleanedStaleKey(
      * java.nio.channels.SelectionKey)
      */
     public void cleanedStaleKey( SelectionKey key )

Modified: incubator/directory/seda/trunk/impl/src/java/org/apache/eve/listener/DefaultListenerManager.java
==============================================================================
--- incubator/directory/seda/trunk/impl/src/java/org/apache/eve/listener/DefaultListenerManager.java
(original)
+++ incubator/directory/seda/trunk/impl/src/java/org/apache/eve/listener/DefaultListenerManager.java
Sun Sep  5 21:07:49 2004
@@ -33,10 +33,13 @@
 import java.nio.channels.SocketChannel ;
 import java.nio.channels.ServerSocketChannel ;
 
-import org.apache.eve.event.EventRouter ;
-import org.apache.eve.event.ConnectEvent ;
-import org.apache.eve.event.DisconnectEvent ;
-import org.apache.eve.event.DisconnectSubscriber ;
+import org.apache.seda.event.EventRouter ;
+import org.apache.seda.event.ConnectEvent ;
+import org.apache.seda.event.DisconnectEvent ;
+import org.apache.seda.event.DisconnectSubscriber ;
+import org.apache.seda.listener.ListenerManager;
+import org.apache.seda.listener.ListenerManagerMonitor;
+import org.apache.seda.listener.InetServiceListenerConfig;
 
 
 /**
@@ -118,9 +121,9 @@
 
 
     /**
-     * @see org.apache.eve.listener.ListenerManager#bind(ServerListener)
+     * @see org.apache.seda.listener.ListenerManager#bind(InetServiceListenerConfig)
      */
-    public void bind( ServerListener listener ) throws IOException
+    public void bind( InetServiceListenerConfig listener ) throws IOException
     {
         synchronized ( bindListeners )
         {
@@ -132,9 +135,9 @@
     
     
     /**
-     * @see org.apache.eve.listener.ListenerManager#unbind(ServerListener)
+     * @see org.apache.seda.listener.ListenerManager#unbind(InetServiceListenerConfig)
      */
-    public void unbind( ServerListener listener ) throws IOException
+    public void unbind( InetServiceListenerConfig listener ) throws IOException
     {
         synchronized ( unbindListeners )
         {
@@ -157,7 +160,8 @@
             Iterator list = bindListeners.iterator() ;
             while ( list.hasNext() )
             {
-                ServerListener listener = ( ServerListener ) list.next() ;
+                InetServiceListenerConfig listener =
+                        ( InetServiceListenerConfig ) list.next() ;
                     
                 try
                 {
@@ -203,7 +207,8 @@
             while ( keys.hasNext() )
             {
                 key = ( SelectionKey ) keys.next() ;
-                ServerListener listener = ( ServerListener ) key.attachment() ;
+                InetServiceListenerConfig listener =
+                        ( InetServiceListenerConfig ) key.attachment() ;
     
                 if ( unbindListeners.contains( listener ) )
                 {    
@@ -258,7 +263,7 @@
     
     /*
      *  (non-Javadoc)
-     * @see org.apache.eve.event.Subscriber#inform(java.util.EventObject)
+     * @see org.apache.seda.event.Subscriber#inform(java.util.EventObject)
      */
     public void inform( EventObject event )
     {

Modified: incubator/directory/seda/trunk/impl/src/java/org/apache/eve/listener/DefaultServerListener.java
==============================================================================
--- incubator/directory/seda/trunk/impl/src/java/org/apache/eve/listener/DefaultServerListener.java
(original)
+++ incubator/directory/seda/trunk/impl/src/java/org/apache/eve/listener/DefaultServerListener.java
Sun Sep  5 21:07:49 2004
@@ -17,7 +17,8 @@
 package org.apache.eve.listener;
 
 
-import org.apache.eve.protocol.InetServiceEntry;
+import org.apache.seda.protocol.InetServiceEntry;
+import org.apache.seda.listener.InetServiceListenerConfig;
 
 
 /**
@@ -27,7 +28,7 @@
  * @author $LastChangedBy$
  * @version $LastChangedRevision$
  */
-public class DefaultServerListener implements ServerListener
+public class DefaultServerListener implements InetServiceListenerConfig
 {
     /** the connection backlog */
     private int backlog;

Modified: incubator/directory/seda/trunk/impl/src/java/org/apache/eve/output/DefaultOutputManager.java
==============================================================================
--- incubator/directory/seda/trunk/impl/src/java/org/apache/eve/output/DefaultOutputManager.java
(original)
+++ incubator/directory/seda/trunk/impl/src/java/org/apache/eve/output/DefaultOutputManager.java
Sun Sep  5 21:07:49 2004
@@ -26,23 +26,27 @@
 import java.util.HashMap ;
 import java.util.EventObject ;
 
-import org.apache.eve.event.EventRouter ;
-import org.apache.eve.event.OutputEvent ;
-import org.apache.eve.seda.DefaultStage ;
-import org.apache.eve.seda.StageHandler ;
-import org.apache.eve.listener.ClientKey ;
-import org.apache.eve.event.ConnectEvent ;
-import org.apache.eve.output.OutputManager ;
-import org.apache.eve.output.OutputMonitor ;
-import org.apache.eve.event.DisconnectEvent ;
-import org.apache.eve.event.OutputSubscriber ;
-import org.apache.eve.event.ConnectSubscriber ;
-import org.apache.eve.seda.DefaultStageConfig ;
-import org.apache.eve.event.AbstractSubscriber ;
-import org.apache.eve.seda.LoggingStageMonitor ;
-import org.apache.eve.event.DisconnectSubscriber ;
-import org.apache.eve.output.LoggingOutputMonitor ;
-import org.apache.eve.listener.KeyExpiryException ;
+import org.apache.seda.event.EventRouter ;
+import org.apache.seda.event.OutputEvent ;
+import org.apache.seda.stage.DefaultStage ;
+import org.apache.seda.stage.StageHandler ;
+import org.apache.seda.listener.ClientKey ;
+import org.apache.seda.event.ConnectEvent ;
+import org.apache.seda.output.OutputManager ;
+import org.apache.seda.output.OutputMonitor ;
+import org.apache.seda.event.DisconnectEvent ;
+import org.apache.seda.event.OutputSubscriber ;
+import org.apache.seda.event.ConnectSubscriber ;
+import org.apache.seda.stage.DefaultStageConfig ;
+import org.apache.seda.event.AbstractSubscriber ;
+import org.apache.seda.stage.LoggingStageMonitor ;
+import org.apache.seda.event.DisconnectSubscriber ;
+import org.apache.seda.output.LoggingOutputMonitor ;
+import org.apache.seda.listener.KeyExpiryException ;
+import org.apache.eve.seda.DefaultStageConfig;
+import org.apache.eve.seda.LoggingStageMonitor;
+import org.apache.eve.seda.DefaultStage;
+import org.apache.eve.event.AbstractSubscriber;
 
 
 /**
@@ -52,7 +56,7 @@
  * Apache Directory Project</a>
  * @version $Rev$
  */
-public class DefaultOutputManager extends DefaultStage 
+public class DefaultOutputManager extends DefaultStage
     implements 
     OutputManager, 
     OutputSubscriber, 
@@ -97,7 +101,7 @@
     
     
     /* 
-     * @see org.apache.eve.event.Subscriber#inform(java.util.EventObject)
+     * @see org.apache.seda.event.Subscriber#inform(java.util.EventObject)
      */
     public void inform( EventObject event )
     {
@@ -113,8 +117,8 @@
     
     
     /*
-     * @see org.apache.eve.event.OutputSubscriber#inform(
-     * org.apache.eve.event.OutputEvent)
+     * @see org.apache.seda.event.OutputSubscriber#inform(
+     * org.apache.seda.event.OutputEvent)
      */
     public void inform( OutputEvent event )
     {
@@ -123,8 +127,8 @@
     
     
     /* (non-Javadoc)
-     * @see org.apache.eve.event.ConnectSubscriber#inform(
-     * org.apache.eve.event.ConnectEvent)
+     * @see org.apache.seda.event.ConnectSubscriber#inform(
+     * org.apache.seda.event.ConnectEvent)
      */
     public void inform( ConnectEvent event )
     {
@@ -144,8 +148,8 @@
     
     
     /* (non-Javadoc)
-     * @see org.apache.eve.event.DisconnectSubscriber#inform(
-     * org.apache.eve.event.DisconnectEvent)
+     * @see org.apache.seda.event.DisconnectSubscriber#inform(
+     * org.apache.seda.event.DisconnectEvent)
      */
     public void inform( DisconnectEvent event )
     {
@@ -161,8 +165,8 @@
     
     /*
      *  (non-Javadoc)
-     * @see org.apache.eve.output.OutputManager#write(
-     * org.apache.eve.listener.ClientKey, java.nio.ByteBuffer)
+     * @see org.apache.seda.output.OutputManager#write(
+     * org.apache.seda.listener.ClientKey, java.nio.ByteBuffer)
      */
     public void write( ClientKey key, ByteBuffer buf )
         throws IOException

Modified: incubator/directory/seda/trunk/impl/src/java/org/apache/eve/output/LoggingOutputMonitor.java
==============================================================================
--- incubator/directory/seda/trunk/impl/src/java/org/apache/eve/output/LoggingOutputMonitor.java
(original)
+++ incubator/directory/seda/trunk/impl/src/java/org/apache/eve/output/LoggingOutputMonitor.java
Sun Sep  5 21:07:49 2004
@@ -23,10 +23,12 @@
 import org.apache.commons.logging.LogFactory ;
 import org.apache.commons.lang.exception.ExceptionUtils ;
 
-import org.apache.eve.event.ConnectEvent ;
-import org.apache.eve.listener.ClientKey ;
-import org.apache.eve.event.DisconnectEvent ;
-import org.apache.eve.listener.KeyExpiryException ;
+import org.apache.seda.event.ConnectEvent ;
+import org.apache.seda.listener.ClientKey ;
+import org.apache.seda.event.DisconnectEvent ;
+import org.apache.seda.listener.KeyExpiryException ;
+import org.apache.seda.output.OutputMonitor;
+import org.apache.seda.output.OutputManager;
 
 
 /**
@@ -42,11 +44,11 @@
 
     
     /* (non-Javadoc)
-     * @see org.apache.eve.output.OutputMonitor#failedOnWrite(
-     * org.apache.eve.output.OutputManager, org.apache.eve.listener.ClientKey, 
+     * @see org.apache.seda.output.OutputMonitor#failedOnWrite(
+     * org.apache.seda.output.OutputManager, org.apache.seda.listener.ClientKey,
      * java.lang.Throwable)
      */
-    public void failedOnWrite( OutputManager manager, ClientKey key, 
+    public void failedOnWrite( OutputManager manager, ClientKey key,
                                Throwable t )
     {
         if ( log.isErrorEnabled() )
@@ -59,8 +61,8 @@
 
 
     /* (non-Javadoc)
-     * @see org.apache.eve.output.OutputMonitor#writeOccurred(
-     * org.apache.eve.output.OutputManager, org.apache.eve.listener.ClientKey)
+     * @see org.apache.seda.output.OutputMonitor#writeOccurred(
+     * org.apache.seda.output.OutputManager, org.apache.seda.listener.ClientKey)
      */
     public void writeOccurred( OutputManager manager, ClientKey key )
     {
@@ -72,8 +74,8 @@
 
     
     /* (non-Javadoc)
-     * @see org.apache.eve.output.OutputMonitor#writeLockAcquired(
-     * org.apache.eve.output.OutputManager, org.apache.eve.listener.ClientKey)
+     * @see org.apache.seda.output.OutputMonitor#writeLockAcquired(
+     * org.apache.seda.output.OutputManager, org.apache.seda.listener.ClientKey)
      */
     public void writeLockAcquired( OutputManager manager, ClientKey key )
     {
@@ -85,8 +87,8 @@
 
     
     /* (non-Javadoc)
-     * @see org.apache.eve.output.OutputMonitor#channelMissing(
-     * org.apache.eve.output.OutputManager, org.apache.eve.listener.ClientKey)
+     * @see org.apache.seda.output.OutputMonitor#channelMissing(
+     * org.apache.seda.output.OutputManager, org.apache.seda.listener.ClientKey)
      */
     public void channelMissing( OutputManager manager, ClientKey key )
     {
@@ -98,9 +100,9 @@
 
     
     /* (non-Javadoc)
-     * @see org.apache.eve.output.OutputMonitor#keyExpired(
-     * org.apache.eve.output.OutputManager, org.apache.eve.listener.ClientKey, 
-     * org.apache.eve.listener.KeyExpiryException)
+     * @see org.apache.seda.output.OutputMonitor#keyExpired(
+     * org.apache.seda.output.OutputManager, org.apache.seda.listener.ClientKey,
+     * org.apache.seda.listener.KeyExpiryException)
      */
     public void keyExpired( OutputManager manager, ClientKey key,
 							KeyExpiryException e )
@@ -114,8 +116,8 @@
 
     
     /* (non-Javadoc)
-     * @see org.apache.eve.output.OutputMonitor#failedOnInform(
-     * org.apache.eve.output.OutputManager, java.util.EventObject, 
+     * @see org.apache.seda.output.OutputMonitor#failedOnInform(
+     * org.apache.seda.output.OutputManager, java.util.EventObject,
      * java.lang.Throwable)
      */
     public void failedOnInform( OutputManager manager, EventObject event,
@@ -129,8 +131,8 @@
 
     
     /* (non-Javadoc)
-     * @see org.apache.eve.output.OutputMonitor#addedClient(
-     * org.apache.eve.output.OutputManager, org.apache.eve.event.ConnectEvent)
+     * @see org.apache.seda.output.OutputMonitor#addedClient(
+     * org.apache.seda.output.OutputManager, org.apache.seda.event.ConnectEvent)
      */
     public void addedClient( OutputManager manager, ConnectEvent event )
     {
@@ -142,9 +144,9 @@
 
     
     /* (non-Javadoc)
-     * @see org.apache.eve.output.OutputMonitor#removedClient(
-     * org.apache.eve.output.OutputManager, 
-     * org.apache.eve.event.DisconnectEvent)
+     * @see org.apache.seda.output.OutputMonitor#removedClient(
+     * org.apache.seda.output.OutputManager,
+     * org.apache.seda.event.DisconnectEvent)
      */
     public void removedClient( OutputManager manager, DisconnectEvent event )
     {

Modified: incubator/directory/seda/trunk/impl/src/java/org/apache/eve/output/OutputMonitorAdapter.java
==============================================================================
--- incubator/directory/seda/trunk/impl/src/java/org/apache/eve/output/OutputMonitorAdapter.java
(original)
+++ incubator/directory/seda/trunk/impl/src/java/org/apache/eve/output/OutputMonitorAdapter.java
Sun Sep  5 21:07:49 2004
@@ -21,10 +21,12 @@
 
 import org.apache.commons.lang.exception.ExceptionUtils ;
 
-import org.apache.eve.event.ConnectEvent ;
-import org.apache.eve.listener.ClientKey ;
-import org.apache.eve.event.DisconnectEvent ;
-import org.apache.eve.listener.KeyExpiryException ;
+import org.apache.seda.event.ConnectEvent ;
+import org.apache.seda.listener.ClientKey ;
+import org.apache.seda.event.DisconnectEvent ;
+import org.apache.seda.listener.KeyExpiryException ;
+import org.apache.seda.output.OutputMonitor;
+import org.apache.seda.output.OutputManager;
 
 
 /**
@@ -39,11 +41,11 @@
 {
 
     /* (non-Javadoc)
-     * @see org.apache.eve.output.OutputMonitor#
-     * failedOnWrite(org.apache.eve.output.OutputManager, 
-     * org.apache.eve.listener.ClientKey, java.lang.Throwable)
+     * @see org.apache.seda.output.OutputMonitor#
+     * failedOnWrite(org.apache.seda.output.OutputManager,
+     * org.apache.seda.listener.ClientKey, java.lang.Throwable)
      */
-    public void failedOnWrite( OutputManager manager, ClientKey key, 
+    public void failedOnWrite( OutputManager manager, ClientKey key,
                                Throwable t )
     {
         System.err.println( "Failed on write to client " + key + ":\n" 
@@ -52,8 +54,8 @@
 
     
     /* (non-Javadoc)
-     * @see org.apache.eve.output.OutputMonitor#writeOccurred(
-     * org.apache.eve.output.OutputManager, org.apache.eve.listener.ClientKey)
+     * @see org.apache.seda.output.OutputMonitor#writeOccurred(
+     * org.apache.seda.output.OutputManager, org.apache.seda.listener.ClientKey)
      */
     public void writeOccurred( OutputManager manager, ClientKey key )
     {
@@ -61,8 +63,8 @@
 
     
     /* (non-Javadoc)
-     * @see org.apache.eve.output.OutputMonitor#writeLockAcquired(
-     * org.apache.eve.output.OutputManager, org.apache.eve.listener.ClientKey)
+     * @see org.apache.seda.output.OutputMonitor#writeLockAcquired(
+     * org.apache.seda.output.OutputManager, org.apache.seda.listener.ClientKey)
      */
     public void writeLockAcquired( OutputManager manager, ClientKey key )
     {
@@ -70,8 +72,8 @@
 
     
     /* (non-Javadoc)
-     * @see org.apache.eve.output.OutputMonitor#channelMissing(
-     * org.apache.eve.output.OutputManager, org.apache.eve.listener.ClientKey)
+     * @see org.apache.seda.output.OutputMonitor#channelMissing(
+     * org.apache.seda.output.OutputManager, org.apache.seda.listener.ClientKey)
      */
     public void channelMissing( OutputManager manager, ClientKey key )
     {
@@ -80,9 +82,9 @@
 
     
     /* (non-Javadoc)
-     * @see org.apache.eve.output.OutputMonitor#keyExpired(
-     * org.apache.eve.output.OutputManager, 
-     * org.apache.eve.listener.KeyExpiryException)
+     * @see org.apache.seda.output.OutputMonitor#keyExpired(
+     * org.apache.seda.output.OutputManager,
+     * org.apache.seda.listener.KeyExpiryException)
      */
     public void keyExpired( OutputManager manager, ClientKey key, 
                             KeyExpiryException e )
@@ -93,8 +95,8 @@
 
 
     /* (non-Javadoc)
-     * @see org.apache.eve.output.OutputMonitor#failedOnInform(
-     * org.apache.eve.output.OutputManager, java.util.EventObject, 
+     * @see org.apache.seda.output.OutputMonitor#failedOnInform(
+     * org.apache.seda.output.OutputManager, java.util.EventObject,
      * java.lang.Throwable)
      */
     public void failedOnInform( OutputManager manager, EventObject event,
@@ -106,8 +108,8 @@
 
     
     /* (non-Javadoc)
-     * @see org.apache.eve.output.OutputMonitor#addedClient(
-     * org.apache.eve.output.OutputManager, org.apache.eve.event.ConnectEvent)
+     * @see org.apache.seda.output.OutputMonitor#addedClient(
+     * org.apache.seda.output.OutputManager, org.apache.seda.event.ConnectEvent)
      */
     public void addedClient( OutputManager manager, ConnectEvent event )
     {
@@ -115,9 +117,9 @@
 
     
     /* (non-Javadoc)
-     * @see org.apache.eve.output.OutputMonitor#removedClient(
-     * org.apache.eve.output.OutputManager, 
-     * org.apache.eve.event.DisconnectEvent)
+     * @see org.apache.seda.output.OutputMonitor#removedClient(
+     * org.apache.seda.output.OutputManager,
+     * org.apache.seda.event.DisconnectEvent)
      */
     public void removedClient( OutputManager manager, DisconnectEvent event )
     {

Modified: incubator/directory/seda/trunk/impl/src/java/org/apache/eve/seda/DefaultStage.java
==============================================================================
--- incubator/directory/seda/trunk/impl/src/java/org/apache/eve/seda/DefaultStage.java	(original)
+++ incubator/directory/seda/trunk/impl/src/java/org/apache/eve/seda/DefaultStage.java	Sun
Sep  5 21:07:49 2004
@@ -17,6 +17,11 @@
 package org.apache.eve.seda ;
 
 
+import org.apache.seda.stage.Stage;
+import org.apache.seda.stage.StageConfig;
+import org.apache.seda.stage.StageMonitor;
+import org.apache.seda.stage.EnqueuePredicate;
+
 import java.util.Set ;
 import java.util.HashSet ;
 import java.util.LinkedList ;
@@ -76,8 +81,8 @@
 
 
     /**
-     * @see org.apache.eve.seda.Stage#addPredicate(
-     *          org.apache.eve.seda.EnqueuePredicate)
+     * @see org.apache.seda.stage.Stage#addPredicate(
+     *          org.apache.seda.stage.EnqueuePredicate)
      * addPredicate(org.apache.eve.seda.EnqueuePredicate)
      */
     public void addPredicate( EnqueuePredicate predicate )
@@ -88,7 +93,7 @@
     
     
     /**
-     * @see org.apache.eve.seda.Stage#getConfig()
+     * @see org.apache.seda.stage.Stage#getConfig()
      */
     public StageConfig getConfig()
     {
@@ -101,7 +106,7 @@
      * predicates permit the operation and the stage has started.  The event
      * enqueue is rejected if the stage has not started.
      *
-     * @see org.apache.eve.seda.Stage#enqueue(java.util.EventObject)
+     * @see org.apache.seda.stage.Stage#enqueue(java.util.EventObject)
      */
     public void enqueue( final EventObject event )
     {

Mime
View raw message