directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From akaras...@apache.org
Subject svn commit: rev 43403 - in incubator/directory/seda/trunk: api/src/java/org/apache/seda/listener impl/src/java/org/apache/seda/decoder impl/src/java/org/apache/seda/encoder impl/src/java/org/apache/seda/listener impl/src/java/org/apache/seda/output impl/src/java/org/apache/seda/processor impl/src/java/org/apache/seda/seda impl/src/java/org/apache/seda/stage impl/src/test/org/apache/seda/decoder impl/src/test/org/apache/seda/event impl/src/test/org/apache/seda/listener
Date Mon, 06 Sep 2004 04:30:28 GMT
Author: akarasulu
Date: Sun Sep  5 21:30:26 2004
New Revision: 43403

Added:
   incubator/directory/seda/trunk/api/src/java/org/apache/seda/listener/ListenerConfig.java
      - copied, changed from rev 43402, incubator/directory/seda/trunk/api/src/java/org/apache/seda/listener/InetServiceListenerConfig.java
   incubator/directory/seda/trunk/impl/src/java/org/apache/seda/stage/
      - copied from rev 43402, incubator/directory/seda/trunk/impl/src/java/org/apache/seda/seda/
Removed:
   incubator/directory/seda/trunk/api/src/java/org/apache/seda/listener/InetServiceListenerConfig.java
   incubator/directory/seda/trunk/impl/src/java/org/apache/seda/seda/
Modified:
   incubator/directory/seda/trunk/api/src/java/org/apache/seda/listener/ListenerManager.java
   incubator/directory/seda/trunk/api/src/java/org/apache/seda/listener/ListenerManagerMonitor.java
   incubator/directory/seda/trunk/impl/src/java/org/apache/seda/decoder/DefaultDecoderManager.java
   incubator/directory/seda/trunk/impl/src/java/org/apache/seda/encoder/DefaultEncoderManager.java
   incubator/directory/seda/trunk/impl/src/java/org/apache/seda/listener/DefaultListenerManager.java
   incubator/directory/seda/trunk/impl/src/java/org/apache/seda/listener/DefaultServerListener.java
   incubator/directory/seda/trunk/impl/src/java/org/apache/seda/listener/ListenerManagerMonitorAdapter.java
   incubator/directory/seda/trunk/impl/src/java/org/apache/seda/output/DefaultOutputManager.java
   incubator/directory/seda/trunk/impl/src/java/org/apache/seda/processor/DefaultRequestProcessor.java
   incubator/directory/seda/trunk/impl/src/java/org/apache/seda/stage/DefaultStage.java
   incubator/directory/seda/trunk/impl/src/java/org/apache/seda/stage/DefaultStageConfig.java
   incubator/directory/seda/trunk/impl/src/java/org/apache/seda/stage/LoggingStageMonitor.java
   incubator/directory/seda/trunk/impl/src/java/org/apache/seda/stage/StageMonitorAdapter.java
   incubator/directory/seda/trunk/impl/src/test/org/apache/seda/decoder/DefaultDecoderManagerTest.java
   incubator/directory/seda/trunk/impl/src/test/org/apache/seda/event/DefaultStageTest.java
   incubator/directory/seda/trunk/impl/src/test/org/apache/seda/listener/DefaultListenerManagerTest.java
Log:
made it all compile after package changes

Copied: incubator/directory/seda/trunk/api/src/java/org/apache/seda/listener/ListenerConfig.java
(from rev 43402, incubator/directory/seda/trunk/api/src/java/org/apache/seda/listener/InetServiceListenerConfig.java)
==============================================================================
--- incubator/directory/seda/trunk/api/src/java/org/apache/seda/listener/InetServiceListenerConfig.java
(original)
+++ incubator/directory/seda/trunk/api/src/java/org/apache/seda/listener/ListenerConfig.java
Sun Sep  5 21:30:26 2004
@@ -27,17 +27,17 @@
  * @author $Author$
  * @version $Rev$
  */
