directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From akaras...@apache.org
Subject svn commit: rev 22609 - in incubator/directory/eve/trunk: backend/schema/matching-rule/bootstrap-impl backend/schema/oid/impl backend/schema/syntax/bootstrap-impl frontend/api frontend/impl frontend/impl/src/java/org/apache/eve/processor frontend/merlin frontend/merlin/src/java/org/apache/eve/buffer frontend/merlin/src/java/org/apache/eve/encoder frontend/merlin/src/java/org/apache/eve/processor frontend/merlin/src/test frontend/test frontend/test/etc frontend/test/etc/test frontend/test/src frontend/test/src/test frontend/test/src/test/org frontend/test/src/test/org/apache frontend/test/src/test/org/apache/eve frontend/test/src/test/org/apache/eve/buffer frontend/test/src/test/org/apache/eve/decoder frontend/test/src/test/org/apache/eve/encoder frontend/test/src/test/org/apache/eve/listener frontend/test/src/test/org/apache/eve/output frontend/test/src/test/org/apache/eve/processor
Date Tue, 06 Jul 2004 04:45:58 GMT
Author: akarasulu
Date: Mon Jul  5 21:45:57 2004
New Revision: 22609

Added:
   incubator/directory/eve/trunk/frontend/merlin/maven.xml
      - copied unchanged from rev 22602, incubator/directory/eve/branches/consolidation/frontend/merlin/maven.xml
   incubator/directory/eve/trunk/frontend/test/   (props changed)
      - copied from rev 22602, incubator/directory/eve/branches/consolidation/frontend/test/
   incubator/directory/eve/trunk/frontend/test/etc/
      - copied from rev 22602, incubator/directory/eve/branches/consolidation/frontend/test/etc/
   incubator/directory/eve/trunk/frontend/test/etc/test/
      - copied from rev 22602, incubator/directory/eve/branches/consolidation/frontend/test/etc/test/
   incubator/directory/eve/trunk/frontend/test/etc/test/test.block
      - copied unchanged from rev 22602, incubator/directory/eve/branches/consolidation/frontend/test/etc/test/test.block
   incubator/directory/eve/trunk/frontend/test/merlin.properties
      - copied unchanged from rev 22602, incubator/directory/eve/branches/consolidation/frontend/test/merlin.properties
   incubator/directory/eve/trunk/frontend/test/project.properties
      - copied unchanged from rev 22602, incubator/directory/eve/branches/consolidation/frontend/test/project.properties
   incubator/directory/eve/trunk/frontend/test/project.xml
      - copied unchanged from rev 22602, incubator/directory/eve/branches/consolidation/frontend/test/project.xml
   incubator/directory/eve/trunk/frontend/test/src/
      - copied from rev 22602, incubator/directory/eve/branches/consolidation/frontend/test/src/
   incubator/directory/eve/trunk/frontend/test/src/test/
      - copied from rev 22602, incubator/directory/eve/branches/consolidation/frontend/test/src/test/
   incubator/directory/eve/trunk/frontend/test/src/test/org/
      - copied from rev 22602, incubator/directory/eve/branches/consolidation/frontend/test/src/test/org/
   incubator/directory/eve/trunk/frontend/test/src/test/org/apache/
      - copied from rev 22602, incubator/directory/eve/branches/consolidation/frontend/test/src/test/org/apache/
   incubator/directory/eve/trunk/frontend/test/src/test/org/apache/eve/
      - copied from rev 22602, incubator/directory/eve/branches/consolidation/frontend/test/src/test/org/apache/eve/
   incubator/directory/eve/trunk/frontend/test/src/test/org/apache/eve/MerlinFrontendTest.java
      - copied unchanged from rev 22602, incubator/directory/eve/branches/consolidation/frontend/test/src/test/org/apache/eve/MerlinFrontendTest.java
   incubator/directory/eve/trunk/frontend/test/src/test/org/apache/eve/buffer/
      - copied from rev 22602, incubator/directory/eve/branches/consolidation/frontend/test/src/test/org/apache/eve/buffer/
   incubator/directory/eve/trunk/frontend/test/src/test/org/apache/eve/buffer/MerlinBufferPoolTest.java
      - copied unchanged from rev 22602, incubator/directory/eve/branches/consolidation/frontend/test/src/test/org/apache/eve/buffer/MerlinBufferPoolTest.java
   incubator/directory/eve/trunk/frontend/test/src/test/org/apache/eve/decoder/
      - copied from rev 22602, incubator/directory/eve/branches/consolidation/frontend/test/src/test/org/apache/eve/decoder/
   incubator/directory/eve/trunk/frontend/test/src/test/org/apache/eve/decoder/MerlinDecoderManagerTest.java
  (props changed)
      - copied unchanged from rev 22602, incubator/directory/eve/branches/consolidation/frontend/test/src/test/org/apache/eve/decoder/MerlinDecoderManagerTest.java
   incubator/directory/eve/trunk/frontend/test/src/test/org/apache/eve/encoder/
      - copied from rev 22602, incubator/directory/eve/branches/consolidation/frontend/test/src/test/org/apache/eve/encoder/
   incubator/directory/eve/trunk/frontend/test/src/test/org/apache/eve/encoder/MerlinEncoderManagerTest.java
  (props changed)
      - copied unchanged from rev 22602, incubator/directory/eve/branches/consolidation/frontend/test/src/test/org/apache/eve/encoder/MerlinEncoderManagerTest.java
   incubator/directory/eve/trunk/frontend/test/src/test/org/apache/eve/listener/
      - copied from rev 22602, incubator/directory/eve/branches/consolidation/frontend/test/src/test/org/apache/eve/listener/
   incubator/directory/eve/trunk/frontend/test/src/test/org/apache/eve/listener/MerlinListenerManagerTest.java
      - copied unchanged from rev 22602, incubator/directory/eve/branches/consolidation/frontend/test/src/test/org/apache/eve/listener/MerlinListenerManagerTest.java
   incubator/directory/eve/trunk/frontend/test/src/test/org/apache/eve/output/
      - copied from rev 22602, incubator/directory/eve/branches/consolidation/frontend/test/src/test/org/apache/eve/output/
   incubator/directory/eve/trunk/frontend/test/src/test/org/apache/eve/output/MerlinOutputManagerTest.java
  (props changed)
      - copied unchanged from rev 22602, incubator/directory/eve/branches/consolidation/frontend/test/src/test/org/apache/eve/output/MerlinOutputManagerTest.java
   incubator/directory/eve/trunk/frontend/test/src/test/org/apache/eve/processor/
      - copied from rev 22602, incubator/directory/eve/branches/consolidation/frontend/test/src/test/org/apache/eve/processor/
   incubator/directory/eve/trunk/frontend/test/src/test/org/apache/eve/processor/MerlinRequestProcessorTest.java
  (props changed)
      - copied unchanged from rev 22602, incubator/directory/eve/branches/consolidation/frontend/test/src/test/org/apache/eve/processor/MerlinRequestProcessorTest.java
