directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From akaras...@apache.org
Subject svn commit: rev 9691 - in incubator/directory/eve/trunk/eve/frontend/listener/merlin-impl: . conf src/java/org/apache/eve/listener src/test src/test/org src/test/org/apache src/test/org/apache/eve src/test/org/apache/eve/listener
Date Tue, 23 Mar 2004 00:16:41 GMT
Author: akarasulu
Date: Mon Mar 22 16:16:40 2004
New Revision: 9691

Added:
   incubator/directory/eve/trunk/eve/frontend/listener/merlin-impl/src/test/
   incubator/directory/eve/trunk/eve/frontend/listener/merlin-impl/src/test/org/
   incubator/directory/eve/trunk/eve/frontend/listener/merlin-impl/src/test/org/apache/
   incubator/directory/eve/trunk/eve/frontend/listener/merlin-impl/src/test/org/apache/eve/
   incubator/directory/eve/trunk/eve/frontend/listener/merlin-impl/src/test/org/apache/eve/listener/
   incubator/directory/eve/trunk/eve/frontend/listener/merlin-impl/src/test/org/apache/eve/listener/MerlinListenerManagerTest.java
Modified:
   incubator/directory/eve/trunk/eve/frontend/listener/merlin-impl/conf/block.xml
   incubator/directory/eve/trunk/eve/frontend/listener/merlin-impl/project.xml
   incubator/directory/eve/trunk/eve/frontend/listener/merlin-impl/src/java/org/apache/eve/listener/MerlinListenerManager.xconfig
Log:
Setup a test case with merlin wrapper.


Modified: incubator/directory/eve/trunk/eve/frontend/listener/merlin-impl/conf/block.xml
==============================================================================
--- incubator/directory/eve/trunk/eve/frontend/listener/merlin-impl/conf/block.xml	(original)
+++ incubator/directory/eve/trunk/eve/frontend/listener/merlin-impl/conf/block.xml	Mon Mar
22 16:16:40 2004
@@ -7,12 +7,12 @@
       <repository>
         <resource id="commons-lang:commons-lang" version="2.0"/>
         <resource id="avalon-framework:avalon-framework-api" version="4.1.5"/>
-        <resource id="directory:eve-frontend-common-api" version="SNAPSHOT"/>
-        <resource id="directory:eve-frontend-event-spi" version="SNAPSHOT"/>
-        <resource id="directory:eve-frontend-event-pojo-impl" version="SNAPSHOT"/>
-        <resource id="directory:eve-frontend-event-merlin-impl" version="SNAPSHOT"/>
-        <resource id="directory:eve-frontend-listener-spi" version="SNAPSHOT"/>
-        <resource id="directory:eve-frontend-listener-pojo-impl" version="SNAPSHOT"/>
+        <resource id="incubator-directory:eve-frontend-common-api" version="SNAPSHOT"/>
+        <resource id="incubator-directory:eve-frontend-event-spi" version="SNAPSHOT"/>
+        <resource id="incubator-directory:eve-frontend-event-pojo-impl" version="SNAPSHOT"/>
+        <resource id="incubator-directory:eve-frontend-event-merlin-impl" version="SNAPSHOT"/>
+        <resource id="incubator-directory:eve-frontend-listener-spi" version="SNAPSHOT"/>
+        <resource id="incubator-directory:eve-frontend-listener-pojo-impl" version="SNAPSHOT"/>
       </repository>
     </classpath>
   </classloader>

Modified: incubator/directory/eve/trunk/eve/frontend/listener/merlin-impl/project.xml
==============================================================================
--- incubator/directory/eve/trunk/eve/frontend/listener/merlin-impl/project.xml	(original)
+++ incubator/directory/eve/trunk/eve/frontend/listener/merlin-impl/project.xml	Mon Mar 22
16:16:40 2004
@@ -1,88 +1,179 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <project>
-    <extend>${basedir}/../../../project.xml</extend>
-    <groupId>incubator-directory</groupId>
-    <id>eve-frontend-listener-merlin-impl</id>
+  <extend>${basedir}/../../../project.xml</extend>
+  <groupId>incubator-directory</groupId>
+  <id>eve-frontend-listener-merlin-impl</id>
   
-    <name>Eve Frontend Listener Merlin Wrapper Implementation</name>
-    <package>org.apache.eve.listener</package>
-    <currentVersion>SNAPSHOT</currentVersion>
-    <inceptionYear>2003</inceptionYear>
+  <name>Eve Frontend Listener Merlin Wrapper Implementation</name>
+  <package>org.apache.eve.listener</package>
+  <currentVersion>SNAPSHOT</currentVersion>
+  <inceptionYear>2003</inceptionYear>
   	