-public interface InetServiceListenerConfig
+public interface ListenerConfig
 {
     /**
-     * Gets the server socket backlog for this InetServiceListenerConfig
+     * Gets the server socket backlog for this ListenerConfig
      *
      * @return client connection backlog
      */
     public int getBacklog() ;
 
     /**
-     * Gets the ip interface address this InetServiceListenerConfig listens on.
+     * Gets the ip interface address this ListenerConfig listens on.
      *
      * @return the ip address octets i.e. { 127,0,0,1 } for 127.0.0.1
      */
@@ -51,7 +51,7 @@
     public boolean isSecure() ;
     
     /**
-     * Gets the URL for this InetServiceListenerConfig using the specified ip address and
+     * Gets the URL for this ListenerConfig using the specified ip address and
      * the tcp port number listened to.  The ipaddress is resolved to a host 
      * name.
      *
@@ -60,7 +60,7 @@
     public String getURL() ;
 
     /**
-     * Gets the InetServiceEntry associated with this InetServiceListenerConfig.
+     * Gets the InetServiceEntry associated with this ListenerConfig.
      *
      * @return the service entry for this listener
      */

Modified: incubator/directory/seda/trunk/api/src/java/org/apache/seda/listener/ListenerManager.java
==============================================================================
--- incubator/directory/seda/trunk/api/src/java/org/apache/seda/listener/ListenerManager.java
(original)
+++ incubator/directory/seda/trunk/api/src/java/org/apache/seda/listener/ListenerManager.java
Sun Sep  5 21:30:26 2004
@@ -37,7 +37,7 @@
      * 
      * @param a_listenerConfig the listener to register and bind
      */
-    public void bind( InetServiceListenerConfig a_listenerConfig ) throws IOException ;
+    public void bind( ListenerConfig a_listenerConfig ) throws IOException ;
     
     /**
      * Unbinds and unregisters a server listener.
@@ -45,5 +45,5 @@
      * @param a_listenerConfig the listener to unregister and unbind
      * @throws IOException if there is a problem unbinding a listener
      */
-    public void unbind( InetServiceListenerConfig a_listenerConfig ) throws IOException ;
+    public void unbind( ListenerConfig a_listenerConfig ) throws IOException ;
 }

Modified: incubator/directory/seda/trunk/api/src/java/org/apache/seda/listener/ListenerManagerMonitor.java
==============================================================================
--- incubator/directory/seda/trunk/api/src/java/org/apache/seda/listener/ListenerManagerMonitor.java
(original)
+++ incubator/directory/seda/trunk/api/src/java/org/apache/seda/listener/ListenerManagerMonitor.java
Sun Sep  5 21:30:26 2004
@@ -51,14 +51,14 @@
      * 
      * @param a_listenerConfig the listener just bound to a port
      */
-    void bindOccured( InetServiceListenerConfig a_listenerConfig ) ;
+    void bindOccured( ListenerConfig a_listenerConfig ) ;
     
     /**
      * Monitors unbind occurences.
      * 
      * @param a_listenerConfig the listener just unbound from a port
      */
-    void unbindOccured( InetServiceListenerConfig a_listenerConfig ) ;
+    void unbindOccured( ListenerConfig a_listenerConfig ) ;
     
     /**
      * Monitors the occurrence of successful socket accept attempts
@@ -87,7 +87,7 @@
      * @param a_listenerConfig the listener whose bind attempt failed
      * @param a_failure the exception resulting from the failure
      */
-    void failedToBind( InetServiceListenerConfig a_listenerConfig, IOException a_failure
) ;
+    void failedToBind( ListenerConfig a_listenerConfig, IOException a_failure ) ;
     
     /**
      * Monitors unbind failures.
@@ -95,7 +95,7 @@
      * @param a_listenerConfig the listener whose unbind attempt failed
      * @param a_failure the exception resulting from the failure
      */