Removed:
   incubator/directory/eve/trunk/frontend/merlin/src/test/
Modified:
   incubator/directory/eve/trunk/backend/schema/matching-rule/bootstrap-impl/project.xml
   incubator/directory/eve/trunk/backend/schema/oid/impl/project.xml
   incubator/directory/eve/trunk/backend/schema/syntax/bootstrap-impl/project.xml
   incubator/directory/eve/trunk/frontend/api/   (props changed)
   incubator/directory/eve/trunk/frontend/impl/   (props changed)
   incubator/directory/eve/trunk/frontend/impl/project.xml
   incubator/directory/eve/trunk/frontend/impl/src/java/org/apache/eve/processor/DefaultRequestProcessor.java
   incubator/directory/eve/trunk/frontend/merlin/   (props changed)
   incubator/directory/eve/trunk/frontend/merlin/project.xml
   incubator/directory/eve/trunk/frontend/merlin/src/java/org/apache/eve/buffer/MerlinBufferPool.java
   incubator/directory/eve/trunk/frontend/merlin/src/java/org/apache/eve/encoder/MerlinEncoderManager.java
   incubator/directory/eve/trunk/frontend/merlin/src/java/org/apache/eve/processor/MerlinRequestProcessor.java
Log:
Merged changes from consolidation branch to trunk from revision 22572 to 
revision 22602.


Modified: incubator/directory/eve/trunk/backend/schema/matching-rule/bootstrap-impl/project.xml
==============================================================================
--- incubator/directory/eve/trunk/backend/schema/matching-rule/bootstrap-impl/project.xml
(original)
+++ incubator/directory/eve/trunk/backend/schema/matching-rule/bootstrap-impl/project.xml
Mon Jul  5 21:45:57 2004
@@ -67,7 +67,7 @@
       <dependency>
         <groupId>avalon-framework</groupId>
         <artifactId>avalon-framework-api</artifactId>
