directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From akaras...@apache.org
Subject svn commit: rev 9706 - in incubator/directory/eve/trunk/frontend/buffer/spi: . src/java/org/apache/eve/buffer
Date Tue, 23 Mar 2004 03:30:56 GMT
Author: akarasulu
Date: Mon Mar 22 19:30:55 2004
New Revision: 9706

Modified:
   incubator/directory/eve/trunk/frontend/buffer/spi/project.xml
   incubator/directory/eve/trunk/frontend/buffer/spi/src/java/org/apache/eve/buffer/BufferPool.java
   incubator/directory/eve/trunk/frontend/buffer/spi/src/java/org/apache/eve/buffer/BufferPoolConfig.java
   incubator/directory/eve/trunk/frontend/buffer/spi/src/java/org/apache/eve/buffer/BufferPoolConsoleLogger.java
   incubator/directory/eve/trunk/frontend/buffer/spi/src/java/org/apache/eve/buffer/BufferPoolMonitor.java
   incubator/directory/eve/trunk/frontend/buffer/spi/src/java/org/apache/eve/buffer/BufferPoolMonitorAdapter.java
   incubator/directory/eve/trunk/frontend/buffer/spi/src/java/org/apache/eve/buffer/DefaultBufferPoolConfig.java
Log:
cleanedup license and @author tag as well as style

Modified: incubator/directory/eve/trunk/frontend/buffer/spi/project.xml
==============================================================================
--- incubator/directory/eve/trunk/frontend/buffer/spi/project.xml	(original)
+++ incubator/directory/eve/trunk/frontend/buffer/spi/project.xml	Mon Mar 22 19:30:55 2004
@@ -1,30 +1,37 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <project>
-    <extend>${basedir}/../../../project.xml</extend>
-    <groupId>incubator-directory</groupId>
-    <id>eve-frontend-buffer-spi</id>
-  
-    <name>Eve Frontend Buffer Pool Service SPI</name>
-    <package>org.apache.eve.buffer</package>
-    <currentVersion>SNAPSHOT</currentVersion>
-    <inceptionYear>2003</inceptionYear>
+  <extend>${basedir}/../../../project.xml</extend>
+  <groupId>incubator-directory</groupId>
+  <id>eve-frontend-buffer-spi</id>
+
+  <name>Eve Frontend Buffer Pool Service SPI</name>
+  <package>org.apache.eve.buffer</package>
+  <currentVersion>SNAPSHOT</currentVersion>
+  <inceptionYear>2003</inceptionYear>
       
-    <shortDescription>Event Buffer Pool SPI used by Eve's frontend</shortDescription>
+  <shortDescription>Event Buffer Pool SPI used by Eve's frontend</shortDescription>
 
-    <description>
-        A buffer pool service for claiming and releasing pooled preallocated
-        NIO direct buffers.  The service tracks the parties interested in
-        the buffer as which is used to maintain a reference count on the buffer
-        but with actual references. 
-    </description>
+  <description>
+    A buffer pool service for claiming and releasing pooled preallocated
+    NIO direct buffers.  The service tracks the parties interested in
+    the buffer as which is used to maintain a reference count on the buffer
+    but with actual references. 
+  </description>
       
-    <dependencies>
-        <dependency>
-            <groupId>incubator-directory</groupId>
-            <artifactId>eve-frontend-common-api</artifactId>
-            <version>SNAPSHOT</version>
-            <url>http://directory.apache.org/ldap/eve/frontend/common/api</url>
-        </dependency>
-    </dependencies>
+  <dependencies>
+    <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>incubator-directory</groupId>
+      <artifactId>eve-frontend-common-api</artifactId>
+      <version>SNAPSHOT</version>
+      <url>http://incubator.apache.org/directory/subprojects/eve/frontend/common/api</url>
+    </dependency>
+  </dependencies>
 </project>
 