-    <shortDescription>
-	Eve's Frontend Listener Implementation
-    </shortDescription>
-
-    <description>
-        Eve's frontend listener manager binds server sockets as server
-        listeners to ports dynamically at configuration time and at runtime.
-        The listener implementation uses non-blocking IO to detect incomming
-        connections as well as managing the binds and unbinds of server sockets.
-    </description>
+  <shortDescription>
+    Eve's Frontend Listener Implementation
+  </shortDescription>
+
+  <description>
+    Eve's frontend listener manager binds server sockets as server
+    listeners to ports dynamically at configuration time and at runtime.
+    The listener implementation uses non-blocking IO to detect incomming
+    connections as well as managing the binds and unbinds of server sockets.
+  </description>
   	
     <dependencies>
-        <dependency>
-            <groupId>commons-lang</groupId>
-            <artifactId>commons-lang</artifactId>
-            <version>2.0</version>
-            <url>http://jakarata.apache.org/commons/lang</url>
-        </dependency>
-
-        <dependency>
-            <groupId>avalon-framework</groupId>
-            <artifactId>avalon-framework-api</artifactId>
-            <version>4.1.5</version>
-            <url>http://avalon.apache.org/framework</url>
-        </dependency>
-
-        <dependency>
-            <groupId>incubator-directory</groupId>
-            <artifactId>eve-frontend-common-api</artifactId>
-            <version>SNAPSHOT</version>
-            <url>http://directory.apache.org</url>
-        </dependency>
-
-        <dependency>
-            <groupId>incubator-directory</groupId>
-            <artifactId>eve-frontend-event-spi</artifactId>
-            <version>SNAPSHOT</version>
-            <url>http://directory.apache.org</url>
-        </dependency>
-
-        <dependency>
-            <groupId>incubator-directory</groupId>
-            <artifactId>eve-frontend-event-pojo-impl</artifactId>
-            <version>SNAPSHOT</version>
-            <url>http://directory.apache.org</url>
-        </dependency>
-
-        <dependency>
-            <groupId>incubator-directory</groupId>
-            <artifactId>eve-frontend-event-merlin-impl</artifactId>
-            <version>SNAPSHOT</version>
-            <url>http://directory.apache.org</url>
-        </dependency>
-
-        <dependency>
-            <groupId>incubator-directory</groupId>
-            <artifactId>eve-frontend-listener-spi</artifactId>
-            <version>SNAPSHOT</version>
-            <url>http://directory.apache.org</url>
-        </dependency>
-
-        <dependency>
-            <groupId>incubator-directory</groupId>
-            <artifactId>eve-frontend-listener-pojo-impl</artifactId>
-            <version>SNAPSHOT</version>
-            <url>http://directory.apache.org</url>
-        </dependency>
-
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>3.8.1</version>
-            <url>http://junit.org</url>
-        </dependency>
+      <!-- Non-Apache Dependencies -->
+
+      <dependency>
+        <groupId>junit</groupId>
+        <artifactId>junit</artifactId>
+        <version>3.8.1</version>
+        <url>http://junit.org</url>
+      </dependency>
+
+      <!-- Jakarta & Commons Dependencies -->
+      
+      <dependency>
+        <groupId>commons-lang</groupId>
+        <artifactId>commons-lang</artifactId>
+        <version>2.0</version>
+        <url>http://jakarta.apache.org/commons/lang</url>
+      </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>
+        <url>http://jakarta.apache.org/commons/collections</url>
+      </dependency>
+    
+      <!-- Avalon Dependencies -->
+      
+      <dependency>
+        <groupId>merlin</groupId>
+        <artifactId>merlin-unit</artifactId>
+        <version>3.2.10</version>
+      </dependency>
+      
+      <!-- for some reason this is needed for merlin-unit tests     -->
+      <!-- but it is not needed when when using command line merlin -->
+      <!-- within the block.xml's classloader directive             -->
+      
+      <dependency>
+        <groupId>logkit</groupId>
+        <artifactId>logkit</artifactId>
+        <version>1.2.2</version>
+      </dependency>
+      
+      <dependency>
+        <groupId>avalon-framework</groupId>
+        <artifactId>avalon-framework-api</artifactId>
+        <version>4.1.5</version>
+        <url>http://avalon.apache.org/framework</url>
+      </dependency>
+
+      <dependency>
+        <groupId>avalon-framework</groupId>
+        <artifactId>avalon-framework-impl</artifactId>
+        <version>4.1.5</version>
+        <url>http://avalon.apache.org/framework</url>
+      </dependency>
+
+      <dependency>
+        <groupId>excalibur-instrument</groupId>
+        <artifactId>excalibur-instrument</artifactId>
+        <version>1.0</version>
+      </dependency>
+
+      <dependency>
+        <groupId>excalibur-thread</groupId>
+        <artifactId>excalibur-thread</artifactId>
+        <version>1.1.1</version>
+      </dependency>
+
+      <dependency>
+        <groupId>excalibur-event</groupId>
+        <artifactId>excalibur-event</artifactId>
+        <version>1.0.3</version>
+      </dependency>
+
+      <dependency>
+        <groupId>excalibur-pool</groupId>
+        <artifactId>excalibur-pool</artifactId>
+        <version>1.2</version>
+      </dependency>
+
+      <dependency>
+        <groupId>cornerstone-threads</groupId>
+        <artifactId>cornerstone-threads-api</artifactId>
+        <version>SNAPSHOT</version>
+      </dependency>
+
+      <dependency>
+        <groupId>cornerstone-threads</groupId>
+        <artifactId>cornerstone-threads-impl</artifactId>
+        <version>SNAPSHOT</version>
+      </dependency>
+
+      <!-- Directory Dependencies -->
+      
+      <dependency>
+        <groupId>incubator-directory</groupId>
+        <artifactId>eve-frontend-common-api</artifactId>
+        <version>SNAPSHOT</version>
+        <url>
+          http://incubator.apache.org/directory/subprojects/eve/common/api
+        </url>
+      </dependency>
+
+      <!-- Eve Event -->
+
+      <dependency>
+        <groupId>incubator-directory</groupId>
+        <artifactId>eve-frontend-event-spi</artifactId>
+        <version>SNAPSHOT</version>
+        <url>
+          http://incubator.apache.org/directory/subprojects/eve/event/spi
+        </url>
+      </dependency>
+
+      <dependency>
+        <groupId>incubator-directory</groupId>
+        <artifactId>eve-frontend-event-pojo-impl</artifactId>
+        <version>SNAPSHOT</version>
+        <url>
+          http://incubator.apache.org/directory/subprojects/eve/event/pojo-impl
+        </url>
+      </dependency>
+
+      <dependency>
+        <groupId>incubator-directory</groupId>
+        <artifactId>eve-frontend-event-merlin-impl</artifactId>
+        <version>SNAPSHOT</version>
+        <url>
+         http://incubator.apache.org/directory/subprojects/eve/event/merlin-impl
+        </url>
+      </dependency>
+
+      <dependency>
+        <groupId>incubator-directory</groupId>
+        <artifactId>eve-frontend-listener-spi</artifactId>
+        <version>SNAPSHOT</version>
+        <url>http://directory.apache.org</url>
+      </dependency>
+
+      <dependency>
+        <groupId>incubator-directory</groupId>
+        <artifactId>eve-frontend-listener-pojo-impl</artifactId>
+        <version>SNAPSHOT</version>
+        <url>http://directory.apache.org</url>
+      </dependency>
     </dependencies>
 </project>
 