-        <version>4.1.5</version>
+        <version>4.2.0</version>
         <url>http://avalon.apache.org/framework</url>
       </dependency>
     </dependencies>

Modified: incubator/directory/eve/trunk/backend/schema/oid/impl/project.xml
==============================================================================
--- incubator/directory/eve/trunk/backend/schema/oid/impl/project.xml	(original)
+++ incubator/directory/eve/trunk/backend/schema/oid/impl/project.xml	Mon Jul  5 21:45:57
2004
@@ -31,7 +31,7 @@
       <dependency>
         <groupId>avalon-framework</groupId>
         <artifactId>avalon-framework-api</artifactId>
-        <version>4.1.5</version>
+        <version>4.2.0</version>
         <url>http://avalon.apache.org/framework</url>
       </dependency>
     </dependencies>

Modified: incubator/directory/eve/trunk/backend/schema/syntax/bootstrap-impl/project.xml
==============================================================================
--- incubator/directory/eve/trunk/backend/schema/syntax/bootstrap-impl/project.xml	(original)
+++ incubator/directory/eve/trunk/backend/schema/syntax/bootstrap-impl/project.xml	Mon Jul
 5 21:45:57 2004
@@ -59,7 +59,7 @@
       <dependency>
         <groupId>avalon-framework</groupId>
         <artifactId>avalon-framework-api</artifactId>
-        <version>4.1.5</version>
+        <version>4.2.0</version>
         <url>http://avalon.apache.org/framework</url>
       </dependency>
     </dependencies>

Modified: incubator/directory/eve/trunk/frontend/impl/project.xml
==============================================================================
--- incubator/directory/eve/trunk/frontend/impl/project.xml	(original)
+++ incubator/directory/eve/trunk/frontend/impl/project.xml	Mon Jul  5 21:45:57 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/trunk/frontend/impl/src/java/org/apache/eve/processor/DefaultRequestProcessor.java
==============================================================================
--- incubator/directory/eve/trunk/frontend/impl/src/java/org/apache/eve/processor/DefaultRequestProcessor.java
(original)
+++ incubator/directory/eve/trunk/frontend/impl/src/java/org/apache/eve/processor/DefaultRequestProcessor.java
Mon Jul  5 21:45:57 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/trunk/frontend/merlin/project.xml
==============================================================================
--- incubator/directory/eve/trunk/frontend/merlin/project.xml	(original)
+++ incubator/directory/eve/trunk/frontend/merlin/project.xml	Mon Jul  5 21:45:57 2004
@@ -22,20 +22,14 @@
     <!--                A V A L O N   D E N D E N C I E S                -->
     <!-- =============================================================== -->
 
-    <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>
+      <groupId>avalon-logkit</groupId>
+      <artifactId>avalon-logkit</artifactId>
+      <version>2.0.0</version>
     </dependency>
       
     <!-- cornerstone dependencies -->
@@ -43,14 +37,14 @@
     <dependency>
       <groupId>cornerstone-threads</groupId>
       <artifactId>cornerstone-threads-api</artifactId>
-      <version>SNAPSHOT</version>
+      <version>2.0.0</version>
       <url>http://avalon.apache.org/components/components/threads.html</url>
     </dependency>
 
     <dependency>
       <groupId>cornerstone-threads</groupId>
       <artifactId>cornerstone-threads-impl</artifactId>
-      <version>SNAPSHOT</version>
+      <version>2.0.0</version>
       <url>http://avalon.apache.org/components/components/threads.html</url>
     </dependency>
         
@@ -58,38 +52,54 @@
 
     <dependency>
       <groupId>excalibur-thread</groupId>
-      <artifactId>excalibur-thread</artifactId>
-      <version>1.1.1</version>
+      <artifactId>excalibur-thread-api</artifactId>
+      <version>2.0.0</version>
       <url>http://avalon.apache.org/excalibur/index.html</url>
     </dependency>
 
+    <dependency>
+      <groupId>excalibur-thread</groupId>
+      <artifactId>excalibur-thread-impl</artifactId>
+      <version>2.0.0</version>
+      <url>http://avalon.apache.org/excalibur/index.html</url>
+    </dependency>
+
     <dependency>
       <groupId>excalibur-pool</groupId>
