svn commit: rev 54585 - in incubator/directory/seda/branches/trustin_api_redesign/src: java/org/apache/seda java/org/apache/seda/decoder java/org/apache/seda/encoder java/org/apache/seda/impl java/org/apache/seda/input java/org/apache/seda/listener java/org/apache/seda/output java/org/apache/seda/protocol java/org/apache/seda/session java/org/apache/seda/stage java/org/apache/seda/stage/decode java/org/apache/seda/stage/encode java/org/apache/seda/stage/input java/org/apache/seda/stage/listener java/org/apache/seda/stage/output test/org/apache/seda test/org/apache/seda/decoder test/org/apache/seda/event test/org/apache/seda/listener

[tr...@apache.org]

Author: trustin
Date: Mon Oct 11 06:57:26 2004
New Revision: 54585

Added:
   incubator/directory/seda/branches/trustin_api_redesign/src/java/org/apache/seda/stage/
   incubator/directory/seda/branches/trustin_api_redesign/src/java/org/apache/seda/stage/decode/
      - copied from rev 54504, incubator/directory/seda/branches/trustin_api_redesign/src/java/org/apache/seda/decoder/
   incubator/directory/seda/branches/trustin_api_redesign/src/java/org/apache/seda/stage/decode/ClientDecoder.java
      - copied, changed from rev 54584, incubator/directory/seda/branches/trustin_api_redesign/src/java/org/apache/seda/decoder/ClientDecoder.java
   incubator/directory/seda/branches/trustin_api_redesign/src/java/org/apache/seda/stage/decode/DecodeStageHandler.java
      - copied, changed from rev 54584, incubator/directory/seda/branches/trustin_api_redesign/src/java/org/apache/seda/decoder/DecodeStageHandler.java
   incubator/directory/seda/branches/trustin_api_redesign/src/java/org/apache/seda/stage/decode/DecoderManager.java
      - copied, changed from rev 54584, incubator/directory/seda/branches/trustin_api_redesign/src/java/org/apache/seda/decoder/DecoderManager.java
   incubator/directory/seda/branches/trustin_api_redesign/src/java/org/apache/seda/stage/decode/DecoderManagerMonitor.java
      - copied, changed from rev 54584, incubator/directory/seda/branches/trustin_api_redesign/src/java/org/apache/seda/decoder/DecoderManagerMonitor.java
   incubator/directory/seda/branches/trustin_api_redesign/src/java/org/apache/seda/stage/decode/DecoderManagerMonitorAdapter.java
      - copied, changed from rev 54584, incubator/directory/seda/branches/trustin_api_redesign/src/java/org/apache/seda/decoder/DecoderManagerMonitorAdapter.java
   incubator/directory/seda/branches/trustin_api_redesign/src/java/org/apache/seda/stage/decode/DefaultDecoderManager.java
      - copied, changed from rev 54584, incubator/directory/seda/branches/trustin_api_redesign/src/java/org/apache/seda/decoder/DefaultDecoderManager.java
   incubator/directory/seda/branches/trustin_api_redesign/src/java/org/apache/seda/stage/decode/package.html
      - copied unchanged from rev 54584, incubator/directory/seda/branches/trustin_api_redesign/src/java/org/apache/seda/decoder/package.html
   incubator/directory/seda/branches/trustin_api_redesign/src/java/org/apache/seda/stage/encode/
      - copied from rev 54504, incubator/directory/seda/branches/trustin_api_redesign/src/java/org/apache/seda/encoder/
   incubator/directory/seda/branches/trustin_api_redesign/src/java/org/apache/seda/stage/encode/ClientEncoder.java
      - copied, changed from rev 54584, incubator/directory/seda/branches/trustin_api_redesign/src/java/org/apache/seda/encoder/ClientEncoder.java
   incubator/directory/seda/branches/trustin_api_redesign/src/java/org/apache/seda/stage/encode/DefaultEncoderManager.java
      - copied, changed from rev 54584, incubator/directory/seda/branches/trustin_api_redesign/src/java/org/apache/seda/encoder/DefaultEncoderManager.java
   incubator/directory/seda/branches/trustin_api_redesign/src/java/org/apache/seda/stage/encode/EncodeStageHandler.java
      - copied, changed from rev 54584, incubator/directory/seda/branches/trustin_api_redesign/src/java/org/apache/seda/encoder/EncodeStageHandler.java
   incubator/directory/seda/branches/trustin_api_redesign/src/java/org/apache/seda/stage/encode/EncoderManager.java
      - copied, changed from rev 54584, incubator/directory/seda/branches/trustin_api_redesign/src/java/org/apache/seda/encoder/EncoderManager.java
   incubator/directory/seda/branches/trustin_api_redesign/src/java/org/apache/seda/stage/encode/EncoderManagerMonitor.java
      - copied, changed from rev 54584, incubator/directory/seda/branches/trustin_api_redesign/src/java/org/apache/seda/encoder/EncoderManagerMonitor.java
   incubator/directory/seda/branches/trustin_api_redesign/src/java/org/apache/seda/stage/encode/EncoderManagerMonitorAdapter.java
      - copied, changed from rev 54584, incubator/directory/seda/branches/trustin_api_redesign/src/java/org/apache/seda/encoder/EncoderManagerMonitorAdapter.java
   incubator/directory/seda/branches/trustin_api_redesign/src/java/org/apache/seda/stage/encode/package.html
      - copied unchanged from rev 54584, incubator/directory/seda/branches/trustin_api_redesign/src/java/org/apache/seda/encoder/package.html
   incubator/directory/seda/branches/trustin_api_redesign/src/java/org/apache/seda/stage/input/
      - copied from rev 54504, incubator/directory/seda/branches/trustin_api_redesign/src/java/org/apache/seda/input/
   incubator/directory/seda/branches/trustin_api_redesign/src/java/org/apache/seda/stage/input/InputManager.java
      - copied, changed from rev 54584, incubator/directory/seda/branches/trustin_api_redesign/src/java/org/apache/seda/input/InputManager.java
   incubator/directory/seda/branches/trustin_api_redesign/src/java/org/apache/seda/stage/input/InputManagerMonitor.java
      - copied, changed from rev 54584, incubator/directory/seda/branches/trustin_api_redesign/src/java/org/apache/seda/input/InputManagerMonitor.java
   incubator/directory/seda/branches/trustin_api_redesign/src/java/org/apache/seda/stage/input/InputManagerMonitorAdapter.java
      - copied, changed from rev 54584, incubator/directory/seda/branches/trustin_api_redesign/src/java/org/apache/seda/input/InputManagerMonitorAdapter.java
   incubator/directory/seda/branches/trustin_api_redesign/src/java/org/apache/seda/stage/input/TCPInputManager.java
      - copied, changed from rev 54584, incubator/directory/seda/branches/trustin_api_redesign/src/java/org/apache/seda/input/TCPInputManager.java
   incubator/directory/seda/branches/trustin_api_redesign/src/java/org/apache/seda/stage/input/package.html
      - copied unchanged from rev 54584, incubator/directory/seda/branches/trustin_api_redesign/src/java/org/apache/seda/input/package.html
   incubator/directory/seda/branches/trustin_api_redesign/src/java/org/apache/seda/stage/listener/
      - copied from rev 54504, incubator/directory/seda/branches/trustin_api_redesign/src/java/org/apache/seda/listener/
   incubator/directory/seda/branches/trustin_api_redesign/src/java/org/apache/seda/stage/listener/AvailablePortFinder.java
      - copied, changed from rev 54584, incubator/directory/seda/branches/trustin_api_redesign/src/java/org/apache/seda/listener/AvailablePortFinder.java
   incubator/directory/seda/branches/trustin_api_redesign/src/java/org/apache/seda/stage/listener/ClientKey.java
      - copied, changed from rev 54584, incubator/directory/seda/branches/trustin_api_redesign/src/java/org/apache/seda/listener/ClientKey.java
   incubator/directory/seda/branches/trustin_api_redesign/src/java/org/apache/seda/stage/listener/KeyExpiryException.java
      - copied, changed from rev 54584, incubator/directory/seda/branches/trustin_api_redesign/src/java/org/apache/seda/listener/KeyExpiryException.java
   incubator/directory/seda/branches/trustin_api_redesign/src/java/org/apache/seda/stage/listener/ListenerConfig.java
      - copied, changed from rev 54584, incubator/directory/seda/branches/trustin_api_redesign/src/java/org/apache/seda/listener/ListenerConfig.java
   incubator/directory/seda/branches/trustin_api_redesign/src/java/org/apache/seda/stage/listener/ListenerManager.java
      - copied, changed from rev 54584, incubator/directory/seda/branches/trustin_api_redesign/src/java/org/apache/seda/listener/ListenerManager.java
   incubator/directory/seda/branches/trustin_api_redesign/src/java/org/apache/seda/stage/listener/ListenerManagerMonitor.java
      - copied, changed from rev 54584, incubator/directory/seda/branches/trustin_api_redesign/src/java/org/apache/seda/listener/ListenerManagerMonitor.java
   incubator/directory/seda/branches/trustin_api_redesign/src/java/org/apache/seda/stage/listener/ListenerManagerMonitorAdapter.java
      - copied, changed from rev 54584, incubator/directory/seda/branches/trustin_api_redesign/src/java/org/apache/seda/listener/ListenerManagerMonitorAdapter.java
   incubator/directory/seda/branches/trustin_api_redesign/src/java/org/apache/seda/stage/listener/SocketListenerConfig.java
      - copied, changed from rev 54584, incubator/directory/seda/branches/trustin_api_redesign/src/java/org/apache/seda/listener/SocketListenerConfig.java
   incubator/directory/seda/branches/trustin_api_redesign/src/java/org/apache/seda/stage/listener/TCPListenerConfig.java
      - copied, changed from rev 54584, incubator/directory/seda/branches/trustin_api_redesign/src/java/org/apache/seda/listener/TCPListenerConfig.java
   incubator/directory/seda/branches/trustin_api_redesign/src/java/org/apache/seda/stage/listener/TCPListenerManager.java
      - copied, changed from rev 54584, incubator/directory/seda/branches/trustin_api_redesign/src/java/org/apache/seda/listener/TCPListenerManager.java
   incubator/directory/seda/branches/trustin_api_redesign/src/java/org/apache/seda/stage/listener/UDPListenerConfig.java
      - copied, changed from rev 54584, incubator/directory/seda/branches/trustin_api_redesign/src/java/org/apache/seda/listener/UDPListenerConfig.java
   incubator/directory/seda/branches/trustin_api_redesign/src/java/org/apache/seda/stage/listener/package.html
      - copied unchanged from rev 54584, incubator/directory/seda/branches/trustin_api_redesign/src/java/org/apache/seda/listener/package.html
   incubator/directory/seda/branches/trustin_api_redesign/src/java/org/apache/seda/stage/output/
      - copied from rev 54504, incubator/directory/seda/branches/trustin_api_redesign/src/java/org/apache/seda/output/
   incubator/directory/seda/branches/trustin_api_redesign/src/java/org/apache/seda/stage/output/DefaultOutputManager.java
      - copied, changed from rev 54584, incubator/directory/seda/branches/trustin_api_redesign/src/java/org/apache/seda/output/DefaultOutputManager.java
   incubator/directory/seda/branches/trustin_api_redesign/src/java/org/apache/seda/stage/output/LoggingOutputMonitor.java
      - copied, changed from rev 54584, incubator/directory/seda/branches/trustin_api_redesign/src/java/org/apache/seda/output/LoggingOutputMonitor.java
   incubator/directory/seda/branches/trustin_api_redesign/src/java/org/apache/seda/stage/output/OutputManager.java
      - copied, changed from rev 54584, incubator/directory/seda/branches/trustin_api_redesign/src/java/org/apache/seda/output/OutputManager.java
   incubator/directory/seda/branches/trustin_api_redesign/src/java/org/apache/seda/stage/output/OutputMonitor.java
      - copied, changed from rev 54584, incubator/directory/seda/branches/trustin_api_redesign/src/java/org/apache/seda/output/OutputMonitor.java
   incubator/directory/seda/branches/trustin_api_redesign/src/java/org/apache/seda/stage/output/OutputMonitorAdapter.java
      - copied, changed from rev 54584, incubator/directory/seda/branches/trustin_api_redesign/src/java/org/apache/seda/output/OutputMonitorAdapter.java
   incubator/directory/seda/branches/trustin_api_redesign/src/java/org/apache/seda/stage/output/package.html
      - copied unchanged from rev 54584, incubator/directory/seda/branches/trustin_api_redesign/src/java/org/apache/seda/output/package.html