Modified: incubator/directory/eve/trunk/eve/frontend/listener/merlin-impl/src/java/org/apache/eve/listener/MerlinListenerManager.xconfig
==============================================================================
--- incubator/directory/eve/trunk/eve/frontend/listener/merlin-impl/src/java/org/apache/eve/listener/MerlinListenerManager.xconfig
(original)
+++ incubator/directory/eve/trunk/eve/frontend/listener/merlin-impl/src/java/org/apache/eve/listener/MerlinListenerManager.xconfig
Mon Mar 22 16:16:40 2004
@@ -3,7 +3,7 @@
 <configuration>
   <listeners>
     <listener>
-      <port>389</port>
+      <port>15389</port>
       <host>localhost</host>
       <backlog>250</backlog>
       <isSecure>false</isSecure>

Added: incubator/directory/eve/trunk/eve/frontend/listener/merlin-impl/src/test/org/apache/eve/listener/MerlinListenerManagerTest.java
==============================================================================
--- (empty file)
+++ incubator/directory/eve/trunk/eve/frontend/listener/merlin-impl/src/test/org/apache/eve/listener/MerlinListenerManagerTest.java
Mon Mar 22 16:16:40 2004
@@ -0,0 +1,77 @@
+/*
+ *   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.eve.listener ;
+
+
+import org.apache.eve.event.EventRouter ;
+
+import org.apache.avalon.merlin.unit.AbstractMerlinTestCase ;
+
+
+/**
+ * Tests the listener out.
+ *
+ * @author <a href="mailto:directory-dev@incubator.apache.org">
+ * Apache Directory Project</a>
+ * @version $Rev$
+ */
+public class MerlinListenerManagerTest extends AbstractMerlinTestCase
+{
+    EventRouter router = null ;
+    ListenerManager listener = null ;
+
+    /*
+     * @see AbstractMerlinTestCase#setUp()
+     */
+    public void setUp() throws Exception
+    {
+        super.setUp() ;
+        router = ( EventRouter ) resolve( "/server/event-router" ) ; 
+        listener = ( ListenerManager ) resolve( "/server/listener-manager" ) ;
+    }
+    
+
+    /*
+     * @see AbstractMerlinTestCase#tearDown()
+     */
+    public void tearDown()
+    {
+        super.tearDown() ;
+    }
+    
+
+    /**
+     * Constructor for MerlinListenerManagerTest.
+     * @param arg0
+     */
+    public MerlinListenerManagerTest(String arg0)
+    {
+        super( arg0 ) ;
+    }
+
+    
+    public void testBind()
+    {
+    }
+
+
+    public void testBind2()
+    {
+    }
+}
+
+

Mime
View raw message