directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mcconn...@apache.org
Subject svn commit: rev 22591 - in incubator/directory/eve/branches/consolidation/frontend: merlin merlin/src/java/org/apache/eve/buffer merlin/src/java/org/apache/eve/encoder merlin/src/java/org/apache/eve/processor merlin/src/test test test/etc test/etc/test test/src/test test/src/test/org test/src/test/org/apache/eve
Date Mon, 05 Jul 2004 10:17:31 GMT
Author: mcconnell
Date: Mon Jul  5 03:17:30 2004
New Revision: 22591

Added:
   incubator/directory/eve/branches/consolidation/frontend/merlin/maven.xml
   incubator/directory/eve/branches/consolidation/frontend/test/etc/
   incubator/directory/eve/branches/consolidation/frontend/test/etc/test/
   incubator/directory/eve/branches/consolidation/frontend/test/etc/test/test.block
   incubator/directory/eve/branches/consolidation/frontend/test/merlin.properties
   incubator/directory/eve/branches/consolidation/frontend/test/project.properties
   incubator/directory/eve/branches/consolidation/frontend/test/project.xml
   incubator/directory/eve/branches/consolidation/frontend/test/src/test/
      - copied from rev 22572, incubator/directory/eve/branches/consolidation/frontend/merlin/src/test/
   incubator/directory/eve/branches/consolidation/frontend/test/src/test/org/
      - copied from rev 22590, incubator/directory/eve/branches/consolidation/frontend/merlin/src/test/org/
Removed:
   incubator/directory/eve/branches/consolidation/frontend/merlin/src/test/
Modified:
   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/buffer/MerlinBufferPool.java
   incubator/directory/eve/branches/consolidation/frontend/merlin/src/java/org/apache/eve/encoder/MerlinEncoderManager.java
   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/src/test/org/apache/eve/MerlinFrontendTest.java
Log:
Move the merlin testcases out to a seperate test project.  Update a bunch of project.xml files
to current versions - add a few extended deployment timout attributes (encoder and decoder),
and put in place a single block definition for testing.

Added: incubator/directory/eve/branches/consolidation/frontend/merlin/maven.xml
==============================================================================
--- (empty file)
+++ incubator/directory/eve/branches/consolidation/frontend/merlin/maven.xml	Mon Jul  5 03:17:30
2004
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="ISO-8859-1"?> 
+  
+<project 
+  default="buildall" 
+  xmlns:j="jelly:core" 
+  xmlns:u="jelly:util" 
+  xmlns:ant="jelly:ant" 
+  xmlns:maven="jelly:maven" 
+  xmlns:deploy="deploy"
+  >
+  
+  <postGoal name="java:prepare-filesystem">
+    <attainGoal name="avalon:meta"/>
+  </postGoal>
+
+</project>

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
03:17:30 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>
 
@@ -136,13 +146,15 @@
       <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 +204,7 @@
         http://incubator.apache.org/directory/subprojects/snickers/ber/api
       </url>
     </dependency>
-
+
   </dependencies>
       
 </project>

Modified: incubator/directory/eve/branches/consolidation/frontend/merlin/src/java/org/apache/eve/buffer/MerlinBufferPool.java
==============================================================================
--- incubator/directory/eve/branches/consolidation/frontend/merlin/src/java/org/apache/eve/buffer/MerlinBufferPool.java
(original)
+++ incubator/directory/eve/branches/consolidation/frontend/merlin/src/java/org/apache/eve/buffer/MerlinBufferPool.java
Mon Jul  5 03:17:30 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/branches/consolidation/frontend/merlin/src/java/org/apache/eve/encoder/MerlinEncoderManager.java
==============================================================================
--- incubator/directory/eve/branches/consolidation/frontend/merlin/src/java/org/apache/eve/encoder/MerlinEncoderManager.java
(original)
+++ incubator/directory/eve/branches/consolidation/frontend/merlin/src/java/org/apache/eve/encoder/MerlinEncoderManager.java
Mon Jul  5 03:17:30 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/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 03:17:30 2004
@@ -43,7 +43,8 @@
  * 
  * @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:directory-dev@incubator.apache.org">
  * Apache Directory Project</a>