Modified: incubator/directory/eve/trunk/frontend/buffer/spi/src/java/org/apache/eve/buffer/BufferPool.java
==============================================================================
--- incubator/directory/eve/trunk/frontend/buffer/spi/src/java/org/apache/eve/buffer/BufferPool.java
(original)
+++ incubator/directory/eve/trunk/frontend/buffer/spi/src/java/org/apache/eve/buffer/BufferPool.java
Mon Mar 22 19:30:55 2004
@@ -1,52 +1,19 @@
 /*
-
- ============================================================================
-                   The Apache Software License, Version 1.1
- ============================================================================
-
- Copyright (C) 1999-2002 The Apache Software Foundation. All rights reserved.
-
- Redistribution and use in source and binary forms, with or without modifica-
- tion, are permitted provided that the following conditions are met:
-
- 1. Redistributions of  source code must  retain the above copyright  notice,
-    this list of conditions and the following disclaimer.
-
- 2. Redistributions in binary form must reproduce the above copyright notice,
-    this list of conditions and the following disclaimer in the documentation
-    and/or other materials provided with the distribution.
-
- 3. The end-user documentation included with the redistribution, if any, must
-    include  the following  acknowledgment:  "This product includes  software
-    developed  by the  Apache Software Foundation  (http://www.apache.org/)."
-    Alternately, this  acknowledgment may  appear in the software itself,  if
-    and wherever such third-party acknowledgments normally appear.
-
- 4. The names "Eve Directory Server", "Apache Directory Project", "Apache Eve" 
-    and "Apache Software Foundation"  must not be used to endorse or promote
-    products derived  from this  software without  prior written
-    permission. For written permission, please contact apache@apache.org.
-
- 5. Products  derived from this software may not  be called "Apache", nor may
-    "Apache" appear  in their name,  without prior written permission  of the
-    Apache Software Foundation.
-
- THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES,
- INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
- FITNESS  FOR A PARTICULAR  PURPOSE ARE  DISCLAIMED.  IN NO  EVENT SHALL  THE
- APACHE SOFTWARE  FOUNDATION  OR ITS CONTRIBUTORS  BE LIABLE FOR  ANY DIRECT,
- INDIRECT, INCIDENTAL, SPECIAL,  EXEMPLARY, OR CONSEQUENTIAL  DAMAGES (INCLU-
- DING, BUT NOT LIMITED TO, PROCUREMENT  OF SUBSTITUTE GOODS OR SERVICES; LOSS
- OF USE, DATA, OR  PROFITS; OR BUSINESS  INTERRUPTION)  HOWEVER CAUSED AND ON
- ANY  THEORY OF LIABILITY,  WHETHER  IN CONTRACT,  STRICT LIABILITY,  OR TORT
- (INCLUDING  NEGLIGENCE OR  OTHERWISE) ARISING IN  ANY WAY OUT OF THE  USE OF
- THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
- This software  consists of voluntary contributions made  by many individuals
- on  behalf of the Apache Software  Foundation. For more  information on the
- Apache Software Foundation, please see <http://www.apache.org/>.
-
-*/
+ *   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.buffer ;
 
 
@@ -58,8 +25,8 @@
 /**
  * Service interface for an NIO direct memory buffer pool.
  *
- * @author <a href="mailto:akarasulu@apache.org">Alex Karasulu</a>
- * @author $Author$
+ * @author <a href="mailto:directory-dev@incubator.apache.org">
+ * Apache Directory Project</a>
  * @version $Rev$
  */
 public interface BufferPool
@@ -71,34 +38,34 @@
      * Acquires a dedicated buffer from the buffer pool and claims interest with
      * the buffer using an object representing the interested party.
      * 
-     * @param a_party the object interested in the buffer
+     * @param party the object interested in the buffer
      * @return a claimed direct memory buffer
      */
-    ByteBuffer getBuffer( Object a_party ) throws ResourceException ;
+    ByteBuffer getBuffer( Object party ) throws ResourceException ;
     
     /**
      * Allows a party to claim interest on a buffer pooled by this buffer.  The
      * buffer cannot be reclaimed until all the interested parties release their
      * interest claim on the buffer.
      * 
-     * @param a_party the object interested in the buffer
-     * @param a_buffer a claimed direct memory buffer pooled by this BufferPool
+     * @param party the object interested in the buffer
+     * @param buffer a claimed direct memory buffer pooled by this BufferPool
      * @throws IllegalArgumentException if the buffer is not direct or has not 
      * been recognized as a pooled resource of this pool. 
      */
-    void claimInterest( ByteBuffer a_buffer, Object a_party ) ; 
+    void claimInterest( ByteBuffer buffer, Object party ) ; 
     
     /**
      * Allows a party that claimed interest on a buffer to release the buffer.  
      * The buffer cannot be reclaimed until all the interested parties release 
      * their interest claim on the buffer.
      * 
-     * @param a_buffer the buffer to release
-     * @param a_owner the owner of the buffer
+     * @param buffer the buffer to release
+     * @param owner the owner of the buffer
      * @throws IllegalArgumentException if the buffer is not direct or has not 
      * been recognized as a pooled resource of this pool. 
      */
-    void releaseClaim( ByteBuffer a_buffer, Object a_party ) ;
+    void releaseClaim( ByteBuffer buffer, Object party ) ;
     
     /**
      * Gets the configuration for this BufferPool.
@@ -111,10 +78,10 @@
      * Gets the number of interested parties that have claimed interest on a
      * pooled buffer.  This number is like the link count.
      * 
-     * @param a_buffer the buffer to get a interest count for
+     * @param buffer the buffer to get a interest count for
      * @return count of parties claiming interest on the buffer
      */
