You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by ak...@apache.org on 2004/09/01 09:21:36 UTC
svn commit: rev 37325 - in incubator/directory/eve/trunk/frontend/merlin/src/java/org/apache/eve/merlin: . buffer decoder encoder event input listener output processor
Author: akarasulu
Date: Wed Sep 1 00:21:35 2004
New Revision: 37325
Modified:
incubator/directory/eve/trunk/frontend/merlin/src/java/org/apache/eve/merlin/MerlinFrontend.java
incubator/directory/eve/trunk/frontend/merlin/src/java/org/apache/eve/merlin/buffer/AvalonLoggingMonitor.java
incubator/directory/eve/trunk/frontend/merlin/src/java/org/apache/eve/merlin/buffer/MerlinBufferPool.java
incubator/directory/eve/trunk/frontend/merlin/src/java/org/apache/eve/merlin/decoder/MerlinDecoderManager.java
incubator/directory/eve/trunk/frontend/merlin/src/java/org/apache/eve/merlin/encoder/MerlinEncoderManager.java
incubator/directory/eve/trunk/frontend/merlin/src/java/org/apache/eve/merlin/event/MerlinEventRouter.java
incubator/directory/eve/trunk/frontend/merlin/src/java/org/apache/eve/merlin/input/AvalonInputManagerMonitor.java
incubator/directory/eve/trunk/frontend/merlin/src/java/org/apache/eve/merlin/input/MerlinInputManager.java
incubator/directory/eve/trunk/frontend/merlin/src/java/org/apache/eve/merlin/listener/AvalonListenerManagerMonitor.java
incubator/directory/eve/trunk/frontend/merlin/src/java/org/apache/eve/merlin/listener/MerlinListenerManager.java
incubator/directory/eve/trunk/frontend/merlin/src/java/org/apache/eve/merlin/output/MerlinOutputManager.java
incubator/directory/eve/trunk/frontend/merlin/src/java/org/apache/eve/merlin/processor/MerlinRequestProcessor.java
Log:
Committing all imports that need to be added now after package
name changes.
Modified: incubator/directory/eve/trunk/frontend/merlin/src/java/org/apache/eve/merlin/MerlinFrontend.java
==============================================================================
--- incubator/directory/eve/trunk/frontend/merlin/src/java/org/apache/eve/merlin/MerlinFrontend.java (original)
+++ incubator/directory/eve/trunk/frontend/merlin/src/java/org/apache/eve/merlin/MerlinFrontend.java Wed Sep 1 00:21:35 2004
@@ -31,6 +31,7 @@
import org.apache.eve.encoder.EncoderManager ;
import org.apache.eve.listener.ListenerManager ;
import org.apache.eve.processor.RequestProcessor ;
+import org.apache.eve.Frontend;
/**
@@ -46,8 +47,8 @@
* @version $Rev$
*/
public class MerlinFrontend
- implements
- Frontend,
+ implements
+ Frontend,
Serviceable
{
BufferPool m_bufferPool = null ;
Modified: incubator/directory/eve/trunk/frontend/merlin/src/java/org/apache/eve/merlin/buffer/AvalonLoggingMonitor.java
==============================================================================
--- incubator/directory/eve/trunk/frontend/merlin/src/java/org/apache/eve/merlin/buffer/AvalonLoggingMonitor.java (original)
+++ incubator/directory/eve/trunk/frontend/merlin/src/java/org/apache/eve/merlin/buffer/AvalonLoggingMonitor.java Wed Sep 1 00:21:35 2004
@@ -21,6 +21,8 @@
import org.apache.avalon.framework.logger.AbstractLogEnabled ;
import org.apache.commons.lang.ClassUtils;
+import org.apache.eve.buffer.BufferPoolMonitor;
+import org.apache.eve.buffer.BufferPool;
/**
Modified: incubator/directory/eve/trunk/frontend/merlin/src/java/org/apache/eve/merlin/buffer/MerlinBufferPool.java
==============================================================================
--- incubator/directory/eve/trunk/frontend/merlin/src/java/org/apache/eve/merlin/buffer/MerlinBufferPool.java (original)
+++ incubator/directory/eve/trunk/frontend/merlin/src/java/org/apache/eve/merlin/buffer/MerlinBufferPool.java Wed Sep 1 00:21:35 2004
@@ -20,6 +20,10 @@
import java.nio.ByteBuffer ;
import org.apache.eve.ResourceException ;
+import org.apache.eve.buffer.BufferPool;
+import org.apache.eve.buffer.DefaultBufferPool;
+import org.apache.eve.buffer.BufferPoolConfig;
+import org.apache.eve.buffer.DefaultBufferPoolConfig;
import org.apache.avalon.framework.activity.Initializable ;
import org.apache.avalon.framework.logger.AbstractLogEnabled ;
@@ -32,7 +36,7 @@
* A Merlin BufferPool service.
*
* @avalon.component name="buffer-pool" lifestyle="singleton"
- * @avalon.service type="org.apache.eve.buffer.BufferPool" version="1.0"
+ * @avalon.service type="org.apache.eve.buffer.BufferPool" version="1.0"
* @avalon.attribute key="urn:composition:deployment.timeout" value="6000"
*
* @author <a href="mailto:directory-dev@incubator.apache.org">
@@ -172,7 +176,7 @@
int l_size = Integer.parseInt( a_config
.getChild( "bufferSize" ).getValue() ) ;
- m_config = new DefaultBufferPoolConfig( l_name, l_inc, l_max,
+ m_config = new DefaultBufferPoolConfig( l_name, l_inc, l_max,
l_ini, l_size ) ;
if ( getLogger().isInfoEnabled() )
Modified: incubator/directory/eve/trunk/frontend/merlin/src/java/org/apache/eve/merlin/decoder/MerlinDecoderManager.java
==============================================================================
--- incubator/directory/eve/trunk/frontend/merlin/src/java/org/apache/eve/merlin/decoder/MerlinDecoderManager.java (original)
+++ incubator/directory/eve/trunk/frontend/merlin/src/java/org/apache/eve/merlin/decoder/MerlinDecoderManager.java Wed Sep 1 00:21:35 2004
@@ -27,6 +27,8 @@
import org.apache.eve.event.EventRouter ;
import org.apache.eve.listener.ClientKey ;
import org.apache.eve.decoder.DecoderManager ;
+import org.apache.eve.decoder.DefaultDecoderManager;
+import org.apache.eve.decoder.DecodeStageHandler;
import org.apache.eve.seda.DefaultStageConfig ;
import org.apache.avalon.framework.logger.Logger ;
Modified: incubator/directory/eve/trunk/frontend/merlin/src/java/org/apache/eve/merlin/encoder/MerlinEncoderManager.java
==============================================================================
--- incubator/directory/eve/trunk/frontend/merlin/src/java/org/apache/eve/merlin/encoder/MerlinEncoderManager.java (original)
+++ incubator/directory/eve/trunk/frontend/merlin/src/java/org/apache/eve/merlin/encoder/MerlinEncoderManager.java Wed Sep 1 00:21:35 2004
@@ -24,6 +24,7 @@
import org.apache.eve.seda.DefaultStageConfig ;
import org.apache.eve.encoder.EncoderManager ;
+import org.apache.eve.encoder.DefaultEncoderManager;
import org.apache.ldap.common.message.Response;
import org.apache.avalon.framework.logger.Logger ;
@@ -46,7 +47,7 @@
* @avalon.component name="encoder-manager" lifestyle="singleton"
* @avalon.service type="org.apache.eve.encoder.EncoderManager"
* version="1.0"
- * @avalon.attribute key="urn:composition:deployment.timeout" value="6000"
+ * @avalon.attribute key="urn:composition:deployment.timeout" value="6000"
*
* @author <a href="mailto:directory-dev@incubator.apache.org">
* Apache Directory Project</a>
Modified: incubator/directory/eve/trunk/frontend/merlin/src/java/org/apache/eve/merlin/event/MerlinEventRouter.java
==============================================================================
--- incubator/directory/eve/trunk/frontend/merlin/src/java/org/apache/eve/merlin/event/MerlinEventRouter.java (original)
+++ incubator/directory/eve/trunk/frontend/merlin/src/java/org/apache/eve/merlin/event/MerlinEventRouter.java Wed Sep 1 00:21:35 2004
@@ -21,6 +21,7 @@
import org.apache.avalon.framework.activity.Initializable ;
import org.apache.avalon.framework.logger.AbstractLogEnabled ;
+import org.apache.eve.event.*;
/**
@@ -35,9 +36,7 @@
* @version $Rev$
*/
public class MerlinEventRouter extends AbstractLogEnabled
- implements
- EventRouter,
- Initializable
+ implements EventRouter, Initializable
{
/** the default EventRouter implementation we wrap */
private DefaultEventRouter m_router ;
Modified: incubator/directory/eve/trunk/frontend/merlin/src/java/org/apache/eve/merlin/input/AvalonInputManagerMonitor.java
==============================================================================
--- incubator/directory/eve/trunk/frontend/merlin/src/java/org/apache/eve/merlin/input/AvalonInputManagerMonitor.java (original)
+++ incubator/directory/eve/trunk/frontend/merlin/src/java/org/apache/eve/merlin/input/AvalonInputManagerMonitor.java Wed Sep 1 00:21:35 2004
@@ -26,6 +26,7 @@
import org.apache.avalon.framework.logger.AbstractLogEnabled ;
import org.apache.eve.ResourceException ;
+import org.apache.eve.input.InputManagerMonitor;
import org.apache.eve.buffer.BufferPool ;
import org.apache.eve.listener.ClientKey ;
import org.apache.eve.listener.KeyExpiryException ;
Modified: incubator/directory/eve/trunk/frontend/merlin/src/java/org/apache/eve/merlin/input/MerlinInputManager.java
==============================================================================
--- incubator/directory/eve/trunk/frontend/merlin/src/java/org/apache/eve/merlin/input/MerlinInputManager.java (original)
+++ incubator/directory/eve/trunk/frontend/merlin/src/java/org/apache/eve/merlin/input/MerlinInputManager.java Wed Sep 1 00:21:35 2004
@@ -30,6 +30,8 @@
import org.apache.eve.buffer.BufferPool ;
import org.apache.eve.event.EventRouter ;
+import org.apache.eve.input.DefaultInputManager;
+import org.apache.eve.input.InputManager;
/**
@@ -44,7 +46,7 @@
*/
public class MerlinInputManager extends AbstractLogEnabled
implements
- InputManager,
+ InputManager,
Serviceable,
Startable,
Initializable
Modified: incubator/directory/eve/trunk/frontend/merlin/src/java/org/apache/eve/merlin/listener/AvalonListenerManagerMonitor.java
==============================================================================
--- incubator/directory/eve/trunk/frontend/merlin/src/java/org/apache/eve/merlin/listener/AvalonListenerManagerMonitor.java (original)
+++ incubator/directory/eve/trunk/frontend/merlin/src/java/org/apache/eve/merlin/listener/AvalonListenerManagerMonitor.java Wed Sep 1 00:21:35 2004
@@ -55,6 +55,9 @@
import java.nio.channels.SelectionKey ;
import org.apache.avalon.framework.logger.AbstractLogEnabled ;
+import org.apache.eve.listener.ListenerManagerMonitor;
+import org.apache.eve.listener.ServerListener;
+import org.apache.eve.listener.ClientKey;
/**
Modified: incubator/directory/eve/trunk/frontend/merlin/src/java/org/apache/eve/merlin/listener/MerlinListenerManager.java
==============================================================================
--- incubator/directory/eve/trunk/frontend/merlin/src/java/org/apache/eve/merlin/listener/MerlinListenerManager.java (original)
+++ incubator/directory/eve/trunk/frontend/merlin/src/java/org/apache/eve/merlin/listener/MerlinListenerManager.java Wed Sep 1 00:21:35 2004
@@ -71,6 +71,10 @@
import org.apache.commons.lang.StringUtils ;
import org.apache.eve.event.EventRouter ;
+import org.apache.eve.listener.LdapServerListener;
+import org.apache.eve.listener.ListenerManager;
+import org.apache.eve.listener.DefaultListenerManager;
+import org.apache.eve.listener.ServerListener;
/**
@@ -85,8 +89,8 @@
* @version $Rev$
*/
public class MerlinListenerManager extends AbstractLogEnabled
- implements
- ListenerManager,
+ implements
+ ListenerManager,
Initializable,
Configurable,
Serviceable,
@@ -108,8 +112,8 @@
/**
- * @see org.apache.eve.listener.ListenerManager#register(org.apache.eve.
- * listener.ServerListener)
+ * @see org.apache.eve.listener.ListenerManager#
+ * bind(org.apache.eve.listener.ServerListener)
*/
public void bind( ServerListener a_listener ) throws IOException
{
@@ -118,8 +122,8 @@
/**
- * @see org.apache.eve.listener.ListenerManager#unregister(org.apache.eve.
- * listener.ServerListener)
+ * @see org.apache.eve.listener.ListenerManager#
+ * unbind(org.apache.eve.listener.ServerListener)
*/
public void unbind( ServerListener a_listener ) throws IOException
{
Modified: incubator/directory/eve/trunk/frontend/merlin/src/java/org/apache/eve/merlin/output/MerlinOutputManager.java
==============================================================================
--- incubator/directory/eve/trunk/frontend/merlin/src/java/org/apache/eve/merlin/output/MerlinOutputManager.java (original)
+++ incubator/directory/eve/trunk/frontend/merlin/src/java/org/apache/eve/merlin/output/MerlinOutputManager.java Wed Sep 1 00:21:35 2004
@@ -37,6 +37,7 @@
import org.apache.eve.event.EventRouter ;
import org.apache.eve.listener.ClientKey ;
import org.apache.eve.output.OutputManager ;
+import org.apache.eve.output.DefaultOutputManager;
import org.apache.eve.seda.DefaultStageConfig ;
Modified: incubator/directory/eve/trunk/frontend/merlin/src/java/org/apache/eve/merlin/processor/MerlinRequestProcessor.java
==============================================================================
--- incubator/directory/eve/trunk/frontend/merlin/src/java/org/apache/eve/merlin/processor/MerlinRequestProcessor.java (original)
+++ incubator/directory/eve/trunk/frontend/merlin/src/java/org/apache/eve/merlin/processor/MerlinRequestProcessor.java Wed Sep 1 00:21:35 2004
@@ -22,6 +22,9 @@
import org.apache.eve.seda.DefaultStageConfig ;
import org.apache.eve.seda.StageMonitorAdapter;
import org.apache.eve.seda.LoggingStageMonitor;
+import org.apache.eve.processor.DefaultRequestProcessor;
+import org.apache.eve.processor.RequestProcessor;
+import org.apache.eve.processor.DefaultHandlerRegistry;
import org.apache.avalon.framework.logger.Logger ;
import org.apache.avalon.framework.logger.LogEnabled ;
@@ -50,8 +53,8 @@
* @version $Rev$
*/
public class MerlinRequestProcessor
- implements
- RequestProcessor,
+ implements
+ RequestProcessor,
LogEnabled,
Initializable,
Configurable,