Added: incubator/directory/eve/branches/consolidation/frontend/test/etc/test/test.block
==============================================================================
--- (empty file)
+++ incubator/directory/eve/branches/consolidation/frontend/test/etc/test/test.block	Mon Jul
 5 03:17:30 2004
@@ -0,0 +1,106 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<container name="server">
+
+   <!--
+   Eve is not providing any exported services at this time.
+   -->
+   <services>
+   </services>
+
+   <!--
+   Block implementation.
+   -->
+   <classloader>
+     <classpath>
+       <artifact>avalon-framework/avalon-framework-api#4.2.0</artifact>
+       <artifact>avalon-framework/avalon-framework-impl#4.2.0</artifact>
+       <artifact>avalon-repository/avalon-repository-api#2.0.0</artifact>
+       <artifact>avalon-logkit/avalon-logkit#2.0.0</artifact>
+       <artifact>cornerstone-threads/cornerstone-threads-api#2.0.0</artifact>
+       <artifact>cornerstone-threads/cornerstone-threads-impl#2.0.0</artifact>
+       <artifact>excalibur-thread/excalibur-thread-api#2.0.0</artifact>
+       <artifact>excalibur-thread/excalibur-thread-impl#2.0.0</artifact>
+       <artifact>excalibur-pool/excalibur-pool-api#2.0.0</artifact>
+       <artifact>excalibur-pool/excalibur-pool-impl#2.0.0</artifact>
+       <artifact>concurrent/concurrent#1.3.1</artifact>
+       <artifact>incubator-directory/ldap-common#SNAPSHOT</artifact>
+       <artifact>incubator-directory/eve-frontend-api#SNAPSHOT</artifact>
+       <artifact>incubator-directory/eve-frontend-impl#SNAPSHOT</artifact>
+       <artifact>incubator-directory/codec-stateful#SNAPSHOT</artifact>
+       <artifact>incubator-directory/snickers-ber-api#SNAPSHOT</artifact>
+       <artifact>incubator-directory/eve-frontend-merlin#SNAPSHOT</artifact>
+       <artifact>commons-lang/commons-lang#2.0</artifact>
+       <artifact>commons-codec/commons-codec#SNAPSHOT</artifact>
+       <artifact>commons-logging/commons-logging#1.0.3</artifact>
+       <artifact>commons-primitives/commons-primitives#1.1-dev</artifact>
+       <artifact>commons-collections/commons-collections#2.1</artifact>
+       <artifact>regexp/regexp#1.2</artifact>
+       <artifact>snacc4j/snacc#2.3</artifact>
+
+     </classpath>
+   </classloader>
+
+   <component name="input-manager" class="org.apache.eve.input.MerlinInputManager"/>
+   <component name="encoder-manager" class="org.apache.eve.encoder.MerlinEncoderManager"/>
+   <component name="decoder-manager" class="org.apache.eve.decoder.MerlinDecoderManager"/>
+   <component name="output-manager" class="org.apache.eve.output.MerlinOutputManager"/>
+   <component name="buffer-pool" class="org.apache.eve.buffer.MerlinBufferPool"/>
+   <component name="event-router" class="org.apache.eve.event.MerlinEventRouter"/>
+   <component name="listener-manager" class="org.apache.eve.listener.MerlinListenerManager"/>
+   <component name="request-processor" class="org.apache.eve.processor.MerlinRequestProcessor"/>
+
+   <component name="thread-manager" 
+        class="org.apache.avalon.cornerstone.blocks.threads.DefaultThreadManager" 
+        activation="true">
+     <configuration>
+
+       <thread-group>
+         <name>default</name>
+         <priority>5</priority> 
+         <is-daemon>false</is-daemon>
+         <max-threads>5</max-threads>
+         <min-threads>2</min-threads>
+         <min-spare-threads>1</min-spare-threads>
+       </thread-group>
+
+       <thread-group>
+         <name>encoder-manager</name>
+         <priority>5</priority>
+         <is-daemon>false</is-daemon>
+         <max-threads>5</max-threads>
+         <min-threads>2</min-threads>
+         <min-spare-threads>1</min-spare-threads>
+       </thread-group>
+
+       <thread-group>
+         <name>decoder-manager</name>
+         <priority>5</priority>
+         <is-daemon>false</is-daemon>
+         <max-threads>5</max-threads>
+         <min-threads>2</min-threads>
+         <min-spare-threads>1</min-spare-threads>
+       </thread-group>
+
+       <thread-group>
+         <name>request-processor</name>
+         <priority>5</priority> 
+         <is-daemon>false</is-daemon>
+         <max-threads>5</max-threads>
+         <min-threads>2</min-threads>
+         <min-spare-threads>1</min-spare-threads>
+       </thread-group>
+
+       <thread-group>
+         <name>output-manager</name>
+         <priority>5</priority> 
+         <is-daemon>false</is-daemon>
+         <max-threads>5</max-threads>
+         <min-threads>2</min-threads>
+         <min-spare-threads>1</min-spare-threads>
+       </thread-group>
+
+     </configuration>
+
+   </component>
+
+</container>