-    int getInterestedCount( ByteBuffer a_buffer ) ; 
+    int getInterestedCount( ByteBuffer buffer ) ; 
     
     /**
      * Gets a count of the number of free buffers in this BufferPool.

Modified: incubator/directory/eve/trunk/frontend/buffer/spi/src/java/org/apache/eve/buffer/BufferPoolConfig.java
==============================================================================
--- incubator/directory/eve/trunk/frontend/buffer/spi/src/java/org/apache/eve/buffer/BufferPoolConfig.java
(original)
+++ incubator/directory/eve/trunk/frontend/buffer/spi/src/java/org/apache/eve/buffer/BufferPoolConfig.java
Mon Mar 22 19:30:55 2004
@@ -1,59 +1,26 @@
 /*
-
- ============================================================================
-                   The Apache Software License, Version 1.1
- ============================================================================
-
- Copyright (C) 1999-2002 The Apache Software Foundation. All rights reserved.
-
- Redistribution and use in source and binary forms, with or without modifica-
- tion, are permitted provided that the following conditions are met:
-
- 1. Redistributions of  source code must  retain the above copyright  notice,
-    this list of conditions and the following disclaimer.
-
- 2. Redistributions in binary form must reproduce the above copyright notice,
-    this list of conditions and the following disclaimer in the documentation
-    and/or other materials provided with the distribution.
-
- 3. The end-user documentation included with the redistribution, if any, must
-    include  the following  acknowledgment:  "This product includes  software
-    developed  by the  Apache Software Foundation  (http://www.apache.org/)."
-    Alternately, this  acknowledgment may  appear in the software itself,  if
-    and wherever such third-party acknowledgments normally appear.
-
- 4. The names "Eve Directory Server", "Apache Directory Project", "Apache Eve" 
-    and "Apache Software Foundation"  must not be used to endorse or promote
-    products derived  from this  software without  prior written
-    permission. For written permission, please contact apache@apache.org.
-
- 5. Products  derived from this software may not  be called "Apache", nor may
-    "Apache" appear  in their name,  without prior written permission  of the
-    Apache Software Foundation.
-
- THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES,
- INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
- FITNESS  FOR A PARTICULAR  PURPOSE ARE  DISCLAIMED.  IN NO  EVENT SHALL  THE
- APACHE SOFTWARE  FOUNDATION  OR ITS CONTRIBUTORS  BE LIABLE FOR  ANY DIRECT,
- INDIRECT, INCIDENTAL, SPECIAL,  EXEMPLARY, OR CONSEQUENTIAL  DAMAGES (INCLU-
- DING, BUT NOT LIMITED TO, PROCUREMENT  OF SUBSTITUTE GOODS OR SERVICES; LOSS
- OF USE, DATA, OR  PROFITS; OR BUSINESS  INTERRUPTION)  HOWEVER CAUSED AND ON
- ANY  THEORY OF LIABILITY,  WHETHER  IN CONTRACT,  STRICT LIABILITY,  OR TORT
- (INCLUDING  NEGLIGENCE OR  OTHERWISE) ARISING IN  ANY WAY OUT OF THE  USE OF
- THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
- This software  consists of voluntary contributions made  by many individuals
- on  behalf of the Apache Software  Foundation. For more  information on the
- Apache Software Foundation, please see <http://www.apache.org/>.
-
-*/
+ *   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.buffer ;
 
 /**
  * BufferPool configuration parameters used regardless of implementation.
  *
- * @author <a href="mailto:akarasulu@apache.org">Alex Karasulu</a>
- * @author $Author$
+ * @author <a href="mailto:directory-dev@incubator.apache.org">
+ * Apache Directory Project</a>
  * @version $Rev$
  */
 public interface BufferPoolConfig

Modified: incubator/directory/eve/trunk/frontend/buffer/spi/src/java/org/apache/eve/buffer/BufferPoolConsoleLogger.java
==============================================================================
--- incubator/directory/eve/trunk/frontend/buffer/spi/src/java/org/apache/eve/buffer/BufferPoolConsoleLogger.java
(original)
+++ incubator/directory/eve/trunk/frontend/buffer/spi/src/java/org/apache/eve/buffer/BufferPoolConsoleLogger.java
Mon Mar 22 19:30:55 2004
@@ -14,12 +14,17 @@
  *   limitations under the License.
  *
  */
-package org.apache.eve.buffer;
+package org.apache.eve.buffer ;
+
+
+import java.nio.ByteBuffer ;
+
+import org.apache.commons.logging.Log ;
+import org.apache.commons.logging.LogFactory ;
 
-import java.nio.ByteBuffer;
 
 /**
- * $todo$ doc me
+ * Logging monitor for a BufferPool.
  *
  * @author <a href="mailto:directory-dev@incubator.apache.org">
  * Apache Directory Project</a>
@@ -27,13 +32,42 @@
  */
 public class BufferPoolConsoleLogger implements BufferPoolMonitor
 {
+    /** the default name for the logging channel */
+    private final String DEFAULT = "BufferPool" ;
+    /** the log - can be any implementation */
+    private final Log log ; 
+    
+    
+    /**
+     * Creates a buffer pool logging monitor.
+     */
+    public BufferPoolConsoleLogger()
+    {
+        log = LogFactory.getLog( DEFAULT ) ;
+    }
+    
+    
+    /**
+     * Creates a buffer pool logging monitor.
+     * 
+     * @param name the logging channel name
+     */
+    public BufferPoolConsoleLogger( String name )
+    {
+        log = LogFactory.getLog( name ) ;
+    }
+    
+    
     /* (non-Javadoc)
      * @see org.apache.eve.buffer.BufferPoolMonitor#
      * augmented(org.apache.eve.buffer.BufferPool)
      */
-    public void augmented( BufferPool a_bp )
+    public void augmented( BufferPool bp )
     {
-        System.out.println( "Just augmented the buffer pool" ) ;
+        if ( log.isDebugEnabled() )
+        {
+            log.debug( "Just augmented the buffer pool" ) ;
+        }
     }
 
     
@@ -41,13 +75,14 @@
      * @see org.apache.eve.buffer.BufferPoolMonitor#bufferReleased(
      * org.apache.eve.buffer.BufferPool, java.nio.ByteBuffer, java.lang.Object)
      */