Removed:
   incubator/directory/seda/branches/trustin_api_redesign/src/java/org/apache/seda/decoder/
   incubator/directory/seda/branches/trustin_api_redesign/src/java/org/apache/seda/encoder/
   incubator/directory/seda/branches/trustin_api_redesign/src/java/org/apache/seda/input/
   incubator/directory/seda/branches/trustin_api_redesign/src/java/org/apache/seda/listener/
   incubator/directory/seda/branches/trustin_api_redesign/src/java/org/apache/seda/output/
Modified:
   incubator/directory/seda/branches/trustin_api_redesign/src/java/org/apache/seda/Subscriber.java
   incubator/directory/seda/branches/trustin_api_redesign/src/java/org/apache/seda/impl/DefaultFrontend.java
   incubator/directory/seda/branches/trustin_api_redesign/src/java/org/apache/seda/impl/DefaultFrontendFactory.java
   incubator/directory/seda/branches/trustin_api_redesign/src/java/org/apache/seda/protocol/RequestProcessorMonitor.java
   incubator/directory/seda/branches/trustin_api_redesign/src/java/org/apache/seda/protocol/RequestProcessorMonitorAdapter.java
   incubator/directory/seda/branches/trustin_api_redesign/src/java/org/apache/seda/session/UdpSession.java
   incubator/directory/seda/branches/trustin_api_redesign/src/test/org/apache/seda/DefaultFrontendFactoryTest.java
   incubator/directory/seda/branches/trustin_api_redesign/src/test/org/apache/seda/ProtocolTestCase.java
   incubator/directory/seda/branches/trustin_api_redesign/src/test/org/apache/seda/decoder/DefaultDecoderManagerTest.java
   incubator/directory/seda/branches/trustin_api_redesign/src/test/org/apache/seda/event/AbstractSubscriberTest.java
   incubator/directory/seda/branches/trustin_api_redesign/src/test/org/apache/seda/listener/AvailablePortFinderTest.java
   incubator/directory/seda/branches/trustin_api_redesign/src/test/org/apache/seda/listener/TCPListenerManagerTest.java
Log:
Moved preset stages (Input/Decode/Encode/Output) to org.apache.seda.stage