Added: incubator/directory/eve/branches/consolidation/frontend/test/merlin.properties
==============================================================================
--- (empty file)
+++ incubator/directory/eve/branches/consolidation/frontend/test/merlin.properties	Mon Jul
 5 03:17:30 2004
@@ -0,0 +1,5 @@
+
+#merlin.debug = true
+#merlin.audit = true
+#merlin.info = true
+merlin.deployment = etc/test/test.block

Added: incubator/directory/eve/branches/consolidation/frontend/test/project.properties
==============================================================================
--- (empty file)
+++ incubator/directory/eve/branches/consolidation/frontend/test/project.properties	Mon Jul
 5 03:17:30 2004
@@ -0,0 +1 @@
+maven.repo.remote=http://cvs.apache.org/repository, http://www.apache.org/dist/avalon, http://www.dpml.net,
http://ibiblio.org/maven, http://ldapd.sourceforge.net/maven/repository, http://ibiblio.org/maven

Added: incubator/directory/eve/branches/consolidation/frontend/test/project.xml
==============================================================================
--- (empty file)
+++ incubator/directory/eve/branches/consolidation/frontend/test/project.xml	Mon Jul  5 03:17:30
2004
@@ -0,0 +1,117 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<project>
+  <extend>${basedir}/../../project.xml</extend>
+  <groupId>incubator-directory</groupId>
+  <id>eve-frontend-test</id>
+
+  <name>Eve Frontend Merlin Implementation</name>
+  <package>org.apache.eve</package>
+  <currentVersion>SNAPSHOT</currentVersion>
+  <inceptionYear>2003</inceptionYear>
+      
+  <shortDescription>Eve Frontend Test Suite</shortDescription>
+
+  <description>
+    Contains the Avalon merlin test-suite for Eve.
+  </description>
+
+  <dependencies>
+
+    <!-- =============================================================== -->
+    <!--                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.3.0</version>
+    </dependency>
+
+    <dependency>
+      <groupId>incubator-directory</groupId>
+      <artifactId>eve-frontend-api</artifactId>
+      <version>SNAPSHOT</version>
+      <url>http://incubator.apache.org/directory/subprojects/eve/frontend</url>
+    </dependency>
+
+    <dependency>
+      <groupId>incubator-directory</groupId>
+      <artifactId>eve-frontend-impl</artifactId>
+      <version>SNAPSHOT</version>
+      <url>http://incubator.apache.org/directory/subprojects/eve/frontend</url>
+    </dependency>
+
+    <dependency>
+      <groupId>incubator-directory</groupId>
+      <artifactId>eve-frontend-merlin</artifactId>
+      <version>SNAPSHOT</version>
+      <url>http://incubator.apache.org/directory/subprojects/eve/frontend</url>
+    </dependency>
+
+    <dependency>
+      <groupId>cornerstone-threads</groupId>
+      <artifactId>cornerstone-threads-api</artifactId>
+      <version>2.0.0</version>
+    </dependency>
+
+    <dependency>
+      <groupId>excalibur-thread</groupId>
+      <artifactId>excalibur-thread-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-api</artifactId>
+      <version>2.0.0</version>
+      <url>http://avalon.apache.org/excalibur/index.html</url>
+    </dependency>
+
+    <dependency>
+      <groupId>incubator-directory</groupId>
+      <artifactId>ldap-common</artifactId>
+      <version>SNAPSHOT</version>
+      <url>http://incubator.apache.org/directory/subprojects/ldap/common</url>
+    </dependency>
+
+    <dependency>
+      <groupId>incubator-directory</groupId>
+      <artifactId>codec-stateful</artifactId>
+      <version>SNAPSHOT</version>
+      <url>http://incubator.apache.org/directory/subprojects/ldap/common</url>
+    </dependency>
+
+    <dependency>
+      <groupId>commons-codec</groupId>
+      <artifactId>commons-codec</artifactId>
+      <version>SNAPSHOT</version>
+      <url>http://jakarta.apache.org/commons/codec</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>avalon-logkit</groupId>
+      <artifactId>avalon-logkit</artifactId>
+      <version>2.0.0</version>
+    </dependency>
+      
+    <dependency>
+      <groupId>avalon-framework</groupId>
+      <artifactId>avalon-framework-api</artifactId>
+      <version>4.2.0</version>
+    </dependency>
+      
+
+  </dependencies>
+      
+</project>
+

