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 2003/12/10 07:22:17 UTC

svn commit: rev 1398 - in incubator/directory/ldap/trunk/eve/frontend/input: impl/conf impl/src/java/org/apache/eve/input spi

Author: akarasulu
Date: Tue Dec  9 22:22:16 2003
New Revision: 1398

Modified:
   incubator/directory/ldap/trunk/eve/frontend/input/impl/conf/block.xml
   incubator/directory/ldap/trunk/eve/frontend/input/impl/src/java/org/apache/eve/input/MerlinInputManager.java
   incubator/directory/ldap/trunk/eve/frontend/input/spi/project.xml
Log:
Corrected descriptors and meta-data to make merlin-simulate
work correctly.


Modified: incubator/directory/ldap/trunk/eve/frontend/input/impl/conf/block.xml
==============================================================================
--- incubator/directory/ldap/trunk/eve/frontend/input/impl/conf/block.xml	(original)
+++ incubator/directory/ldap/trunk/eve/frontend/input/impl/conf/block.xml	Tue Dec  9 22:22:16 2003
@@ -11,6 +11,7 @@
         <resource id="directory:eve-frontend-event-impl" version="SNAPSHOT"/>
         <resource id="directory:eve-frontend-buffer-spi" version="SNAPSHOT"/>
         <resource id="directory:eve-frontend-buffer-impl" version="SNAPSHOT"/>
+        <resource id="directory:eve-frontend-input-spi" version="SNAPSHOT"/>
       </repository>
     </classpath>
   </classloader>
@@ -19,6 +20,9 @@
     name="event-router" 
     class="org.apache.eve.event.MerlinEventRouter"/>
   <component
-    name="listener-manager" 
-    class="org.apache.eve.listener.MerlinListenerManager"/>
+    name="buffer-pool" 
+    class="org.apache.eve.buffer.MerlinBufferPool"/>
+  <component
+    name="input-manager" 
+    class="org.apache.eve.input.MerlinInputManager"/>
 </container>

Modified: incubator/directory/ldap/trunk/eve/frontend/input/impl/src/java/org/apache/eve/input/MerlinInputManager.java
==============================================================================
--- incubator/directory/ldap/trunk/eve/frontend/input/impl/src/java/org/apache/eve/input/MerlinInputManager.java	(original)
+++ incubator/directory/ldap/trunk/eve/frontend/input/impl/src/java/org/apache/eve/input/MerlinInputManager.java	Tue Dec  9 22:22:16 2003
@@ -70,6 +70,9 @@
 /**
  * A non-blocking input manager.
  * 
+ * @avalon.component name="input-manager" lifestyle="singleton"
+ * @avalon.service type="org.apache.eve.input.InputManager" version="1.0"
+ * 
  * @author <a href="mailto:aok123@bellsouth.net">Alex Karasulu</a>
  * @author $Author$
  * @version $Revision$
@@ -160,6 +163,11 @@
 
     
     /**
+     * @avalon.dependency type="org.apache.eve.event.EventRouter"
+     *         key="event-router" version="1.0" 
+     * @avalon.dependency type="org.apache.eve.buffer.BufferPool"
+     *         key="buffer-pool" version="1.0" 
+     * 
      * @see org.apache.avalon.framework.service.Serviceable#service(
      * org.apache.avalon.framework.service.ServiceManager)
      */

Modified: incubator/directory/ldap/trunk/eve/frontend/input/spi/project.xml
==============================================================================
--- incubator/directory/ldap/trunk/eve/frontend/input/spi/project.xml	(original)
+++ incubator/directory/ldap/trunk/eve/frontend/input/spi/project.xml	Tue Dec  9 22:22:16 2003
@@ -26,11 +26,18 @@
             <url>http://avalon.apache.org/framework</url>
         </dependency>
 
-	<dependency>
+        <dependency>
             <groupId>directory</groupId>
             <artifactId>eve-frontend-common-api</artifactId>
             <version>SNAPSHOT</version>
             <url>http://directory.apache.org/eve/frontend/common/api</url>
+        </dependency>
+
+        <dependency>
+            <groupId>directory</groupId>
+            <artifactId>eve-frontend-buffer-spi</artifactId>
+            <version>SNAPSHOT</version>
+            <url>http://directory.apache.org/eve/frontend/buffer/spi</url>
         </dependency>
 
         <dependency>