-    public void bufferReleased(
-        BufferPool a_bp,
-        ByteBuffer a_buffer,
-        Object a_releaser)
+    public void bufferReleased( BufferPool bp, ByteBuffer buffer,
+								Object releaser)
     {
-        System.out.println( a_releaser + " released " + a_buffer 
-                + " from pool " + a_bp ) ;
+        if ( log.isDebugEnabled() )
+        {
+            log.debug( releaser + " released " + buffer 
+                    + " from pool " + bp ) ;
+        }
     }
 
     
@@ -55,13 +90,13 @@
      * @see org.apache.eve.buffer.BufferPoolMonitor#bufferTaken(
      * org.apache.eve.buffer.BufferPool, java.nio.ByteBuffer, java.lang.Object)
      */
-    public void bufferTaken(
-        BufferPool a_bp,
-        ByteBuffer a_buffer,
-        Object a_taker)
+    public void bufferTaken( BufferPool bp, ByteBuffer buffer,
+							 Object taker )
     {
-        System.out.println( a_taker + " took " + a_buffer 
-                + " from pool " + a_bp ) ;
+        if ( log.isDebugEnabled() )
+        {
+            log.debug( taker + " took " + buffer + " from pool " + bp ) ;
+        }
     }
 
     
@@ -69,13 +104,14 @@
      * @see org.apache.eve.buffer.BufferPoolMonitor#interestClaimed(
      * org.apache.eve.buffer.BufferPool, java.nio.ByteBuffer, java.lang.Object)
      */
-    public void interestClaimed(
-        BufferPool a_bp,
-        ByteBuffer a_buffer,
-        Object a_claimer)
+    public void interestClaimed( BufferPool bp, ByteBuffer buffer, 
+                                 Object claimer )
     {
-        System.out.println( a_claimer + " claimed interest in " + a_buffer 
-                + " from pool " + a_bp ) ;
+        if ( log.isDebugEnabled() )
+        {
+            log.debug( claimer + " claimed interest in " + buffer 
+                        + " from pool " + bp ) ;
+        }
     }
 
     
@@ -83,13 +119,14 @@
      * @see org.apache.eve.buffer.BufferPoolMonitor#interestReleased(
      * org.apache.eve.buffer.BufferPool, java.nio.ByteBuffer, java.lang.Object)
      */
-    public void interestReleased(
-        BufferPool a_bp,
-        ByteBuffer a_buffer,
-        Object a_releaser)
+    public void interestReleased( BufferPool bp, ByteBuffer buffer,
+								  Object releaser )
     {
-        System.out.println( a_releaser + " released interest in " + a_buffer 
-                + " from pool " + a_bp ) ;
+        if ( log.isDebugEnabled() )
+        {
+            log.debug( releaser + " released interest in " + buffer 
+                    + " from pool " + bp ) ;
+        }
     }
 
     
@@ -97,14 +134,15 @@
      * @see org.apache.eve.buffer.BufferPoolMonitor#nonPooledBuffer(
      * org.apache.eve.buffer.BufferPool, java.nio.ByteBuffer, java.lang.Object)
      */
-    public void nonPooledBuffer(
-        BufferPool a_bp,
-        ByteBuffer a_buffer,
-        Object a_party)
-    {
-        System.out.println( a_party + " tried to release interest in " 
-                + a_buffer + " from pool " + a_bp 
-                + " but resouce was not from this pool.") ;
+    public void nonPooledBuffer( BufferPool bp, ByteBuffer buffer,
+								 Object party )
+    {
+        if ( log.isErrorEnabled() )
+        {
+            log.error( party + " tried to release interest in " 
+                        + buffer + " from pool " + bp 
+                        + " but resouce was not from this pool.") ;
+        }
     }
 
     
@@ -112,11 +150,14 @@
      * @see org.apache.eve.buffer.BufferPoolMonitor#resourceUnavailable(
      * org.apache.eve.buffer.BufferPool, java.lang.Object)
      */
-    public void resourceUnavailable( BufferPool a_bp, Object a_party )
+    public void resourceUnavailable( BufferPool bp, Object party )
     {
-        System.out.println( "BufferPool " + a_bp 
+        if ( log.isErrorEnabled() )
+        {
+            log.error( "BufferPool " + bp 
                 + " is at capacity - cannot allocate buffer resouce to " 
-                + a_party ) ;
+                + party ) ;
+        }
     }
 
     