-    void failedToUnbind( InetServiceListenerConfig a_listenerConfig, IOException a_failure
) ;
+    void failedToUnbind( ListenerConfig a_listenerConfig, IOException a_failure ) ;
     
     /**
      * Monitors expiration failures on client keys.

Modified: incubator/directory/seda/trunk/impl/src/java/org/apache/seda/decoder/DefaultDecoderManager.java
==============================================================================
--- incubator/directory/seda/trunk/impl/src/java/org/apache/seda/decoder/DefaultDecoderManager.java
(original)
+++ incubator/directory/seda/trunk/impl/src/java/org/apache/seda/decoder/DefaultDecoderManager.java
Sun Sep  5 21:30:26 2004
@@ -23,8 +23,11 @@
 
 import java.nio.ByteBuffer;
 
-import org.apache.seda.event.InputEvent;
 import org.apache.seda.stage.StageConfig;
+import org.apache.seda.stage.DefaultStage;
+import org.apache.seda.stage.LoggingStageMonitor;
+
+import org.apache.seda.event.InputEvent;
 import org.apache.seda.event.EventRouter;
 import org.apache.seda.listener.ClientKey;
 import org.apache.seda.event.ConnectEvent;
@@ -32,8 +35,6 @@
 import org.apache.seda.event.DisconnectEvent;
 import org.apache.seda.event.InputSubscriber;
 import org.apache.seda.event.ConnectSubscriber;
-import org.apache.seda.seda.LoggingStageMonitor;
-import org.apache.seda.seda.DefaultStage;
 import org.apache.seda.event.AbstractSubscriber;
 import org.apache.seda.event.DisconnectSubscriber;
 

Modified: incubator/directory/seda/trunk/impl/src/java/org/apache/seda/encoder/DefaultEncoderManager.java
==============================================================================
--- incubator/directory/seda/trunk/impl/src/java/org/apache/seda/encoder/DefaultEncoderManager.java
(original)
+++ incubator/directory/seda/trunk/impl/src/java/org/apache/seda/encoder/DefaultEncoderManager.java
Sun Sep  5 21:30:26 2004
@@ -29,13 +29,11 @@
 import org.apache.seda.event.ResponseSubscriber;
 
 import org.apache.seda.stage.StageHandler;
+import org.apache.seda.stage.DefaultStage;
+import org.apache.seda.stage.DefaultStageConfig;
+import org.apache.seda.stage.LoggingStageMonitor;
 
 import org.apache.seda.listener.ClientKey;
-import org.apache.seda.encoder.EncoderManager;
-import org.apache.seda.encoder.EncoderManagerMonitor;
-import org.apache.seda.seda.DefaultStage;
-import org.apache.seda.seda.DefaultStageConfig;
-import org.apache.seda.seda.LoggingStageMonitor;
 import org.apache.seda.event.AbstractSubscriber;
 
 

Modified: incubator/directory/seda/trunk/impl/src/java/org/apache/seda/listener/DefaultListenerManager.java
==============================================================================
--- incubator/directory/seda/trunk/impl/src/java/org/apache/seda/listener/DefaultListenerManager.java
(original)
+++ incubator/directory/seda/trunk/impl/src/java/org/apache/seda/listener/DefaultListenerManager.java
Sun Sep  5 21:30:26 2004
@@ -37,9 +37,6 @@
 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;
 
 
 /**
@@ -121,9 +118,9 @@
 
 
     /**
-     * @see org.apache.seda.listener.ListenerManager#bind(InetServiceListenerConfig)
+     * @see org.apache.seda.listener.ListenerManager#bind(ListenerConfig)
      */
