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 2004/02/19 09:26:32 UTC

svn commit: rev 6775 - in incubator/directory/eve/trunk/eve: . frontend/buffer/merlin-impl/conf frontend/buffer/pojo-impl/src/java/org/apache/eve/buffer frontend/frontend/merlin-impl/conf

Author: akarasulu
Date: Thu Feb 19 00:26:31 2004
New Revision: 6775

Modified:
   incubator/directory/eve/trunk/eve/frontend/buffer/merlin-impl/conf/block.xml
   incubator/directory/eve/trunk/eve/frontend/buffer/pojo-impl/src/java/org/apache/eve/buffer/DefaultBufferPool.java
   incubator/directory/eve/trunk/eve/frontend/frontend/merlin-impl/conf/block.xml
   incubator/directory/eve/trunk/eve/maven.xml
Log:
fixed class cast problem and class not found error

Modified: incubator/directory/eve/trunk/eve/frontend/buffer/merlin-impl/conf/block.xml
==============================================================================
--- incubator/directory/eve/trunk/eve/frontend/buffer/merlin-impl/conf/block.xml	(original)
+++ incubator/directory/eve/trunk/eve/frontend/buffer/merlin-impl/conf/block.xml	Thu Feb 19 00:26:31 2004
@@ -6,6 +6,7 @@
     <classpath>
       <repository>
         <resource id="avalon-framework:avalon-framework-api" version="4.1.5"/>
+        <resource id="commons-lang:commons-lang" version="2.0"/>
         <resource id="directory:eve-frontend-common-api" version="SNAPSHOT"/>
         <resource id="directory:eve-frontend-buffer-spi" version="SNAPSHOT"/>
         <resource id="directory:eve-frontend-buffer-pojo-impl" version="SNAPSHOT"/>

Modified: incubator/directory/eve/trunk/eve/frontend/buffer/pojo-impl/src/java/org/apache/eve/buffer/DefaultBufferPool.java
==============================================================================
--- incubator/directory/eve/trunk/eve/frontend/buffer/pojo-impl/src/java/org/apache/eve/buffer/DefaultBufferPool.java	(original)
+++ incubator/directory/eve/trunk/eve/frontend/buffer/pojo-impl/src/java/org/apache/eve/buffer/DefaultBufferPool.java	Thu Feb 19 00:26:31 2004
@@ -191,8 +191,8 @@
         // if the list of interested parties hits zero then we release buf
         if ( l_list.size() == 0 )
         {
-            m_inUseList.remove( a_buffer ) ;
-            m_freeList.add( a_buffer ) ;
+            m_inUseList.remove( l_list ) ;
+            m_freeList.add( l_list ) ;
             m_monitor.bufferReleased( this, a_buffer, a_party ) ;
         }
     }
@@ -213,7 +213,7 @@
      */
     public synchronized int size()
     {
-        return m_freeList.size() + m_inUseList.size() ;
+        return m_allList.size() ;
     }
     
 

Modified: incubator/directory/eve/trunk/eve/frontend/frontend/merlin-impl/conf/block.xml
==============================================================================
--- incubator/directory/eve/trunk/eve/frontend/frontend/merlin-impl/conf/block.xml	(original)
+++ incubator/directory/eve/trunk/eve/frontend/frontend/merlin-impl/conf/block.xml	Thu Feb 19 00:26:31 2004
@@ -7,6 +7,8 @@
       <repository>
 
         <resource 
+          id="commons-lang:commons-lang" version="2.0"/>
+        <resource 
           id="commons-collections:commons-collections" version="2.1"/>
 
         <resource 
@@ -67,15 +69,6 @@
      <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>input-consumer</name>
          <priority>5</priority> 
          <is-daemon>false</is-daemon>
          <max-threads>5</max-threads>

Modified: incubator/directory/eve/trunk/eve/maven.xml
==============================================================================
--- incubator/directory/eve/trunk/eve/maven.xml	(original)
+++ incubator/directory/eve/trunk/eve/maven.xml	Thu Feb 19 00:26:31 2004
@@ -37,11 +37,6 @@
     </copy>
   </goal>
   
-  <goal name="cleanall">
-    <attainGoal name="clean"/>
-    <delete dir="home"/>
-  </goal>
-  
   <goal name="buildall" description="Build All Jar Files And Intall">
     <maven:reactor basedir="${basedir}" postProcessing="true" 
       includes="**/project.xml" excludes="./project.xml" goals="jar:install" 
@@ -62,11 +57,14 @@
   
   <goal name="clean-all" description="Clean all sandbox projects">
     <maven:reactor basedir="${basedir}" postProcessing="true" 
-      includes="*/project.xml" goals="clean" banner="Clean All" 
+      includes="**/project.xml" excludes="./project.xml" goals="cleanall" 
+      banner="Clean All" 
       ignoreFailures="true"/>
+    <attainGoal name="clean"/>
+    <delete dir="home"/>
   </goal>
   
-  <goal name="eclipse-all" 
+  <goal name="eclipseall" 
     description="Generate eclipse descriptors for all projects">
     <maven:reactor basedir="${basedir}" postProcessing="true" 
       includes="*/project.xml" goals="clean" banner="Clean All"