Modified: incubator/directory/seda/branches/trustin_api_redesign/src/java/org/apache/seda/Subscriber.java
==============================================================================
--- incubator/directory/seda/branches/trustin_api_redesign/src/java/org/apache/seda/Subscriber.java	(original)
+++ incubator/directory/seda/branches/trustin_api_redesign/src/java/org/apache/seda/Subscriber.java	Mon Oct 11 06:57:26 2004
@@ -22,12 +22,10 @@
 /**
  * A Subscriber from the Event Notifier pattern.
  *
- * @author <a href="mailto:directory-dev@incubator.apache.org">Apache
- *         Directory Project </a>
+ * @author <a href="mailto:directory-dev@incubator.apache.org">Apache Directory
+ *         Project </a>
  * @version $Rev$
- *
- * @see <a
- *      href="http://www.dralasoft.com/products/eventbroker/whitepaper/">Event
+ * @see <a href="http://www.dralasoft.com/products/eventbroker/whitepaper/">Event
  *      Notifier Pattern </a>
  */
 public interface Subscriber extends EventListener {

Modified: incubator/directory/seda/branches/trustin_api_redesign/src/java/org/apache/seda/impl/DefaultFrontend.java
==============================================================================
--- incubator/directory/seda/branches/trustin_api_redesign/src/java/org/apache/seda/impl/DefaultFrontend.java	(original)
+++ incubator/directory/seda/branches/trustin_api_redesign/src/java/org/apache/seda/impl/DefaultFrontend.java	Mon Oct 11 06:57:26 2004
@@ -19,19 +19,19 @@
 import org.apache.seda.EventRouter;
 import org.apache.seda.Frontend;
 import org.apache.seda.buffer.BufferPool;
-import org.apache.seda.decoder.DecoderManager;
-import org.apache.seda.decoder.DefaultDecoderManager;
-import org.apache.seda.encoder.DefaultEncoderManager;
-import org.apache.seda.encoder.EncoderManager;
-import org.apache.seda.input.InputManager;
-import org.apache.seda.input.TCPInputManager;
-import org.apache.seda.listener.ListenerManager;
-import org.apache.seda.listener.TCPListenerManager;
-import org.apache.seda.output.DefaultOutputManager;
-import org.apache.seda.output.OutputManager;
 import org.apache.seda.protocol.InetServicesDatabase;
 import org.apache.seda.protocol.ProtocolProvider;
 import org.apache.seda.protocol.RequestProcessor;
+import org.apache.seda.stage.decode.DecoderManager;
+import org.apache.seda.stage.decode.DefaultDecoderManager;
+import org.apache.seda.stage.encode.DefaultEncoderManager;
+import org.apache.seda.stage.encode.EncoderManager;
+import org.apache.seda.stage.input.InputManager;
+import org.apache.seda.stage.input.TCPInputManager;
+import org.apache.seda.stage.listener.ListenerManager;
+import org.apache.seda.stage.listener.TCPListenerManager;
+import org.apache.seda.stage.output.DefaultOutputManager;
+import org.apache.seda.stage.output.OutputManager;
 
 
 /**

Modified: incubator/directory/seda/branches/trustin_api_redesign/src/java/org/apache/seda/impl/DefaultFrontendFactory.java
==============================================================================
--- incubator/directory/seda/branches/trustin_api_redesign/src/java/org/apache/seda/impl/DefaultFrontendFactory.java	(original)
+++ incubator/directory/seda/branches/trustin_api_redesign/src/java/org/apache/seda/impl/DefaultFrontendFactory.java	Mon Oct 11 06:57:26 2004
@@ -27,22 +27,22 @@
 import org.apache.seda.buffer.DefaultBufferPool;
 import org.apache.seda.buffer.DefaultBufferPoolConfig;
 import org.apache.seda.buffer.LoggingBufferMonitor;
-import org.apache.seda.decoder.DecodeStageHandler;
-import org.apache.seda.decoder.DecoderManager;
-import org.apache.seda.decoder.DefaultDecoderManager;
-import org.apache.seda.encoder.DefaultEncoderManager;
-import org.apache.seda.encoder.EncodeStageHandler;
-import org.apache.seda.encoder.EncoderManager;
-import org.apache.seda.input.InputManager;
-import org.apache.seda.input.TCPInputManager;
-import org.apache.seda.listener.ListenerManager;
-import org.apache.seda.listener.TCPListenerManager;
-import org.apache.seda.output.DefaultOutputManager;
-import org.apache.seda.output.OutputManager;
 import org.apache.seda.protocol.DefaultInetServicesDatabase;
 import org.apache.seda.protocol.InetServiceEntry;
 import org.apache.seda.protocol.InetServicesDatabase;
 import org.apache.seda.protocol.RequestProcessor;
+import org.apache.seda.stage.decode.DecodeStageHandler;
+import org.apache.seda.stage.decode.DecoderManager;
+import org.apache.seda.stage.decode.DefaultDecoderManager;
+import org.apache.seda.stage.encode.DefaultEncoderManager;
+import org.apache.seda.stage.encode.EncodeStageHandler;
+import org.apache.seda.stage.encode.EncoderManager;
+import org.apache.seda.stage.input.InputManager;
+import org.apache.seda.stage.input.TCPInputManager;
+import org.apache.seda.stage.listener.ListenerManager;
+import org.apache.seda.stage.listener.TCPListenerManager;
+import org.apache.seda.stage.output.DefaultOutputManager;
+import org.apache.seda.stage.output.OutputManager;
 import org.apache.seda.thread.ThreadPool;
 
 import java.io.IOException;

Modified: incubator/directory/seda/branches/trustin_api_redesign/src/java/org/apache/seda/protocol/RequestProcessorMonitor.java
==============================================================================
--- incubator/directory/seda/branches/trustin_api_redesign/src/java/org/apache/seda/protocol/RequestProcessorMonitor.java	(original)
+++ incubator/directory/seda/branches/trustin_api_redesign/src/java/org/apache/seda/protocol/RequestProcessorMonitor.java	Mon Oct 11 06:57:26 2004
@@ -17,8 +17,8 @@
 package org.apache.seda.protocol;
 
 import org.apache.seda.Subscriber;
-import org.apache.seda.listener.ClientKey;
-import org.apache.seda.listener.KeyExpiryException;
+import org.apache.seda.stage.listener.ClientKey;
+import org.apache.seda.stage.listener.KeyExpiryException;
 
 import java.util.EventObject;
 

Modified: incubator/directory/seda/branches/trustin_api_redesign/src/java/org/apache/seda/protocol/RequestProcessorMonitorAdapter.java
==============================================================================
--- incubator/directory/seda/branches/trustin_api_redesign/src/java/org/apache/seda/protocol/RequestProcessorMonitorAdapter.java	(original)
+++ incubator/directory/seda/branches/trustin_api_redesign/src/java/org/apache/seda/protocol/RequestProcessorMonitorAdapter.java	Mon Oct 11 06:57:26 2004
@@ -17,8 +17,8 @@
 package org.apache.seda.protocol;
 
 import org.apache.seda.Subscriber;
-import org.apache.seda.listener.ClientKey;
-import org.apache.seda.listener.KeyExpiryException;
+import org.apache.seda.stage.listener.ClientKey;
+import org.apache.seda.stage.listener.KeyExpiryException;
 
 import java.util.EventObject;
 

Modified: incubator/directory/seda/branches/trustin_api_redesign/src/java/org/apache/seda/session/UdpSession.java
==============================================================================
--- incubator/directory/seda/branches/trustin_api_redesign/src/java/org/apache/seda/session/UdpSession.java	(original)
+++ incubator/directory/seda/branches/trustin_api_redesign/src/java/org/apache/seda/session/UdpSession.java	Mon Oct 11 06:57:26 2004
@@ -1,30 +1,48 @@
 /*
+ *   Copyright 2004 The Apache Software Foundation
+ *
+ *   Licensed under the Apache License, Version 2.0 (the "License");
+ *   you may not use this file except in compliance with the License.
+ *   You may obtain a copy of the License at
+ *
+ *       http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *   Unless required by applicable law or agreed to in writing, software
+ *   distributed under the License is distributed on an "AS IS" BASIS,
+ *   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *   See the License for the specific language governing permissions and
+ *   limitations under the License.
+ *
+ */
+/*
  * @(#) $Id$
  */
 package org.apache.seda.session;
 
 import java.nio.channels.DatagramChannel;
 
+
 /**
  * Represents UDP/IP communication session.
- * 
+ *
  * @author Trustin Lee (trustin@gmail.com)
  * @version $Rev$, $Date$
  */
 public class UdpSession extends AbstractSession implements ByteIoSession,
-        StatelessSession {
-    
+                                                           StatelessSession {
     private final DatagramChannel channel;
 
     /**
      * Creates a new instance with the specified channel.
      */
     public UdpSession(DatagramChannel channel) {
-        if (channel == null)
+        if (channel == null) {
             throw new NullPointerException();
+        }
+
         this.channel = channel;
     }
-    
+
     public DatagramChannel getChannel() {
         return channel;
     }

Copied: incubator/directory/seda/branches/trustin_api_redesign/src/java/org/apache/seda/stage/decode/ClientDecoder.java (from rev 54584, incubator/directory/seda/branches/trustin_api_redesign/src/java/org/apache/seda/decoder/ClientDecoder.java)
==============================================================================
--- incubator/directory/seda/branches/trustin_api_redesign/src/java/org/apache/seda/decoder/ClientDecoder.java	(original)
+++ incubator/directory/seda/branches/trustin_api_redesign/src/java/org/apache/seda/stage/decode/ClientDecoder.java	Mon Oct 11 06:57:26 2004
@@ -14,14 +14,14 @@
  *   limitations under the License.
  *
  */
-package org.apache.seda.decoder;
+package org.apache.seda.stage.decode;
 
 import org.apache.commons.codec.DecoderException;
 import org.apache.commons.codec.stateful.DecoderCallback;
 import org.apache.commons.codec.stateful.DecoderMonitor;
 import org.apache.commons.codec.stateful.StatefulDecoder;
 
-import org.apache.seda.listener.ClientKey;
+import org.apache.seda.stage.listener.ClientKey;
 
 
 /**

Copied: incubator/directory/seda/branches/trustin_api_redesign/src/java/org/apache/seda/stage/decode/DecodeStageHandler.java (from rev 54584, incubator/directory/seda/branches/trustin_api_redesign/src/java/org/apache/seda/decoder/DecodeStageHandler.java)
==============================================================================
--- incubator/directory/seda/branches/trustin_api_redesign/src/java/org/apache/seda/decoder/DecodeStageHandler.java	(original)
+++ incubator/directory/seda/branches/trustin_api_redesign/src/java/org/apache/seda/stage/decode/DecodeStageHandler.java	Mon Oct 11 06:57:26 2004
@@ -14,7 +14,7 @@
  *   limitations under the License.
  *
  */
-package org.apache.seda.decoder;
+package org.apache.seda.stage.decode;
 
 import org.apache.commons.codec.DecoderException;
 import org.apache.commons.codec.stateful.StatefulDecoder;

Copied: incubator/directory/seda/branches/trustin_api_redesign/src/java/org/apache/seda/stage/decode/DecoderManager.java (from rev 54584, incubator/directory/seda/branches/trustin_api_redesign/src/java/org/apache/seda/decoder/DecoderManager.java)
==============================================================================
--- incubator/directory/seda/branches/trustin_api_redesign/src/java/org/apache/seda/decoder/DecoderManager.java	(original)
+++ incubator/directory/seda/branches/trustin_api_redesign/src/java/org/apache/seda/stage/decode/DecoderManager.java	Mon Oct 11 06:57:26 2004
@@ -14,11 +14,11 @@
  *   limitations under the License.
  *
  */
-package org.apache.seda.decoder;
+package org.apache.seda.stage.decode;
 
 import org.apache.commons.codec.DecoderException;
 
-import org.apache.seda.listener.ClientKey;
+import org.apache.seda.stage.listener.ClientKey;
 
 import java.nio.ByteBuffer;
 

Copied: incubator/directory/seda/branches/trustin_api_redesign/src/java/org/apache/seda/stage/decode/DecoderManagerMonitor.java (from rev 54584, incubator/directory/seda/branches/trustin_api_redesign/src/java/org/apache/seda/decoder/DecoderManagerMonitor.java)
==============================================================================
--- incubator/directory/seda/branches/trustin_api_redesign/src/java/org/apache/seda/decoder/DecoderManagerMonitor.java	(original)
+++ incubator/directory/seda/branches/trustin_api_redesign/src/java/org/apache/seda/stage/decode/DecoderManagerMonitor.java	Mon Oct 11 06:57:26 2004
@@ -14,7 +14,7 @@
  *   limitations under the License.
  *
  */
-package org.apache.seda.decoder;
+package org.apache.seda.stage.decode;
 
 import org.apache.seda.Subscriber;
 

Copied: incubator/directory/seda/branches/trustin_api_redesign/src/java/org/apache/seda/stage/decode/DecoderManagerMonitorAdapter.java (from rev 54584, incubator/directory/seda/branches/trustin_api_redesign/src/java/org/apache/seda/decoder/DecoderManagerMonitorAdapter.java)
==============================================================================
--- incubator/directory/seda/branches/trustin_api_redesign/src/java/org/apache/seda/decoder/DecoderManagerMonitorAdapter.java	(original)
+++ incubator/directory/seda/branches/trustin_api_redesign/src/java/org/apache/seda/stage/decode/DecoderManagerMonitorAdapter.java	Mon Oct 11 06:57:26 2004
@@ -14,7 +14,7 @@
  *   limitations under the License.
  *
  */
-package org.apache.seda.decoder;
+package org.apache.seda.stage.decode;
 
 import org.apache.seda.Subscriber;
 

Copied: incubator/directory/seda/branches/trustin_api_redesign/src/java/org/apache/seda/stage/decode/DefaultDecoderManager.java (from rev 54584, incubator/directory/seda/branches/trustin_api_redesign/src/java/org/apache/seda/decoder/DefaultDecoderManager.java)
==============================================================================
--- incubator/directory/seda/branches/trustin_api_redesign/src/java/org/apache/seda/decoder/DefaultDecoderManager.java	(original)
+++ incubator/directory/seda/branches/trustin_api_redesign/src/java/org/apache/seda/stage/decode/DefaultDecoderManager.java	Mon Oct 11 06:57:26 2004
@@ -1,20 +1,4 @@
-/*
- *   Copyright 2004 The Apache Software Foundation
- *
- *   Licensed under the Apache License, Version 2.0 (the "License");
- *   you may not use this file except in compliance with the License.
- *   You may obtain a copy of the License at
- *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- *   Unless required by applicable law or agreed to in writing, software
- *   distributed under the License is distributed on an "AS IS" BASIS,
- *   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *   See the License for the specific language governing permissions and
- *   limitations under the License.
- *
- */
-package org.apache.seda.decoder;
+package org.apache.seda.stage.decode;
 
 
 import java.awt.event.InputEvent;

Copied: incubator/directory/seda/branches/trustin_api_redesign/src/java/org/apache/seda/stage/encode/ClientEncoder.java (from rev 54584, incubator/directory/seda/branches/trustin_api_redesign/src/java/org/apache/seda/encoder/ClientEncoder.java)
==============================================================================
--- incubator/directory/seda/branches/trustin_api_redesign/src/java/org/apache/seda/encoder/ClientEncoder.java	(original)
+++ incubator/directory/seda/branches/trustin_api_redesign/src/java/org/apache/seda/stage/encode/ClientEncoder.java	Mon Oct 11 06:57:26 2004
@@ -14,14 +14,14 @@
  *   limitations under the License.
  *
  */
-package org.apache.seda.encoder;
+package org.apache.seda.stage.encode;
 
 import org.apache.commons.codec.EncoderException;
 import org.apache.commons.codec.stateful.EncoderCallback;
 import org.apache.commons.codec.stateful.EncoderMonitor;
 import org.apache.commons.codec.stateful.StatefulEncoder;
 
-import org.apache.seda.listener.ClientKey;
+import org.apache.seda.stage.listener.ClientKey;
 
 
 /**

Copied: incubator/directory/seda/branches/trustin_api_redesign/src/java/org/apache/seda/stage/encode/DefaultEncoderManager.java (from rev 54584, incubator/directory/seda/branches/trustin_api_redesign/src/java/org/apache/seda/encoder/DefaultEncoderManager.java)
==============================================================================
--- incubator/directory/seda/branches/trustin_api_redesign/src/java/org/apache/seda/encoder/DefaultEncoderManager.java	(original)
+++ incubator/directory/seda/branches/trustin_api_redesign/src/java/org/apache/seda/stage/encode/DefaultEncoderManager.java	Mon Oct 11 06:57:26 2004
@@ -14,7 +14,7 @@
  *   limitations under the License.
  *
  */
-package org.apache.seda.encoder;
+package org.apache.seda.stage.encode;
 
 import org.apache.commons.codec.EncoderException;
 import org.apache.commons.codec.stateful.EncoderCallback;
@@ -26,10 +26,10 @@
 import org.apache.seda.event.*;
 import org.apache.seda.impl.DefaultStage;
 import org.apache.seda.impl.util.LoggingStageMonitor;
-import org.apache.seda.listener.ClientKey;
-import org.apache.seda.listener.KeyExpiryException;
 import org.apache.seda.protocol.InetServicesDatabase;
 import org.apache.seda.stage.*;
+import org.apache.seda.stage.listener.ClientKey;
+import org.apache.seda.stage.listener.KeyExpiryException;
 
 import java.nio.ByteBuffer;
 

Copied: incubator/directory/seda/branches/trustin_api_redesign/src/java/org/apache/seda/stage/encode/EncodeStageHandler.java (from rev 54584, incubator/directory/seda/branches/trustin_api_redesign/src/java/org/apache/seda/encoder/EncodeStageHandler.java)
==============================================================================
--- incubator/directory/seda/branches/trustin_api_redesign/src/java/org/apache/seda/encoder/EncodeStageHandler.java	(original)
+++ incubator/directory/seda/branches/trustin_api_redesign/src/java/org/apache/seda/stage/encode/EncodeStageHandler.java	Mon Oct 11 06:57:26 2004
@@ -14,14 +14,14 @@
  *   limitations under the License.
  *
  */
-package org.apache.seda.encoder;
+package org.apache.seda.stage.encode;
 
 import org.apache.commons.codec.EncoderException;
 import org.apache.commons.codec.stateful.StatefulEncoder;
 
 import org.apache.seda.StageHandler;
 import org.apache.seda.event.ResponseEvent;
-import org.apache.seda.listener.ClientKey;
+import org.apache.seda.stage.listener.ClientKey;
 
 import java.util.EventObject;
 

Copied: incubator/directory/seda/branches/trustin_api_redesign/src/java/org/apache/seda/stage/encode/EncoderManager.java (from rev 54584, incubator/directory/seda/branches/trustin_api_redesign/src/java/org/apache/seda/encoder/EncoderManager.java)
==============================================================================
--- incubator/directory/seda/branches/trustin_api_redesign/src/java/org/apache/seda/encoder/EncoderManager.java	(original)
+++ incubator/directory/seda/branches/trustin_api_redesign/src/java/org/apache/seda/stage/encode/EncoderManager.java	Mon Oct 11 06:57:26 2004
@@ -14,11 +14,11 @@
  *   limitations under the License.
  *
  */
-package org.apache.seda.encoder;
+package org.apache.seda.stage.encode;
 
 import org.apache.commons.codec.EncoderException;
 
-import org.apache.seda.listener.ClientKey;
+import org.apache.seda.stage.listener.ClientKey;
 
 import java.nio.ByteBuffer;
 

Copied: incubator/directory/seda/branches/trustin_api_redesign/src/java/org/apache/seda/stage/encode/EncoderManagerMonitor.java (from rev 54584, incubator/directory/seda/branches/trustin_api_redesign/src/java/org/apache/seda/encoder/EncoderManagerMonitor.java)
==============================================================================
--- incubator/directory/seda/branches/trustin_api_redesign/src/java/org/apache/seda/encoder/EncoderManagerMonitor.java	(original)
+++ incubator/directory/seda/branches/trustin_api_redesign/src/java/org/apache/seda/stage/encode/EncoderManagerMonitor.java	Mon Oct 11 06:57:26 2004
@@ -14,9 +14,9 @@
  *   limitations under the License.
  *
  */
-package org.apache.seda.encoder;
+package org.apache.seda.stage.encode;
 
-import org.apache.seda.listener.ClientKey;
+import org.apache.seda.stage.listener.ClientKey;
 
 import java.util.EventObject;
 

Copied: incubator/directory/seda/branches/trustin_api_redesign/src/java/org/apache/seda/stage/encode/EncoderManagerMonitorAdapter.java (from rev 54584, incubator/directory/seda/branches/trustin_api_redesign/src/java/org/apache/seda/encoder/EncoderManagerMonitorAdapter.java)
==============================================================================
--- incubator/directory/seda/branches/trustin_api_redesign/src/java/org/apache/seda/encoder/EncoderManagerMonitorAdapter.java	(original)
+++ incubator/directory/seda/branches/trustin_api_redesign/src/java/org/apache/seda/stage/encode/EncoderManagerMonitorAdapter.java	Mon Oct 11 06:57:26 2004
@@ -14,9 +14,9 @@
  *   limitations under the License.
  *
  */
-package org.apache.seda.encoder;
+package org.apache.seda.stage.encode;
 
-import org.apache.seda.listener.ClientKey;
+import org.apache.seda.stage.listener.ClientKey;
 
 import java.util.EventObject;
 

Copied: incubator/directory/seda/branches/trustin_api_redesign/src/java/org/apache/seda/stage/input/InputManager.java (from rev 54584, incubator/directory/seda/branches/trustin_api_redesign/src/java/org/apache/seda/input/InputManager.java)
==============================================================================
--- incubator/directory/seda/branches/trustin_api_redesign/src/java/org/apache/seda/input/InputManager.java	(original)
+++ incubator/directory/seda/branches/trustin_api_redesign/src/java/org/apache/seda/stage/input/InputManager.java	Mon Oct 11 06:57:26 2004
@@ -14,7 +14,7 @@
  *   limitations under the License.
  *
  */
-package org.apache.seda.input;
+package org.apache.seda.stage.input;
 
 
 /**

Copied: incubator/directory/seda/branches/trustin_api_redesign/src/java/org/apache/seda/stage/input/InputManagerMonitor.java (from rev 54584, incubator/directory/seda/branches/trustin_api_redesign/src/java/org/apache/seda/input/InputManagerMonitor.java)
==============================================================================
--- incubator/directory/seda/branches/trustin_api_redesign/src/java/org/apache/seda/input/InputManagerMonitor.java	(original)
+++ incubator/directory/seda/branches/trustin_api_redesign/src/java/org/apache/seda/stage/input/InputManagerMonitor.java	Mon Oct 11 06:57:26 2004
@@ -14,12 +14,12 @@
  *   limitations under the License.
  *
  */
-package org.apache.seda.input;
+package org.apache.seda.stage.input;
 
 import org.apache.seda.ResourceException;
 import org.apache.seda.buffer.BufferPool;
-import org.apache.seda.listener.ClientKey;
-import org.apache.seda.listener.KeyExpiryException;
+import org.apache.seda.stage.listener.ClientKey;
+import org.apache.seda.stage.listener.KeyExpiryException;
 
 import java.io.IOException;
 

Copied: incubator/directory/seda/branches/trustin_api_redesign/src/java/org/apache/seda/stage/input/InputManagerMonitorAdapter.java (from rev 54584, incubator/directory/seda/branches/trustin_api_redesign/src/java/org/apache/seda/input/InputManagerMonitorAdapter.java)
==============================================================================
--- incubator/directory/seda/branches/trustin_api_redesign/src/java/org/apache/seda/input/InputManagerMonitorAdapter.java	(original)
+++ incubator/directory/seda/branches/trustin_api_redesign/src/java/org/apache/seda/stage/input/InputManagerMonitorAdapter.java	Mon Oct 11 06:57:26 2004
@@ -14,12 +14,12 @@
  *   limitations under the License.
  *
  */
-package org.apache.seda.input;
+package org.apache.seda.stage.input;
 
 import org.apache.seda.ResourceException;
 import org.apache.seda.buffer.BufferPool;
-import org.apache.seda.listener.ClientKey;
-import org.apache.seda.listener.KeyExpiryException;
+import org.apache.seda.stage.listener.ClientKey;
+import org.apache.seda.stage.listener.KeyExpiryException;
 
 import java.io.IOException;
 

Copied: incubator/directory/seda/branches/trustin_api_redesign/src/java/org/apache/seda/stage/input/TCPInputManager.java (from rev 54584, incubator/directory/seda/branches/trustin_api_redesign/src/java/org/apache/seda/input/TCPInputManager.java)
==============================================================================
--- incubator/directory/seda/branches/trustin_api_redesign/src/java/org/apache/seda/input/TCPInputManager.java	(original)
+++ incubator/directory/seda/branches/trustin_api_redesign/src/java/org/apache/seda/stage/input/TCPInputManager.java	Mon Oct 11 06:57:26 2004
@@ -14,13 +14,13 @@
  *   limitations under the License.
  *
  */
-package org.apache.seda.input;
+package org.apache.seda.stage.input;
 
 import org.apache.seda.EventRouter;
 import org.apache.seda.ResourceException;
 import org.apache.seda.buffer.BufferPool;
-import org.apache.seda.listener.ClientKey;
-import org.apache.seda.listener.KeyExpiryException;
+import org.apache.seda.stage.listener.ClientKey;
+import org.apache.seda.stage.listener.KeyExpiryException;
 
 import java.awt.event.InputEvent;
 

Copied: incubator/directory/seda/branches/trustin_api_redesign/src/java/org/apache/seda/stage/listener/AvailablePortFinder.java (from rev 54584, incubator/directory/seda/branches/trustin_api_redesign/src/java/org/apache/seda/listener/AvailablePortFinder.java)
==============================================================================
--- incubator/directory/seda/branches/trustin_api_redesign/src/java/org/apache/seda/listener/AvailablePortFinder.java	(original)
+++ incubator/directory/seda/branches/trustin_api_redesign/src/java/org/apache/seda/stage/listener/AvailablePortFinder.java	Mon Oct 11 06:57:26 2004
@@ -14,7 +14,7 @@
  *   limitations under the License.
  *
  */
-package org.apache.seda.listener;
+package org.apache.seda.stage.listener;
 
 import java.io.IOException;
 

Copied: incubator/directory/seda/branches/trustin_api_redesign/src/java/org/apache/seda/stage/listener/ClientKey.java (from rev 54584, incubator/directory/seda/branches/trustin_api_redesign/src/java/org/apache/seda/listener/ClientKey.java)
==============================================================================
--- incubator/directory/seda/branches/trustin_api_redesign/src/java/org/apache/seda/listener/ClientKey.java	(original)
+++ incubator/directory/seda/branches/trustin_api_redesign/src/java/org/apache/seda/stage/listener/ClientKey.java	Mon Oct 11 06:57:26 2004
@@ -14,7 +14,7 @@
  *   limitations under the License.
  *
  */
-package org.apache.seda.listener;
+package org.apache.seda.stage.listener;
 
 import java.io.IOException;
 

Copied: incubator/directory/seda/branches/trustin_api_redesign/src/java/org/apache/seda/stage/listener/KeyExpiryException.java (from rev 54584, incubator/directory/seda/branches/trustin_api_redesign/src/java/org/apache/seda/listener/KeyExpiryException.java)
==============================================================================
--- incubator/directory/seda/branches/trustin_api_redesign/src/java/org/apache/seda/listener/KeyExpiryException.java	(original)
+++ incubator/directory/seda/branches/trustin_api_redesign/src/java/org/apache/seda/stage/listener/KeyExpiryException.java	Mon Oct 11 06:57:26 2004
@@ -14,7 +14,7 @@
  *   limitations under the License.
  *
  */
-package org.apache.seda.listener;
+package org.apache.seda.stage.listener;
 
 import java.io.IOException;
 

Copied: incubator/directory/seda/branches/trustin_api_redesign/src/java/org/apache/seda/stage/listener/ListenerConfig.java (from rev 54584, incubator/directory/seda/branches/trustin_api_redesign/src/java/org/apache/seda/listener/ListenerConfig.java)
==============================================================================
--- incubator/directory/seda/branches/trustin_api_redesign/src/java/org/apache/seda/listener/ListenerConfig.java	(original)
+++ incubator/directory/seda/branches/trustin_api_redesign/src/java/org/apache/seda/stage/listener/ListenerConfig.java	Mon Oct 11 06:57:26 2004
@@ -14,7 +14,7 @@
  *   limitations under the License.
  *
  */
-package org.apache.seda.listener;
+package org.apache.seda.stage.listener;
 
 
 /**

Copied: incubator/directory/seda/branches/trustin_api_redesign/src/java/org/apache/seda/stage/listener/ListenerManager.java (from rev 54584, incubator/directory/seda/branches/trustin_api_redesign/src/java/org/apache/seda/listener/ListenerManager.java)
==============================================================================
--- incubator/directory/seda/branches/trustin_api_redesign/src/java/org/apache/seda/listener/ListenerManager.java	(original)
+++ incubator/directory/seda/branches/trustin_api_redesign/src/java/org/apache/seda/stage/listener/ListenerManager.java	Mon Oct 11 06:57:26 2004
@@ -14,7 +14,7 @@
  *   limitations under the License.
  *
  */
-package org.apache.seda.listener;
+package org.apache.seda.stage.listener;
 
 import java.io.IOException;
 

Copied: incubator/directory/seda/branches/trustin_api_redesign/src/java/org/apache/seda/stage/listener/ListenerManagerMonitor.java (from rev 54584, incubator/directory/seda/branches/trustin_api_redesign/src/java/org/apache/seda/listener/ListenerManagerMonitor.java)
==============================================================================
--- incubator/directory/seda/branches/trustin_api_redesign/src/java/org/apache/seda/listener/ListenerManagerMonitor.java	(original)
+++ incubator/directory/seda/branches/trustin_api_redesign/src/java/org/apache/seda/stage/listener/ListenerManagerMonitor.java	Mon Oct 11 06:57:26 2004
@@ -14,7 +14,7 @@
  *   limitations under the License.
  *
  */
-package org.apache.seda.listener;
+package org.apache.seda.stage.listener;
 
 import java.io.IOException;
 

Copied: incubator/directory/seda/branches/trustin_api_redesign/src/java/org/apache/seda/stage/listener/ListenerManagerMonitorAdapter.java (from rev 54584, incubator/directory/seda/branches/trustin_api_redesign/src/java/org/apache/seda/listener/ListenerManagerMonitorAdapter.java)
==============================================================================
--- incubator/directory/seda/branches/trustin_api_redesign/src/java/org/apache/seda/listener/ListenerManagerMonitorAdapter.java	(original)
+++ incubator/directory/seda/branches/trustin_api_redesign/src/java/org/apache/seda/stage/listener/ListenerManagerMonitorAdapter.java	Mon Oct 11 06:57:26 2004
@@ -14,7 +14,7 @@
  *   limitations under the License.
  *
  */
-package org.apache.seda.listener;
+package org.apache.seda.stage.listener;
 
 import java.io.IOException;
 

Copied: incubator/directory/seda/branches/trustin_api_redesign/src/java/org/apache/seda/stage/listener/SocketListenerConfig.java (from rev 54584, incubator/directory/seda/branches/trustin_api_redesign/src/java/org/apache/seda/listener/SocketListenerConfig.java)
==============================================================================
--- incubator/directory/seda/branches/trustin_api_redesign/src/java/org/apache/seda/listener/SocketListenerConfig.java	(original)
+++ incubator/directory/seda/branches/trustin_api_redesign/src/java/org/apache/seda/stage/listener/SocketListenerConfig.java	Mon Oct 11 06:57:26 2004
@@ -14,7 +14,7 @@
  *   limitations under the License.
  *
  */
-package org.apache.seda.listener;
+package org.apache.seda.stage.listener;
 
 import org.apache.seda.protocol.InetServiceEntry;
 

Copied: incubator/directory/seda/branches/trustin_api_redesign/src/java/org/apache/seda/stage/listener/TCPListenerConfig.java (from rev 54584, incubator/directory/seda/branches/trustin_api_redesign/src/java/org/apache/seda/listener/TCPListenerConfig.java)
==============================================================================
--- incubator/directory/seda/branches/trustin_api_redesign/src/java/org/apache/seda/listener/TCPListenerConfig.java	(original)
+++ incubator/directory/seda/branches/trustin_api_redesign/src/java/org/apache/seda/stage/listener/TCPListenerConfig.java	Mon Oct 11 06:57:26 2004
@@ -14,7 +14,7 @@
  *   limitations under the License.
  *
  */
-package org.apache.seda.listener;
+package org.apache.seda.stage.listener;
 
 import org.apache.seda.protocol.InetServiceEntry;
 

Copied: incubator/directory/seda/branches/trustin_api_redesign/src/java/org/apache/seda/stage/listener/TCPListenerManager.java (from rev 54584, incubator/directory/seda/branches/trustin_api_redesign/src/java/org/apache/seda/listener/TCPListenerManager.java)
==============================================================================
--- incubator/directory/seda/branches/trustin_api_redesign/src/java/org/apache/seda/listener/TCPListenerManager.java	(original)
+++ incubator/directory/seda/branches/trustin_api_redesign/src/java/org/apache/seda/stage/listener/TCPListenerManager.java	Mon Oct 11 06:57:26 2004
@@ -14,7 +14,7 @@
  *   limitations under the License.
  *
  */
-package org.apache.seda.listener;
+package org.apache.seda.stage.listener;
 
 import org.apache.seda.EventRouter;
 
@@ -115,7 +115,7 @@
     }
 
     /**
-     * @see org.apache.seda.listener.ListenerManager#bind(ListenerConfig)
+     * @see org.apache.seda.stage.listener.ListenerManager#bind(ListenerConfig)
      */
     public void bind(ListenerConfig listener) throws IOException {
         ensureListenerConfigType(listener);
@@ -128,7 +128,7 @@
     }
 
     /**
-     * @see org.apache.seda.listener.ListenerManager#unbind(ListenerConfig)
+     * @see org.apache.seda.stage.listener.ListenerManager#unbind(ListenerConfig)
      */
     public void unbind(ListenerConfig listener) throws IOException {
         ensureListenerConfigType(listener);

Copied: incubator/directory/seda/branches/trustin_api_redesign/src/java/org/apache/seda/stage/listener/UDPListenerConfig.java (from rev 54584, incubator/directory/seda/branches/trustin_api_redesign/src/java/org/apache/seda/listener/UDPListenerConfig.java)
==============================================================================
--- incubator/directory/seda/branches/trustin_api_redesign/src/java/org/apache/seda/listener/UDPListenerConfig.java	(original)
+++ incubator/directory/seda/branches/trustin_api_redesign/src/java/org/apache/seda/stage/listener/UDPListenerConfig.java	Mon Oct 11 06:57:26 2004
@@ -14,7 +14,7 @@
  *   limitations under the License.
  *
  */
-package org.apache.seda.listener;
+package org.apache.seda.stage.listener;
 
 import org.apache.seda.protocol.InetServiceEntry;
 

Copied: incubator/directory/seda/branches/trustin_api_redesign/src/java/org/apache/seda/stage/output/DefaultOutputManager.java (from rev 54584, incubator/directory/seda/branches/trustin_api_redesign/src/java/org/apache/seda/output/DefaultOutputManager.java)
==============================================================================
--- incubator/directory/seda/branches/trustin_api_redesign/src/java/org/apache/seda/output/DefaultOutputManager.java	(original)
+++ incubator/directory/seda/branches/trustin_api_redesign/src/java/org/apache/seda/stage/output/DefaultOutputManager.java	Mon Oct 11 06:57:26 2004
@@ -14,7 +14,7 @@
  *   limitations under the License.
  *
  */
-package org.apache.seda.output;
+package org.apache.seda.stage.output;
 
 import org.apache.seda.EventRouter;
 import org.apache.seda.StageHandler;
@@ -28,8 +28,8 @@
 import org.apache.seda.impl.DefaultStage;
 import org.apache.seda.impl.DefaultStageConfig;
 import org.apache.seda.impl.util.LoggingStageMonitor;
-import org.apache.seda.listener.ClientKey;
-import org.apache.seda.listener.KeyExpiryException;
+import org.apache.seda.stage.listener.ClientKey;
+import org.apache.seda.stage.listener.KeyExpiryException;
 
 import java.io.IOException;
 

Copied: incubator/directory/seda/branches/trustin_api_redesign/src/java/org/apache/seda/stage/output/LoggingOutputMonitor.java (from rev 54584, incubator/directory/seda/branches/trustin_api_redesign/src/java/org/apache/seda/output/LoggingOutputMonitor.java)
==============================================================================
--- incubator/directory/seda/branches/trustin_api_redesign/src/java/org/apache/seda/output/LoggingOutputMonitor.java	(original)
+++ incubator/directory/seda/branches/trustin_api_redesign/src/java/org/apache/seda/stage/output/LoggingOutputMonitor.java	Mon Oct 11 06:57:26 2004
@@ -14,15 +14,15 @@
  *   limitations under the License.
  *
  */
-package org.apache.seda.output;
+package org.apache.seda.stage.output;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
 import org.apache.seda.event.ConnectEvent;
 import org.apache.seda.event.DisconnectEvent;
-import org.apache.seda.listener.ClientKey;
-import org.apache.seda.listener.KeyExpiryException;
+import org.apache.seda.stage.listener.ClientKey;
+import org.apache.seda.stage.listener.KeyExpiryException;
 
 import java.util.EventObject;
 

Copied: incubator/directory/seda/branches/trustin_api_redesign/src/java/org/apache/seda/stage/output/OutputManager.java (from rev 54584, incubator/directory/seda/branches/trustin_api_redesign/src/java/org/apache/seda/output/OutputManager.java)
==============================================================================
--- incubator/directory/seda/branches/trustin_api_redesign/src/java/org/apache/seda/output/OutputManager.java	(original)
+++ incubator/directory/seda/branches/trustin_api_redesign/src/java/org/apache/seda/stage/output/OutputManager.java	Mon Oct 11 06:57:26 2004
@@ -14,9 +14,9 @@
  *   limitations under the License.
  *
  */
-package org.apache.seda.output;
+package org.apache.seda.stage.output;
 
-import org.apache.seda.listener.ClientKey;
+import org.apache.seda.stage.listener.ClientKey;
 
 import java.io.IOException;
 

Copied: incubator/directory/seda/branches/trustin_api_redesign/src/java/org/apache/seda/stage/output/OutputMonitor.java (from rev 54584, incubator/directory/seda/branches/trustin_api_redesign/src/java/org/apache/seda/output/OutputMonitor.java)
==============================================================================
--- incubator/directory/seda/branches/trustin_api_redesign/src/java/org/apache/seda/output/OutputMonitor.java	(original)
+++ incubator/directory/seda/branches/trustin_api_redesign/src/java/org/apache/seda/stage/output/OutputMonitor.java	Mon Oct 11 06:57:26 2004
@@ -14,12 +14,12 @@
  *   limitations under the License.
  *
  */
-package org.apache.seda.output;
+package org.apache.seda.stage.output;
 
 import org.apache.seda.event.ConnectEvent;
 import org.apache.seda.event.DisconnectEvent;
-import org.apache.seda.listener.ClientKey;
-import org.apache.seda.listener.KeyExpiryException;
+import org.apache.seda.stage.listener.ClientKey;
+import org.apache.seda.stage.listener.KeyExpiryException;
 
 import java.util.EventObject;
 

Copied: incubator/directory/seda/branches/trustin_api_redesign/src/java/org/apache/seda/stage/output/OutputMonitorAdapter.java (from rev 54584, incubator/directory/seda/branches/trustin_api_redesign/src/java/org/apache/seda/output/OutputMonitorAdapter.java)
==============================================================================
--- incubator/directory/seda/branches/trustin_api_redesign/src/java/org/apache/seda/output/OutputMonitorAdapter.java	(original)
+++ incubator/directory/seda/branches/trustin_api_redesign/src/java/org/apache/seda/stage/output/OutputMonitorAdapter.java	Mon Oct 11 06:57:26 2004
@@ -14,12 +14,12 @@
  *   limitations under the License.
  *
  */
-package org.apache.seda.output;
+package org.apache.seda.stage.output;
 
 import org.apache.seda.event.ConnectEvent;
 import org.apache.seda.event.DisconnectEvent;
-import org.apache.seda.listener.ClientKey;
-import org.apache.seda.listener.KeyExpiryException;
+import org.apache.seda.stage.listener.ClientKey;
+import org.apache.seda.stage.listener.KeyExpiryException;
 
 import java.util.EventObject;
 

Modified: incubator/directory/seda/branches/trustin_api_redesign/src/test/org/apache/seda/DefaultFrontendFactoryTest.java
==============================================================================
--- incubator/directory/seda/branches/trustin_api_redesign/src/test/org/apache/seda/DefaultFrontendFactoryTest.java	(original)
+++ incubator/directory/seda/branches/trustin_api_redesign/src/test/org/apache/seda/DefaultFrontendFactoryTest.java	Mon Oct 11 06:57:26 2004
@@ -23,11 +23,11 @@
 import org.apache.seda.examples.EchoProtocolProvider;
 import org.apache.seda.impl.DefaultFrontend;
 import org.apache.seda.impl.DefaultFrontendFactory;
-import org.apache.seda.listener.AvailablePortFinder;
-import org.apache.seda.listener.ListenerConfig;
-import org.apache.seda.listener.TCPListenerConfig;
 import org.apache.seda.protocol.DefaultInetServicesDatabase;
 import org.apache.seda.protocol.InetServiceEntry;
+import org.apache.seda.stage.listener.AvailablePortFinder;
+import org.apache.seda.stage.listener.ListenerConfig;
+import org.apache.seda.stage.listener.TCPListenerConfig;
 
 import java.io.IOException;
 

Modified: incubator/directory/seda/branches/trustin_api_redesign/src/test/org/apache/seda/ProtocolTestCase.java
==============================================================================
--- incubator/directory/seda/branches/trustin_api_redesign/src/test/org/apache/seda/ProtocolTestCase.java	(original)
+++ incubator/directory/seda/branches/trustin_api_redesign/src/test/org/apache/seda/ProtocolTestCase.java	Mon Oct 11 06:57:26 2004
@@ -20,12 +20,12 @@
 
 import org.apache.seda.impl.DefaultFrontend;
 import org.apache.seda.impl.DefaultFrontendFactory;
-import org.apache.seda.listener.AvailablePortFinder;
-import org.apache.seda.listener.ListenerConfig;
-import org.apache.seda.listener.TCPListenerConfig;
 import org.apache.seda.protocol.DefaultInetServicesDatabase;
 import org.apache.seda.protocol.InetServiceEntry;
 import org.apache.seda.protocol.ProtocolProvider;
+import org.apache.seda.stage.listener.AvailablePortFinder;
+import org.apache.seda.stage.listener.ListenerConfig;
+import org.apache.seda.stage.listener.TCPListenerConfig;
 
 import java.net.InetAddress;
 

Modified: incubator/directory/seda/branches/trustin_api_redesign/src/test/org/apache/seda/decoder/DefaultDecoderManagerTest.java
==============================================================================
--- incubator/directory/seda/branches/trustin_api_redesign/src/test/org/apache/seda/decoder/DefaultDecoderManagerTest.java	(original)
+++ incubator/directory/seda/branches/trustin_api_redesign/src/test/org/apache/seda/decoder/DefaultDecoderManagerTest.java	Mon Oct 11 06:57:26 2004
@@ -30,6 +30,8 @@
 import org.apache.seda.impl.DefaultStageConfig;
 import org.apache.seda.protocol.InetServiceEntry;
 import org.apache.seda.protocol.InetServicesDatabase;
+import org.apache.seda.stage.decode.DecodeStageHandler;
+import org.apache.seda.stage.decode.DefaultDecoderManager;
 import org.apache.seda.thread.ThreadPool;
 
 import java.util.EventObject;

Modified: incubator/directory/seda/branches/trustin_api_redesign/src/test/org/apache/seda/event/AbstractSubscriberTest.java
==============================================================================
--- incubator/directory/seda/branches/trustin_api_redesign/src/test/org/apache/seda/event/AbstractSubscriberTest.java	(original)
+++ incubator/directory/seda/branches/trustin_api_redesign/src/test/org/apache/seda/event/AbstractSubscriberTest.java	Mon Oct 11 06:57:26 2004
@@ -18,7 +18,7 @@
 
 import junit.framework.TestCase;
 
-import org.apache.seda.listener.ClientKey;
+import org.apache.seda.stage.listener.ClientKey;
 
 import java.nio.ByteBuffer;
 

Modified: incubator/directory/seda/branches/trustin_api_redesign/src/test/org/apache/seda/listener/AvailablePortFinderTest.java
==============================================================================
--- incubator/directory/seda/branches/trustin_api_redesign/src/test/org/apache/seda/listener/AvailablePortFinderTest.java	(original)
+++ incubator/directory/seda/branches/trustin_api_redesign/src/test/org/apache/seda/listener/AvailablePortFinderTest.java	Mon Oct 11 06:57:26 2004
@@ -16,6 +16,8 @@
  */
 package org.apache.seda.listener;
 
+import org.apache.seda.stage.listener.AvailablePortFinder;
+
 import junit.framework.Assert;
 import junit.framework.TestCase;
 

Modified: incubator/directory/seda/branches/trustin_api_redesign/src/test/org/apache/seda/listener/TCPListenerManagerTest.java
==============================================================================
--- incubator/directory/seda/branches/trustin_api_redesign/src/test/org/apache/seda/listener/TCPListenerManagerTest.java	(original)
+++ incubator/directory/seda/branches/trustin_api_redesign/src/test/org/apache/seda/listener/TCPListenerManagerTest.java	Mon Oct 11 06:57:26 2004
@@ -21,6 +21,10 @@
 import org.apache.seda.EventRouter;
 import org.apache.seda.impl.DefaultEventRouter;
 import org.apache.seda.protocol.InetServiceEntry;
+import org.apache.seda.stage.listener.AvailablePortFinder;
+import org.apache.seda.stage.listener.ListenerConfig;
+import org.apache.seda.stage.listener.TCPListenerConfig;
+import org.apache.seda.stage.listener.TCPListenerManager;
 
 import java.net.InetAddress;