-      <artifactId>excalibur-pool</artifactId>
-      <version>1.2</version>
+      <artifactId>excalibur-pool-api</artifactId>
+      <version>2.0.0</version>
       <url>http://avalon.apache.org/excalibur/index.html</url>
     </dependency>
 
+    <dependency>
+      <groupId>excalibur-pool</groupId>
+      <artifactId>excalibur-pool-impl</artifactId>
+      <version>2.0.0</version>
+      <url>http://avalon.apache.org/excalibur/index.html</url>
+    </dependency>
+
+    <!--
     <dependency>
       <groupId>excalibur-event</groupId>
       <artifactId>excalibur-event</artifactId>
       <version>1.0.3</version>
       <url>http://avalon.apache.org/excalibur/index.html</url>
     </dependency>        
+    -->
 
     <!-- framework dependencies -->
 
     <dependency>
       <groupId>avalon-framework</groupId>
       <artifactId>avalon-framework-api</artifactId>
-      <version>4.1.5</version>
+      <version>4.2.0</version>
       <url>http://avalon.apache.org/framework</url>
     </dependency>
 
     <dependency>
       <groupId>avalon-framework</groupId>
       <artifactId>avalon-framework-impl</artifactId>
-      <version>4.1.5</version>
+      <version>4.2.0</version>
       <url>http://avalon.apache.org/framework</url>
     </dependency>
 
@@ -120,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>
@@ -131,18 +148,29 @@
     <!-- =============================================================== -->
 
     <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>
       <version>1.2</version>
       <url>http://jakarta.apache.org/regexp</url>
     </dependency>
-
+
+    <!--
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
       <version>3.8.1</version>
       <url>http://junit.org</url>
     </dependency>
+    -->
 
         <!-- THE DEPENDENCY KEEPING USE IN INCUBATOR -->
         <dependency>
@@ -192,7 +220,7 @@
         http://incubator.apache.org/directory/subprojects/snickers/ber/api
       </url>
     </dependency>
-
+
   </dependencies>
       
 </project>

Modified: incubator/directory/eve/trunk/frontend/merlin/src/java/org/apache/eve/buffer/MerlinBufferPool.java
==============================================================================
--- incubator/directory/eve/trunk/frontend/merlin/src/java/org/apache/eve/buffer/MerlinBufferPool.java
(original)
+++ incubator/directory/eve/trunk/frontend/merlin/src/java/org/apache/eve/buffer/MerlinBufferPool.java
Mon Jul  5 21:45:57 2004
@@ -32,7 +32,8 @@
  * 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">
  * Apache Directory Project</a>

Modified: incubator/directory/eve/trunk/frontend/merlin/src/java/org/apache/eve/encoder/MerlinEncoderManager.java
==============================================================================
--- incubator/directory/eve/trunk/frontend/merlin/src/java/org/apache/eve/encoder/MerlinEncoderManager.java
(original)
+++ incubator/directory/eve/trunk/frontend/merlin/src/java/org/apache/eve/encoder/MerlinEncoderManager.java
Mon Jul  5 21:45:57 2004
@@ -46,6 +46,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"
  *
  * @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/processor/MerlinRequestProcessor.java
==============================================================================
--- incubator/directory/eve/trunk/frontend/merlin/src/java/org/apache/eve/processor/MerlinRequestProcessor.java
(original)
+++ incubator/directory/eve/trunk/frontend/merlin/src/java/org/apache/eve/processor/MerlinRequestProcessor.java
Mon Jul  5 21:45:57 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 ;
@@ -44,6 +43,7 @@
  * @avalon.component name="request-processor" lifestyle="singleton"
  * @avalon.service type="org.apache.eve.processor.RequestProcessor" 
  *      version="1.0"
+ * @avalon.attribute key="urn:composition:deployment.timeout" value="6000"
  *
  * @author <a href="mailto:directory-dev@incubator.apache.org">
  * Apache Directory Project</a>
@@ -141,7 +141,7 @@
         DefaultHandlerRegistry hooks = new DefaultHandlerRegistry() ;
         requestProcessor = 
             new DefaultRequestProcessor( router, stageConfig, hooks ) ;
-        requestProcessor.setMonitor( new StageMonitorAdapter() ) ;
+        requestProcessor.setMonitor( new LoggingStageMonitor() ) ;
     }
     
     

Mime
View raw message