-    public void bind( InetServiceListenerConfig listener ) throws IOException
+    public void bind( ListenerConfig listener ) throws IOException
     {
         synchronized ( bindListeners )
         {
@@ -135,9 +132,9 @@
     
     
     /**
-     * @see org.apache.seda.listener.ListenerManager#unbind(InetServiceListenerConfig)
+     * @see org.apache.seda.listener.ListenerManager#unbind(ListenerConfig)
      */
-    public void unbind( InetServiceListenerConfig listener ) throws IOException
+    public void unbind( ListenerConfig listener ) throws IOException
     {
         synchronized ( unbindListeners )
         {
@@ -160,8 +157,8 @@
             Iterator list = bindListeners.iterator() ;
             while ( list.hasNext() )
             {
-                InetServiceListenerConfig listener =
-                        ( InetServiceListenerConfig ) list.next() ;
+                ListenerConfig listener =
+                        ( ListenerConfig ) list.next() ;
                     
                 try
                 {
@@ -207,8 +204,8 @@
             while ( keys.hasNext() )
             {
                 key = ( SelectionKey ) keys.next() ;
-                InetServiceListenerConfig listener =
-                        ( InetServiceListenerConfig ) key.attachment() ;
+                ListenerConfig listener =
+                        ( ListenerConfig ) key.attachment() ;
     
                 if ( unbindListeners.contains( listener ) )
                 {    
@@ -377,7 +374,8 @@
             Iterator list = listeners.iterator() ;
             while( list.hasNext() )
             {
-                ServerListener listener = ( ServerListener ) list.next() ;
+                ListenerConfig listener =
+                        ( ListenerConfig ) list.next() ;
                     
                 try
                 {

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

Modified: incubator/directory/seda/trunk/impl/src/java/org/apache/seda/listener/ListenerManagerMonitorAdapter.java
==============================================================================
--- incubator/directory/seda/trunk/impl/src/java/org/apache/seda/listener/ListenerManagerMonitorAdapter.java
(original)
+++ incubator/directory/seda/trunk/impl/src/java/org/apache/seda/listener/ListenerManagerMonitorAdapter.java
Sun Sep  5 21:30:26 2004
@@ -55,7 +55,7 @@
      * @see org.apache.seda.listener.ListenerManagerMonitor#bindOccured(
      * org.apache.seda.listener.ServerListener)
      */
-    public void bindOccured( ServerListener listener )
+    public void bindOccured( ListenerConfig listener )
     {
     }
 
@@ -64,7 +64,7 @@
      * @see org.apache.seda.listener.ListenerManagerMonitor#unbindOccured(
      * org.apache.seda.listener.ServerListener)
      */
-    public void unbindOccured( ServerListener listener )
+    public void unbindOccured( ListenerConfig listener )
     {
     }
 
@@ -93,7 +93,8 @@
      * @see org.apache.seda.listener.ListenerManagerMonitor#failedToBind(
      * org.apache.seda.listener.ServerListener, java.io.IOException)
      */
-    public void failedToBind( ServerListener listener, IOException fault )
+    public void failedToBind( ListenerConfig listener,
+                              IOException fault )
     {
         System.err.println( ExceptionUtils.getFullStackTrace( fault ) ) ;
     }
@@ -103,7 +104,7 @@
      * @see org.apache.seda.listener.ListenerManagerMonitor#failedToUnbind(
      * org.apache.seda.listener.ServerListener, java.io.IOException)
      */
-    public void failedToUnbind( ServerListener listener, 
+    public void failedToUnbind( ListenerConfig listener, 
                                 IOException fault )
     {
         System.err.println( ExceptionUtils.getFullStackTrace( fault ) ) ;

Modified: incubator/directory/seda/trunk/impl/src/java/org/apache/seda/output/DefaultOutputManager.java
==============================================================================
--- incubator/directory/seda/trunk/impl/src/java/org/apache/seda/output/DefaultOutputManager.java
(original)
+++ incubator/directory/seda/trunk/impl/src/java/org/apache/seda/output/DefaultOutputManager.java
Sun Sep  5 21:30:26 2004
@@ -32,8 +32,6 @@
 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 ;
@@ -41,12 +39,7 @@
 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.seda.seda.DefaultStageConfig;
-import org.apache.seda.seda.LoggingStageMonitor;
-import org.apache.seda.seda.DefaultStage;
-import org.apache.seda.event.AbstractSubscriber;
 
 
 /**

Modified: incubator/directory/seda/trunk/impl/src/java/org/apache/seda/processor/DefaultRequestProcessor.java
==============================================================================
--- incubator/directory/seda/trunk/impl/src/java/org/apache/seda/processor/DefaultRequestProcessor.java
(original)
+++ incubator/directory/seda/trunk/impl/src/java/org/apache/seda/processor/DefaultRequestProcessor.java
Sun Sep  5 21:30:26 2004
@@ -29,12 +29,7 @@
 import org.apache.seda.event.AbstractSubscriber ;
 
 import org.apache.seda.listener.ClientKey ;
-
-import org.apache.seda.seda.StageConfig ;
-import org.apache.seda.seda.DefaultStage ;
-import org.apache.seda.seda.StageHandler ;
-import org.apache.seda.seda.DefaultStageConfig ;
-import org.apache.seda.seda.LoggingStageMonitor;
+import org.apache.seda.stage.*;
 import org.apache.seda.protocol.*;
 
 

Modified: incubator/directory/seda/trunk/impl/src/java/org/apache/seda/stage/DefaultStage.java
==============================================================================
--- incubator/directory/seda/trunk/impl/src/java/org/apache/seda/seda/DefaultStage.java	(original)
+++ incubator/directory/seda/trunk/impl/src/java/org/apache/seda/stage/DefaultStage.java	Sun
Sep  5 21:30:26 2004
@@ -14,7 +14,7 @@
  *   limitations under the License.
  *
  */
-package org.apache.seda.seda ;
+package org.apache.seda.stage ;
 
 
 import org.apache.seda.stage.Stage;

Modified: incubator/directory/seda/trunk/impl/src/java/org/apache/seda/stage/DefaultStageConfig.java
==============================================================================
--- incubator/directory/seda/trunk/impl/src/java/org/apache/seda/seda/DefaultStageConfig.java
(original)
+++ incubator/directory/seda/trunk/impl/src/java/org/apache/seda/stage/DefaultStageConfig.java
Sun Sep  5 21:30:26 2004
@@ -14,7 +14,7 @@
  *   limitations under the License.
  *
  */
-package org.apache.seda.seda ;
+package org.apache.seda.stage ;
 
 
 import java.util.List ;

Modified: incubator/directory/seda/trunk/impl/src/java/org/apache/seda/stage/LoggingStageMonitor.java
==============================================================================
--- incubator/directory/seda/trunk/impl/src/java/org/apache/seda/seda/LoggingStageMonitor.java
(original)
+++ incubator/directory/seda/trunk/impl/src/java/org/apache/seda/stage/LoggingStageMonitor.java
Sun Sep  5 21:30:26 2004
@@ -14,7 +14,7 @@
  *   limitations under the License.
  *
  */
-package org.apache.seda.seda ;
+package org.apache.seda.stage ;
 
 
 import java.util.EventObject ;

Modified: incubator/directory/seda/trunk/impl/src/java/org/apache/seda/stage/StageMonitorAdapter.java
==============================================================================
--- incubator/directory/seda/trunk/impl/src/java/org/apache/seda/seda/StageMonitorAdapter.java
(original)
+++ incubator/directory/seda/trunk/impl/src/java/org/apache/seda/stage/StageMonitorAdapter.java
Sun Sep  5 21:30:26 2004
@@ -14,7 +14,7 @@
  *   limitations under the License.
  *
  */
-package org.apache.seda.seda ;
+package org.apache.seda.stage ;
 
 
 import java.util.EventObject ;

Modified: incubator/directory/seda/trunk/impl/src/test/org/apache/seda/decoder/DefaultDecoderManagerTest.java
==============================================================================
--- incubator/directory/seda/trunk/impl/src/test/org/apache/seda/decoder/DefaultDecoderManagerTest.java
(original)
+++ incubator/directory/seda/trunk/impl/src/test/org/apache/seda/decoder/DefaultDecoderManagerTest.java
Sun Sep  5 21:30:26 2004
@@ -29,8 +29,8 @@
 import org.apache.seda.event.RequestEvent;
 import org.apache.seda.event.RequestSubscriber;
 
-import org.apache.seda.seda.DefaultStageConfig ;
 import org.apache.seda.thread.ThreadPool;
+import org.apache.seda.stage.DefaultStageConfig;
 
 import junit.framework.TestCase ;
 
@@ -52,7 +52,7 @@
     private BufferPool bp = null ;
     private DefaultDecoderManager decodeMan = null ;
     private RequestEvent event = null ;
-    
+
 
     public static void main( String[] args )
     {

Modified: incubator/directory/seda/trunk/impl/src/test/org/apache/seda/event/DefaultStageTest.java
==============================================================================
--- incubator/directory/seda/trunk/impl/src/test/org/apache/seda/event/DefaultStageTest.java
(original)
+++ incubator/directory/seda/trunk/impl/src/test/org/apache/seda/event/DefaultStageTest.java
Sun Sep  5 21:30:26 2004
@@ -20,12 +20,8 @@
 import java.util.ArrayList ;
 import java.util.EventObject ;
 
-import org.apache.seda.seda.DefaultStage ;
-import org.apache.seda.seda.StageHandler ;
 import org.apache.seda.thread.ThreadPool ;
-import org.apache.seda.seda.EnqueuePredicate ;
-import org.apache.seda.seda.DefaultStageConfig ;
-import org.apache.seda.seda.LoggingStageMonitor ;
+import org.apache.seda.stage.*;
 
 import junit.framework.TestCase ;
 
@@ -101,7 +97,7 @@
 
     public void testAddPredicateAccept() throws Exception
     {
-        stage.addPredicate( new EnqueuePredicate() 
+        stage.addPredicate( new EnqueuePredicate()
         {
             public boolean accept( EventObject event )
             {

Modified: incubator/directory/seda/trunk/impl/src/test/org/apache/seda/listener/DefaultListenerManagerTest.java
==============================================================================
--- incubator/directory/seda/trunk/impl/src/test/org/apache/seda/listener/DefaultListenerManagerTest.java
(original)
+++ incubator/directory/seda/trunk/impl/src/test/org/apache/seda/listener/DefaultListenerManagerTest.java
Sun Sep  5 21:30:26 2004
@@ -19,6 +19,7 @@
 
 import org.apache.seda.event.EventRouter ;
 import org.apache.seda.event.DefaultEventRouter ;
+import org.apache.seda.protocol.InetServiceEntry;
 
 import junit.framework.TestCase ;
 
@@ -77,15 +78,16 @@
 
     public void testBind() throws Exception
     {
-        listener.bind( new 
-                LdapServerListener( "localhost", 10389, 100, false ) ) ;
+        listener.bind( new DefaultServerListener( new byte[] { 127,0,0,1},
+                50, false, new InetServiceEntry( "ldap", 10389 ) ) );
     }
 
     
     public void testUnbind() throws Exception
     {
-        ServerListener sl = new 
-            LdapServerListener( "localhost", 10389, 100, false ) ;
+        ListenerConfig sl = new
+                DefaultServerListener( new byte[] { 127,0,0,1}, 50, false,
+                        new InetServiceEntry( "ldap", 10389 ) );
         listener.bind( sl ) ;
         listener.unbind( sl ) ;
     }

Mime
View raw message