Author: akarasulu
Date: Mon Jul 5 12:06:21 2004
New Revision: 22602
Modified:
incubator/directory/eve/branches/consolidation/frontend/api/ (props
changed)
incubator/directory/eve/branches/consolidation/frontend/impl/ (props
changed)
incubator/directory/eve/branches/consolidation/frontend/impl/project.xml
incubator/directory/eve/branches/consolidation/frontend/impl/src/java/org/apache/eve/processor/DefaultRequestProcessor.java
incubator/directory/eve/branches/consolidation/frontend/merlin/ (props
changed)
incubator/directory/eve/branches/consolidation/frontend/merlin/project.xml
incubator/directory/eve/branches/consolidation/frontend/merlin/src/java/org/apache/eve/processor/MerlinRequestProcessor.java
incubator/directory/eve/branches/consolidation/frontend/test/ (props
changed)
incubator/directory/eve/branches/consolidation/frontend/test/project.xml
incubator/directory/eve/branches/consolidation/frontend/test/src/test/org/apache/eve/encoder/MerlinEncoderManagerTest.java
incubator/directory/eve/branches/consolidation/frontend/test/src/test/org/apache/eve/processor/MerlinRequestProcessorTest.java
Log:
Commit changes ...
o Added a few missing dependencies to project files
o Fixed timing dependent test cases that lead to failures for Steve and not
myself.
Modified:
incubator/directory/eve/branches/consolidation/frontend/impl/project.xml
==============================================================================
--- incubator/directory/eve/branches/consolidation/frontend/impl/project.xml
(original)
+++ incubator/directory/eve/branches/consolidation/frontend/impl/project.xml
Mon Jul 5 12:06:21 2004
@@ -26,6 +26,15 @@
</dependency>
<!-- THE DEPENDENCY KEEPING USE IN INCUBATOR -->
+ <dependency>
+ <groupId>concurrent</groupId>
+ <artifactId>concurrent</artifactId>
+ <version>1.3.1</version>
+ <url>
+http://gee.cs.oswego.edu/dl/classes/EDU/oswego/cs/dl/util/concurrent/intro.html
+ </url>
+ </dependency>
+
<!-- We need to get rid of this dependency on commons-codec -->
<dependency>
<groupId>commons-codec</groupId>
@@ -39,6 +48,13 @@
<artifactId>commons-lang</artifactId>
<version>2.0</version>
<url>http://jakarta.apache.org/commons/lang</url>
+ </dependency>
+
+ <dependency>
+ <groupId>commons-collections</groupId>
+ <artifactId>commons-collections</artifactId>
+ <version>2.1</version>
+ <url>http://jakarta.apache.org/commons/collections</url>
</dependency>
<dependency>
Modified:
incubator/directory/eve/branches/consolidation/frontend/impl/src/java/org/apache/eve/processor/DefaultRequestProcessor.java
==============================================================================
---
incubator/directory/eve/branches/consolidation/frontend/impl/src/java/org/apache/eve/processor/DefaultRequestProcessor.java
(original)
+++
incubator/directory/eve/branches/consolidation/frontend/impl/src/java/org/apache/eve/processor/DefaultRequestProcessor.java
Mon Jul 5 12:06:21 2004
@@ -36,16 +36,6 @@
import org.apache.eve.seda.DefaultStageConfig ;
import org.apache.eve.seda.LoggingStageMonitor;
-import org.apache.eve.processor.NoReplyHandler ;
-import org.apache.eve.processor.RequestHandler ;
-import org.apache.eve.processor.HandlerRegistry ;
-import org.apache.eve.processor.HandlerTypeEnum ;
-import org.apache.eve.processor.ManyReplyHandler ;
-import org.apache.eve.processor.RequestProcessor ;
-import org.apache.eve.processor.SingleReplyHandler ;
-import org.apache.eve.processor.RequestProcessorMonitor ;
-import org.apache.eve.processor.RequestProcessorMonitorAdapter ;
-
import org.apache.ldap.common.message.Request ;
import org.apache.ldap.common.message.Response ;
import org.apache.ldap.common.message.LdapResult ;
@@ -133,7 +123,7 @@
/**
* Event handler method for processing RequestEvents.
*
- * @param event the RequestEvent to process.
+ * @param unspecific the RequestEvent to process.
*/
public void handleEvent( EventObject unspecific )
{
Modified:
incubator/directory/eve/branches/consolidation/frontend/merlin/project.xml
==============================================================================
--- incubator/directory/eve/branches/consolidation/frontend/merlin/project.xml
(original)
+++ incubator/directory/eve/branches/consolidation/frontend/merlin/project.xml
Mon Jul 5 12:06:21 2004
@@ -130,6 +130,13 @@
</dependency>
<dependency>
+ <groupId>commons-collections</groupId>
+ <artifactId>commons-collections</artifactId>
+ <version>2.1</version>
+ <url>http://jakarta.apache.org/commons/collections</url>
+ </dependency>
+
+ <dependency>
<groupId>commons-primitives</groupId>
<artifactId>commons-primitives</artifactId>
<version>1.1-dev</version>
@@ -140,6 +147,15 @@
<!-- O T H E R D E N D E N C I E S -->
<!-- =============================================================== -->
+ <dependency>
+ <groupId>concurrent</groupId>
+ <artifactId>concurrent</artifactId>
+ <version>1.3.1</version>
+ <url>
+http://gee.cs.oswego.edu/dl/classes/EDU/oswego/cs/dl/util/concurrent/intro.html
+ </url>
+ </dependency>
+
<dependency>
<groupId>regexp</groupId>
<artifactId>regexp</artifactId>
Modified:
incubator/directory/eve/branches/consolidation/frontend/merlin/src/java/org/apache/eve/processor/MerlinRequestProcessor.java
==============================================================================
---
incubator/directory/eve/branches/consolidation/frontend/merlin/src/java/org/apache/eve/processor/MerlinRequestProcessor.java
(original)
+++
incubator/directory/eve/branches/consolidation/frontend/merlin/src/java/org/apache/eve/processor/MerlinRequestProcessor.java
Mon Jul 5 12:06:21 2004
@@ -21,8 +21,7 @@
import org.apache.eve.event.EventRouter ;
import org.apache.eve.seda.DefaultStageConfig ;
import org.apache.eve.seda.StageMonitorAdapter;
-
-import org.apache.eve.processor.RequestProcessor ;
+import org.apache.eve.seda.LoggingStageMonitor;
import org.apache.avalon.framework.logger.Logger ;
import org.apache.avalon.framework.logger.LogEnabled ;
@@ -43,7 +42,7 @@
*
* @avalon.component name="request-processor" lifestyle="singleton"
* @avalon.service type="org.apache.eve.processor.RequestProcessor"
- * version="1.0"
+ * version="1.0"
* @avalon.attribute key="urn:composition:deployment.timeout" value="6000"
*
* @author <a href="mailto:[EMAIL PROTECTED]">
@@ -142,7 +141,7 @@
DefaultHandlerRegistry hooks = new DefaultHandlerRegistry() ;
requestProcessor =
new DefaultRequestProcessor( router, stageConfig, hooks ) ;
- requestProcessor.setMonitor( new StageMonitorAdapter() ) ;
+ requestProcessor.setMonitor( new LoggingStageMonitor() ) ;
}
Modified:
incubator/directory/eve/branches/consolidation/frontend/test/project.xml
==============================================================================
--- incubator/directory/eve/branches/consolidation/frontend/test/project.xml
(original)
+++ incubator/directory/eve/branches/consolidation/frontend/test/project.xml
Mon Jul 5 12:06:21 2004
@@ -133,6 +133,20 @@
</dependency>
<dependency>
+ <groupId>commons-collections</groupId>
+ <artifactId>commons-collections</artifactId>
+ <version>2.1</version>
+ <url>http://jakarta.apache.org/commons/collections</url>
+ </dependency>
+
+ <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>
@@ -149,6 +163,15 @@
<!-- =============================================================== -->
<!-- O T H E R A P A C H E D E N D E N C I E S -->
<!-- =============================================================== -->
+
+ <dependency>
+ <groupId>concurrent</groupId>
+ <artifactId>concurrent</artifactId>
+ <version>1.3.1</version>
+ <url>
+http://gee.cs.oswego.edu/dl/classes/EDU/oswego/cs/dl/util/concurrent/intro.html
+ </url>
+ </dependency>
<dependency>
<groupId>regexp</groupId>
Modified:
incubator/directory/eve/branches/consolidation/frontend/test/src/test/org/apache/eve/encoder/MerlinEncoderManagerTest.java
==============================================================================
---
incubator/directory/eve/branches/consolidation/frontend/test/src/test/org/apache/eve/encoder/MerlinEncoderManagerTest.java
(original)
+++
incubator/directory/eve/branches/consolidation/frontend/test/src/test/org/apache/eve/encoder/MerlinEncoderManagerTest.java
Mon Jul 5 12:06:21 2004
@@ -21,17 +21,17 @@
import org.apache.avalon.merlin.unit.AbstractMerlinTestCase ;
-import org.apache.eve.encoder.EncoderManager ;
-import org.apache.eve.event.AbstractSubscriber;
import org.apache.eve.event.EventRouter;
import org.apache.eve.event.OutputEvent;
-import org.apache.eve.event.OutputSubscriber;
import org.apache.eve.event.ResponseEvent;
-import org.apache.ldap.common.message.AddResponse;
-import org.apache.ldap.common.message.AddResponseImpl;
+import org.apache.eve.event.OutputSubscriber;
+import org.apache.eve.event.AbstractSubscriber;
+
import org.apache.ldap.common.message.LdapResult;
+import org.apache.ldap.common.message.AddResponse;
import org.apache.ldap.common.message.LdapResultImpl;
import org.apache.ldap.common.message.ResultCodeEnum;
+import org.apache.ldap.common.message.AddResponseImpl;
/**
Modified:
incubator/directory/eve/branches/consolidation/frontend/test/src/test/org/apache/eve/processor/MerlinRequestProcessorTest.java
==============================================================================
---
incubator/directory/eve/branches/consolidation/frontend/test/src/test/org/apache/eve/processor/MerlinRequestProcessorTest.java
(original)
+++
incubator/directory/eve/branches/consolidation/frontend/test/src/test/org/apache/eve/processor/MerlinRequestProcessorTest.java
Mon Jul 5 12:06:21 2004
@@ -114,6 +114,11 @@
}
+ // ------------------------------------------------------------------------
+ // T E S T C A S E S
+ // ------------------------------------------------------------------------
+
+
/**
* Tests the handling of an Abandon request.
*
@@ -126,9 +131,9 @@
RequestEvent e = new RequestEvent( this, null, req ) ;
router.publish( e ) ;
- // must wait for delivery - there has to be a better way
- Thread.sleep( 100 ) ;
-
+ // stop the kernel to get event delivery
+ super.tearDown();
+
// this message does not produce a response
assertNull( this.event ) ;
}
@@ -149,9 +154,9 @@
RequestEvent e = new RequestEvent( this, null, req ) ;
router.publish( e ) ;
- // prematurely stop processor to for event delivery
- Thread.sleep( 100 ) ;
-
+ // stop the kernel to get event delivery
+ super.tearDown();
+
// this message does not produce a response
assertNotNull( this.event ) ;
assertEquals( 5, this.event.getResponse().getMessageId() ) ;