@@ -124,14 +165,15 @@
      * @see org.apache.eve.buffer.BufferPoolMonitor#unregisteredParty(
      * org.apache.eve.buffer.BufferPool, java.nio.ByteBuffer, java.lang.Object)
      */
-    public void unregisteredParty(
-        BufferPool a_bp,
-        ByteBuffer a_buffer,
-        Object a_party)
-    {
-        System.out.println( a_party 
-                + " has not registered as claiming interest on " + a_buffer 
-                + " from pool " + a_bp ) ;
+    public void unregisteredParty( BufferPool bp, ByteBuffer buffer, 
+                                   Object party )
+    {
+        if ( log.isDebugEnabled() )
+        {
+            log.debug( party 
+                + " has not registered as claiming interest on " + buffer 
+                + " from pool " + bp ) ;
+        }
     }
 
 
@@ -139,11 +181,14 @@
      * @see org.apache.eve.buffer.BufferPoolMonitor#releaseOfUnclaimed(
      * org.apache.eve.buffer.BufferPool, java.nio.ByteBuffer, java.lang.Object)
      */
-    public void releaseOfUnclaimed( BufferPool a_bp, ByteBuffer a_buffer,
-									Object a_releaser )
+    public void releaseOfUnclaimed( BufferPool bp, ByteBuffer buffer,
+									Object releaser )
     {
-        System.out.println( a_releaser + " attempted to release interest in " 
-                + a_buffer + " from pool " 
-                + a_bp + " when the buffer was not claimed." ) ;
+        if ( log.isDebugEnabled() )
+        {
+            log.debug( releaser + " attempted to release interest in " 
+                    + buffer + " from pool " 
+                    + bp + " when the buffer was not claimed." ) ;
+        }
     }
 }

Modified: incubator/directory/eve/trunk/frontend/buffer/spi/src/java/org/apache/eve/buffer/BufferPoolMonitor.java
==============================================================================
--- incubator/directory/eve/trunk/frontend/buffer/spi/src/java/org/apache/eve/buffer/BufferPoolMonitor.java
(original)
+++ incubator/directory/eve/trunk/frontend/buffer/spi/src/java/org/apache/eve/buffer/BufferPoolMonitor.java
Mon Mar 22 19:30:55 2004
@@ -1,52 +1,19 @@
 /*
-
- ============================================================================
-                   The Apache Software License, Version 1.1
- ============================================================================
-
- Copyright (C) 1999-2002 The Apache Software Foundation. All rights reserved.
-
- Redistribution and use in source and binary forms, with or without modifica-
- tion, are permitted provided that the following conditions are met:
-
- 1. Redistributions of  source code must  retain the above copyright  notice,
-    this list of conditions and the following disclaimer.
-
- 2. Redistributions in binary form must reproduce the above copyright notice,
-    this list of conditions and the following disclaimer in the documentation
-    and/or other materials provided with the distribution.
-
- 3. The end-user documentation included with the redistribution, if any, must
-    include  the following  acknowledgment:  "This product includes  software
-    developed  by the  Apache Software Foundation  (http://www.apache.org/)."
-    Alternately, this  acknowledgment may  appear in the software itself,  if
-    and wherever such third-party acknowledgments normally appear.
-
- 4. The names "Eve Directory Server", "Apache Directory Project", "Apache Eve" 
-    and "Apache Software Foundation"  must not be used to endorse or promote
-    products derived  from this  software without  prior written
-    permission. For written permission, please contact apache@apache.org.
-
- 5. Products  derived from this software may not  be called "Apache", nor may
-    "Apache" appear  in their name,  without prior written permission  of the
-    Apache Software Foundation.
-
- THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES,
- INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
- FITNESS  FOR A PARTICULAR  PURPOSE ARE  DISCLAIMED.  IN NO  EVENT SHALL  THE
- APACHE SOFTWARE  FOUNDATION  OR ITS CONTRIBUTORS  BE LIABLE FOR  ANY DIRECT,
- INDIRECT, INCIDENTAL, SPECIAL,  EXEMPLARY, OR CONSEQUENTIAL  DAMAGES (INCLU-
- DING, BUT NOT LIMITED TO, PROCUREMENT  OF SUBSTITUTE GOODS OR SERVICES; LOSS
- OF USE, DATA, OR  PROFITS; OR BUSINESS  INTERRUPTION)  HOWEVER CAUSED AND ON
- ANY  THEORY OF LIABILITY,  WHETHER  IN CONTRACT,  STRICT LIABILITY,  OR TORT
- (INCLUDING  NEGLIGENCE OR  OTHERWISE) ARISING IN  ANY WAY OUT OF THE  USE OF
- THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
- This software  consists of voluntary contributions made  by many individuals
- on  behalf of the Apache Software  Foundation. For more  information on the
- Apache Software Foundation, please see <http://www.apache.org/>.
-
-*/
+ *   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.buffer ;
 
 
@@ -56,8 +23,8 @@
 /**
  * The BufferPool monitor interface.
  *
- * @author <a href="mailto:akarasulu@apache.org">Alex Karasulu</a>
- * @author $Author$
+ * @author <a href="mailto:directory-dev@incubator.apache.org">
+ * Apache Directory Project</a>
  * @version $Rev$
  */
 public interface BufferPoolMonitor
