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/03/22 11:41:15 UTC
svn commit: rev 9678 - in incubator/directory/eve/trunk/eve/frontend/output/merlin-impl: . conf src/java/org/apache/eve/output/impl src/test/org/apache/eve/output/impl
Author: akarasulu
Date: Mon Mar 22 02:41:14 2004
New Revision: 9678
Modified:
incubator/directory/eve/trunk/eve/frontend/output/merlin-impl/conf/block.xml
incubator/directory/eve/trunk/eve/frontend/output/merlin-impl/project.xml
incubator/directory/eve/trunk/eve/frontend/output/merlin-impl/src/java/org/apache/eve/output/impl/MerlinOutputManager.java
incubator/directory/eve/trunk/eve/frontend/output/merlin-impl/src/test/org/apache/eve/output/impl/MerlinOutputManagerTest.java
Log:
filled out the merlin wrapper implementation
Modified: incubator/directory/eve/trunk/eve/frontend/output/merlin-impl/conf/block.xml
==============================================================================
--- incubator/directory/eve/trunk/eve/frontend/output/merlin-impl/conf/block.xml (original)
+++ incubator/directory/eve/trunk/eve/frontend/output/merlin-impl/conf/block.xml Mon Mar 22 02:41:14 2004
@@ -27,6 +27,7 @@
<resource id="commons-collections:commons-collections" version="3.0"/>
<resource id="commons-primitives:commons-primitives" version="1.1-dev"/>
<resource id="commons-lang:commons-lang" version="2.0"/>
+ <resource id="commons-logging:commons-logging" version="1.0.3"/>
<!-- Directory Dependencies -->
@@ -38,7 +39,7 @@
<resource id="incubator-directory:eve-frontend-event-pojo-impl" version="SNAPSHOT"/>
<resource id="incubator-directory:eve-frontend-event-merlin-impl" version="SNAPSHOT"/>
- <!-- Eve Decoder -->
+ <!-- Eve Output -->
<resource id="incubator-directory:eve-frontend-output-spi" version="SNAPSHOT"/>
<resource id="incubator-directory:eve-frontend-output-pojo-impl" version="SNAPSHOT"/>
Modified: incubator/directory/eve/trunk/eve/frontend/output/merlin-impl/project.xml
==============================================================================
--- incubator/directory/eve/trunk/eve/frontend/output/merlin-impl/project.xml (original)
+++ incubator/directory/eve/trunk/eve/frontend/output/merlin-impl/project.xml Mon Mar 22 02:41:14 2004
@@ -36,6 +36,13 @@
</dependency>
<dependency>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ <version>1.0.3</version>
+ <url>http://jakarta.apache.org/commons/logging</url>
+ </dependency>
+
+ <dependency>
<groupId>commons-collections</groupId>
<artifactId>commons-collections</artifactId>
<version>3.0</version>
Modified: incubator/directory/eve/trunk/eve/frontend/output/merlin-impl/src/java/org/apache/eve/output/impl/MerlinOutputManager.java
==============================================================================
--- incubator/directory/eve/trunk/eve/frontend/output/merlin-impl/src/java/org/apache/eve/output/impl/MerlinOutputManager.java (original)
+++ incubator/directory/eve/trunk/eve/frontend/output/merlin-impl/src/java/org/apache/eve/output/impl/MerlinOutputManager.java Mon Mar 22 02:41:14 2004
@@ -17,11 +17,8 @@
package org.apache.eve.output.impl ;
-import org.apache.eve.thread.ThreadPool ;
-import org.apache.eve.event.EventRouter ;
-import org.apache.eve.seda.DefaultStageConfig ;
-
-import org.apache.eve.output.OutputManager ;
+import java.io.IOException ;
+import java.nio.ByteBuffer ;
import org.apache.avalon.framework.logger.Logger ;
import org.apache.avalon.framework.logger.LogEnabled ;
@@ -36,9 +33,15 @@
import org.apache.avalon.cornerstone.services.threads.ThreadManager ;
+import org.apache.eve.thread.ThreadPool ;
+import org.apache.eve.event.EventRouter ;
+import org.apache.eve.listener.ClientKey ;
+import org.apache.eve.output.OutputManager ;
+import org.apache.eve.seda.DefaultStageConfig ;
+
/**
- * A Merlin output manager.
+ * A Merlin output manager wrapper.
*
* @avalon.component name="output-manager" lifestyle="singleton"
* @avalon.service type="org.apache.eve.output.OutputManager"
@@ -75,10 +78,12 @@
/* (non-Javadoc)
- * @see org.apache.eve.output.OuputManager#dummy()
+ * @see org.apache.eve.output.OutputManager#write(
+ * org.apache.eve.listener.ClientKey, java.nio.ByteBuffer)
*/
- public void dummy()
+ public void write( ClientKey key, ByteBuffer buf ) throws IOException
{
+ outputManager.write( key, buf ) ;
}
@@ -142,7 +147,7 @@
*/
public void initialize() throws Exception
{
- //throw new NotImplementedException( "STUB" ) ;
+ outputManager = new DefaultOutputManager( router, stageConfig ) ;
}
@@ -151,7 +156,7 @@
*/
public void start() throws Exception
{
- //throw new NotImplementedException( "STUB" ) ;
+ outputManager.start() ;
}
@@ -160,6 +165,6 @@
*/
public void stop() throws Exception
{
- //throw new NotImplementedException( "STUB" ) ;
+ outputManager.stop() ;
}
}
Modified: incubator/directory/eve/trunk/eve/frontend/output/merlin-impl/src/test/org/apache/eve/output/impl/MerlinOutputManagerTest.java
==============================================================================
--- incubator/directory/eve/trunk/eve/frontend/output/merlin-impl/src/test/org/apache/eve/output/impl/MerlinOutputManagerTest.java (original)
+++ incubator/directory/eve/trunk/eve/frontend/output/merlin-impl/src/test/org/apache/eve/output/impl/MerlinOutputManagerTest.java Mon Mar 22 02:41:14 2004
@@ -67,8 +67,7 @@
}
- public void testDummy()
+ public void testPlacebo()
{
- outman.dummy() ;
}
}