Modified: incubator/directory/eve/branches/consolidation/frontend/test/src/test/org/apache/eve/MerlinFrontendTest.java
==============================================================================
--- incubator/directory/eve/branches/consolidation/frontend/merlin/src/test/org/apache/eve/MerlinFrontendTest.java
(original)
+++ incubator/directory/eve/branches/consolidation/frontend/test/src/test/org/apache/eve/MerlinFrontendTest.java
Mon Jul  5 03:17:30 2004
@@ -67,31 +67,31 @@
         super.setUp() ;
 
         bufferPool = ( BufferPool ) 
-            resolve( "/eve/buffer-pool" ) ;
+            resolve( "/server/buffer-pool" ) ;
         
         eventRouter = ( EventRouter )
-            resolve( "/eve/event-router" ) ; 
+            resolve( "/server/event-router" ) ; 
         
         inputManager = ( InputManager ) 
-            resolve( "/eve/input-manager" ) ;
+            resolve( "/server/input-manager" ) ;
 
         outputManager = ( OutputManager ) 
-            resolve( "/eve/output-manager" ) ;
+            resolve( "/server/output-manager" ) ;
 
         threadManager = ( ThreadManager ) 
-            resolve( "/eve/thread-manager" ) ;
+            resolve( "/server/thread-manager" ) ;
 
         encoderManager = ( EncoderManager ) 
-            resolve( "/eve/encoder-manager" ) ;
+            resolve( "/server/encoder-manager" ) ;
 
         decoderManager = ( DecoderManager ) 
-            resolve( "/eve/decoder-manager" ) ;
+            resolve( "/server/decoder-manager" ) ;
 
         listenerManager = ( ListenerManager ) 
-            resolve( "/eve/listener-manager" ) ;
+            resolve( "/server/listener-manager" ) ;
 
         requestProcessor = ( RequestProcessor ) 
-            resolve( "/eve/request-processor" ) ;
+            resolve( "/server/request-processor" ) ;
     }
 
     

Mime
View raw message