@@ -65,87 +32,83 @@
     /**
      * Monitors the augmentation of a BufferPool.
      * 
-     * @param a_bp the BufferPool that grew
+     * @param bp the BufferPool that grew
      */
-    void augmented( BufferPool a_bp ) ;
+    void augmented( BufferPool bp ) ;
     
     /**
      * Monitors the release of an unclaimed buffer which cannot be released if
      * there is no claim and it is on the free list.
      * 
-     * @param a_bp the BufferPool the buffer is released back to
-     * @param a_buffer the buffer that is released
-     * @param a_releaser the object doing the releasing
+     * @param bp the BufferPool the buffer is released back to
+     * @param buffer the buffer that is released
+     * @param releaser the object doing the releasing
      */
-    void releaseOfUnclaimed( BufferPool a_bp, ByteBuffer a_buffer, 
-                             Object a_releaser ) ;
+    void releaseOfUnclaimed( BufferPool bp, ByteBuffer buffer, 
+                             Object releaser ) ;
     
     /**
      * Monitors the giving of a buffer to a client.
      * 
-     * @param a_bp the BufferPool the buffer is taken from
-     * @param a_buffer the buffer that is taken
-     * @param a_taker the object doing the taking
+     * @param bp the BufferPool the buffer is taken from
+     * @param buffer the buffer that is taken
+     * @param taker the object doing the taking
      */
-    void bufferTaken( BufferPool a_bp, ByteBuffer a_buffer, Object a_taker ) ;
+    void bufferTaken( BufferPool bp, ByteBuffer buffer, Object taker ) ;
     
     /**
      * Monitors the release of a buffer to be reclaimed onto the free list.
      * 
-     * @param a_bp the BufferPool the buffer is released back to
-     * @param a_buffer the buffer that is released
-     * @param a_releaser the object doing the releasing
+     * @param bp the BufferPool the buffer is released back to
+     * @param buffer the buffer that is released
+     * @param releaser the object doing the releasing
      */
-    void bufferReleased( BufferPool a_bp, ByteBuffer a_buffer, 
-                         Object a_releaser ) ;
+    void bufferReleased( BufferPool bp, ByteBuffer buffer, Object releaser ) ;
     
     /**
      * Monitors the claim of interest in a buffer.
      * 
-     * @param a_bp the BufferPool the buffer of interest is from
-     * @param a_buffer the buffer that is the interest
-     * @param a_claimer the object doing the interest claiming
+     * @param bp the BufferPool the buffer of interest is from
+     * @param buffer the buffer that is the interest
+     * @param claimer the object doing the interest claiming
      */
-    void interestClaimed( BufferPool a_bp,  ByteBuffer a_buffer, 
-                          Object a_claimer ) ;
+    void interestClaimed( BufferPool bp,  ByteBuffer buffer, Object claimer ) ;
     
     /**
      * Monitors the release of a claim on a buffer.
      * 
-     * @param a_bp the BufferPool the buffer of interest is from
-     * @param a_buffer the buffer that has an interest claim released
-     * @param a_releaser the object doing the interest claim releasing
+     * @param bp the BufferPool the buffer of interest is from
+     * @param buffer the buffer that has an interest claim released
+     * @param releaser the object doing the interest claim releasing
      */
-    void interestReleased( BufferPool a_bp,  ByteBuffer a_buffer, 
-                          Object a_releaser ) ;
+    void interestReleased( BufferPool bp,  ByteBuffer buffer, 
+                           Object releaser ) ;
 
     /**
      * Monitors situations where the BufferPool is in full use at its maximum 
      * capacity and a request for a Buffer cannot be satisfied.
      * 
-     * @param a_bp the BufferPool the where the buffer is unavailable
-     * @param a_party the party trying to acquire the buffer resource
+     * @param bp the BufferPool the where the buffer is unavailable
+     * @param party the party trying to acquire the buffer resource
      */
-    void resourceUnavailable( BufferPool a_bp, Object a_party ) ;
+    void resourceUnavailable( BufferPool bp, Object party ) ;
     
     /**
      * A party that never registered interest in a buffer is attempting to 
      * remove its interest on a buffer.
      * 
-     * @param a_bp the buffer pool this fault is occuring in
-     * @param a_buffer the buffer the party is trying to claim interest on
-     * @param a_party the party trying to claim interest
+     * @param bp the buffer pool this fault is occuring in
+     * @param buffer the buffer the party is trying to claim interest on
+     * @param party the party trying to claim interest
      */
-    void unregisteredParty( BufferPool a_bp, ByteBuffer a_buffer, 
-                            Object a_party ) ;
+    void unregisteredParty( BufferPool bp, ByteBuffer buffer, Object party ) ;
     
     /**
      * Monitors attempts to deal with a buffer that is not a pooled resource.
      * 
-     * @param a_bp the BufferPool that does not contain the buffer
-     * @param a_buffer the buffer that is not pooled in the BufferPool
-     * @param a_party the party that attempted the operation causing the fault
+     * @param bp the BufferPool that does not contain the buffer
+     * @param buffer the buffer that is not pooled in the BufferPool
+     * @param party the party that attempted the operation causing the fault
      */
-    void nonPooledBuffer( BufferPool a_bp, ByteBuffer a_buffer, 
-                          Object a_party ) ;
+    void nonPooledBuffer( BufferPool bp, ByteBuffer buffer, Object party ) ;
 }

Modified: incubator/directory/eve/trunk/frontend/buffer/spi/src/java/org/apache/eve/buffer/BufferPoolMonitorAdapter.java
==============================================================================
--- incubator/directory/eve/trunk/frontend/buffer/spi/src/java/org/apache/eve/buffer/BufferPoolMonitorAdapter.java
(original)
+++ incubator/directory/eve/trunk/frontend/buffer/spi/src/java/org/apache/eve/buffer/BufferPoolMonitorAdapter.java
Mon Mar 22 19:30:55 2004
@@ -35,7 +35,7 @@
      * @see org.apache.eve.buffer.BufferPoolMonitor#augmented(
      * org.apache.eve.buffer.BufferPool)
      */
-    public void augmented( BufferPool a_bp )
+    public void augmented( BufferPool bp )
     {
     }
 
@@ -44,8 +44,8 @@
      * @see org.apache.eve.buffer.BufferPoolMonitor#bufferTaken(
      * org.apache.eve.buffer.BufferPool, java.nio.ByteBuffer, java.lang.Object)
      */
-    public void bufferTaken( BufferPool a_bp, ByteBuffer a_buffer,
-        Object a_taker )
+    public void bufferTaken( BufferPool bp, ByteBuffer buffer,
+        Object taker )
     {
     }
 
@@ -54,8 +54,8 @@
      * @see org.apache.eve.buffer.BufferPoolMonitor#bufferReleased(
      * org.apache.eve.buffer.BufferPool, java.nio.ByteBuffer, java.lang.Object)
      */
-    public void bufferReleased( BufferPool a_bp, ByteBuffer a_buffer,
-        Object a_releaser )
+    public void bufferReleased( BufferPool bp, ByteBuffer buffer,
+        Object releaser )
     {
     }
 
@@ -64,8 +64,8 @@
      * @see org.apache.eve.buffer.BufferPoolMonitor#interestClaimed(
      * org.apache.eve.buffer.BufferPool, java.nio.ByteBuffer, java.lang.Object)
      */
-    public void interestClaimed( BufferPool a_bp, ByteBuffer a_buffer,
-        Object a_claimer )
+    public void interestClaimed( BufferPool bp, ByteBuffer buffer,
+        Object claimer )
     {
     }
     
@@ -74,8 +74,8 @@
      * @see org.apache.eve.buffer.BufferPoolMonitor#interestReleased(
      * org.apache.eve.buffer.BufferPool, java.nio.ByteBuffer, java.lang.Object)
      */
-    public void interestReleased( BufferPool a_bp, ByteBuffer a_buffer,
-                                  Object a_releaser )
+    public void interestReleased( BufferPool bp, ByteBuffer buffer,
+                                  Object releaser )
     {
     }
 
@@ -84,7 +84,7 @@
      * @see org.apache.eve.buffer.BufferPoolMonitor#resourceUnavailable(
      * org.apache.eve.buffer.BufferPool, java.lang.Object)
      */
-    public void resourceUnavailable( BufferPool a_bp, Object a_party ) 
+    public void resourceUnavailable( BufferPool bp, Object party ) 
     {
     }
 
@@ -93,8 +93,8 @@
      * @see org.apache.eve.buffer.BufferPoolMonitor#unregisteredParty(
      * org.apache.eve.buffer.BufferPool, java.nio.ByteBuffer, java.lang.Object)
      */
-    public void unregisteredParty( BufferPool a_bp, ByteBuffer a_buffer, 
-                                   Object a_party ) 
+    public void unregisteredParty( BufferPool bp, ByteBuffer buffer, 
+                                   Object party ) 
     {
     }
     
@@ -103,8 +103,8 @@
      * @see org.apache.eve.buffer.BufferPoolMonitor#nonPooledBuffer(
      * org.apache.eve.buffer.BufferPool, java.nio.ByteBuffer, java.lang.Object)
      */
-    public void nonPooledBuffer( BufferPool a_bp, ByteBuffer a_buffer, 
-                                 Object a_party )
+    public void nonPooledBuffer( BufferPool bp, ByteBuffer buffer, 
+                                 Object party )
     {
     }
     
@@ -113,8 +113,8 @@
      * @see org.apache.eve.buffer.BufferPoolMonitor#releaseOfUnclaimed(
      * org.apache.eve.buffer.BufferPool, java.nio.ByteBuffer, java.lang.Object)
      */
-    public void releaseOfUnclaimed( BufferPool a_bp, ByteBuffer a_buffer,
-									Object a_releaser )
+    public void releaseOfUnclaimed( BufferPool bp, ByteBuffer buffer,
+									Object releaser )
     {
     }
 }

Modified: incubator/directory/eve/trunk/frontend/buffer/spi/src/java/org/apache/eve/buffer/DefaultBufferPoolConfig.java
==============================================================================
--- incubator/directory/eve/trunk/frontend/buffer/spi/src/java/org/apache/eve/buffer/DefaultBufferPoolConfig.java
(original)
+++ incubator/directory/eve/trunk/frontend/buffer/spi/src/java/org/apache/eve/buffer/DefaultBufferPoolConfig.java
Mon Mar 22 19:30:55 2004
@@ -1,60 +1,27 @@
 /*
-
- ============================================================================
-                   The Apache Software License, Version 1.1
- ============================================================================
-
- Copyright (C) 1999-2002 The Apache Software Foundation. All rights reserved.
-
- Redistribution and use in source and binary forms, with or without modifica-
- tion, are permitted provided that the following conditions are met:
-
- 1. Redistributions of  source code must  retain the above copyright  notice,
-    this list of conditions and the following disclaimer.
-
- 2. Redistributions in binary form must reproduce the above copyright notice,
-    this list of conditions and the following disclaimer in the documentation
-    and/or other materials provided with the distribution.
-
- 3. The end-user documentation included with the redistribution, if any, must
-    include  the following  acknowledgment:  "This product includes  software
-    developed  by the  Apache Software Foundation  (http://www.apache.org/)."
-    Alternately, this  acknowledgment may  appear in the software itself,  if
-    and wherever such third-party acknowledgments normally appear.
-
- 4. The names "Eve Directory Server", "Apache Directory Project", "Apache Eve" 
-    and "Apache Software Foundation"  must not be used to endorse or promote
-    products derived  from this  software without  prior written
-    permission. For written permission, please contact apache@apache.org.
-
- 5. Products  derived from this software may not  be called "Apache", nor may
-    "Apache" appear  in their name,  without prior written permission  of the
-    Apache Software Foundation.
-
- THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES,
- INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
- FITNESS  FOR A PARTICULAR  PURPOSE ARE  DISCLAIMED.  IN NO  EVENT SHALL  THE
- APACHE SOFTWARE  FOUNDATION  OR ITS CONTRIBUTORS  BE LIABLE FOR  ANY DIRECT,
- INDIRECT, INCIDENTAL, SPECIAL,  EXEMPLARY, OR CONSEQUENTIAL  DAMAGES (INCLU-
- DING, BUT NOT LIMITED TO, PROCUREMENT  OF SUBSTITUTE GOODS OR SERVICES; LOSS
- OF USE, DATA, OR  PROFITS; OR BUSINESS  INTERRUPTION)  HOWEVER CAUSED AND ON
- ANY  THEORY OF LIABILITY,  WHETHER  IN CONTRACT,  STRICT LIABILITY,  OR TORT
- (INCLUDING  NEGLIGENCE OR  OTHERWISE) ARISING IN  ANY WAY OUT OF THE  USE OF
- THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
- This software  consists of voluntary contributions made  by many individuals
- on  behalf of the Apache Software  Foundation. For more  information on the
- Apache Software Foundation, please see <http://www.apache.org/>.
-
-*/
+ *   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.buffer ;
 
 
 /**
  * A BufferPoolConfig implementation bean.
  *
- * @author <a href="mailto:akarasulu@apache.org">Alex Karasulu</a>
- * @author $Author$
+ * @author <a href="mailto:directory-dev@incubator.apache.org">
+ * Apache Directory Project</a>
  * @version $Rev$
  */
 public class DefaultBufferPoolConfig implements BufferPoolConfig
@@ -74,20 +41,20 @@
     /**
      * Creates a BufferPool configuration bean using the supplied values.
      * 
-     * @param a_name the name
-     * @param a_inc the growth increment
-     * @param a_max the maximum pool size
-     * @param a_ini the initial pool size 
-     * @param a_size the size of the buffers pooled
+     * @param name the name
+     * @param inc the growth increment
+     * @param max the maximum pool size
+     * @param ini the initial pool size 
+     * @param size the size of the buffers pooled
      */
-    public DefaultBufferPoolConfig( String a_name, int a_inc, int a_max, 
-                                    int a_ini, int a_size )
+    public DefaultBufferPoolConfig( String name, int inc, int max, 
+                                    int ini, int size )
     {
-        m_name = a_name ;
-        m_inc = a_inc ;
-        m_max = a_max ;
-        m_ini = a_ini ;
-        m_size = a_size ;
+        m_name = name ;
+        m_inc = inc ;
+        m_max = max ;
+        m_ini = ini ;
+        m_size = size ;
     }
     
     

Mime
View raw message