Return-Path: 
 <commits-return-38622-apmail-directory-commits-archive=directory.apache.org@directory.apache.org>
X-Original-To: apmail-directory-commits-archive@www.apache.org
Delivered-To: apmail-directory-commits-archive@www.apache.org
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by minotaur.apache.org (Postfix) with SMTP id 2F3BA118CB
	for <apmail-directory-commits-archive@www.apache.org>;
 Thu, 19 Jun 2014 15:04:57 +0000 (UTC)
Received: (qmail 66121 invoked by uid 500); 19 Jun 2014 15:04:56 -0000
Delivered-To: apmail-directory-commits-archive@directory.apache.org
Received: (qmail 66080 invoked by uid 500); 19 Jun 2014 15:04:56 -0000
Mailing-List: contact commits-help@directory.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@directory.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@directory.apache.org>
List-Post: <mailto:commits@directory.apache.org>
List-Id: <commits.directory.apache.org>
Reply-To: dev@directory.apache.org
Delivered-To: mailing list commits@directory.apache.org
Received: (qmail 66071 invoked by uid 99); 19 Jun 2014 15:04:56 -0000
Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230)
    by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 19 Jun 2014 15:04:56 +0000
X-ASF-Spam-Status: No, hits=-2000.0 required=5.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4)
    by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 19 Jun 2014 15:04:57 +0000
Received: from eris.apache.org (localhost [127.0.0.1])
	by eris.apache.org (Postfix) with ESMTP id 82BF92388860;
	Thu, 19 Jun 2014 15:04:32 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1603911 - in /directory/mavibot/trunk/mavibot: pom.xml
 src/main/java/org/apache/directory/mavibot/btree/PersistedBTree.java
 src/main/java/org/apache/directory/mavibot/btree/PersistedPageHolder.java
Date: Thu, 19 Jun 2014 15:04:32 -0000
To: commits@directory.apache.org
From: kayyagari@apache.org
X-Mailer: svnmailer-1.0.9
Message-Id: <20140619150432.82BF92388860@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: kayyagari
Date: Thu Jun 19 15:04:31 2014
New Revision: 1603911

URL: http://svn.apache.org/r1603911
Log:
removed dependency on ehCache

Modified:
    directory/mavibot/trunk/mavibot/pom.xml
    directory/mavibot/trunk/mavibot/src/main/java/org/apache/directory/mavibot/btree/PersistedBTree.java
    directory/mavibot/trunk/mavibot/src/main/java/org/apache/directory/mavibot/btree/PersistedPageHolder.java

Modified: directory/mavibot/trunk/mavibot/pom.xml
URL: http://svn.apache.org/viewvc/directory/mavibot/trunk/mavibot/pom.xml?rev=1603911&r1=1603910&r2=1603911&view=diff
==============================================================================
--- directory/mavibot/trunk/mavibot/pom.xml (original)
+++ directory/mavibot/trunk/mavibot/pom.xml Thu Jun 19 15:04:31 2014
@@ -39,7 +39,6 @@
     <log4j.version>1.2.17</log4j.version>
     <slf4j.api.version>1.7.7</slf4j.api.version>
     <slf4j.log4j12.version>1.7.7</slf4j.log4j12.version>
-    <ehcache.version>2.4.4</ehcache.version>
   </properties>
 
   <dependencies>
@@ -62,12 +61,6 @@
       <version>${commons.io.version}</version>
     </dependency>
 
-    <dependency>
-      <groupId>net.sf.ehcache</groupId>
-      <artifactId>ehcache-core</artifactId>
-      <version>${ehcache.version}</version>
-    </dependency>
-
     <!-- Logging dependencies -->
 
     <dependency>

Modified: directory/mavibot/trunk/mavibot/src/main/java/org/apache/directory/mavibot/btree/PersistedBTree.java
URL: http://svn.apache.org/viewvc/directory/mavibot/trunk/mavibot/src/main/java/org/apache/directory/mavibot/btree/PersistedBTree.java?rev=1603911&r1=1603910&r2=1603911&view=diff
==============================================================================
--- directory/mavibot/trunk/mavibot/src/main/java/org/apache/directory/mavibot/btree/PersistedBTree.java (original)
+++ directory/mavibot/trunk/mavibot/src/main/java/org/apache/directory/mavibot/btree/PersistedBTree.java Thu Jun 19 15:04:31 2014
@@ -26,10 +26,6 @@ import java.nio.ByteBuffer;
 import java.nio.channels.FileChannel;
 import java.util.concurrent.ConcurrentLinkedQueue;
 
-import net.sf.ehcache.Cache;
-import net.sf.ehcache.Status;
-import net.sf.ehcache.config.CacheConfiguration;
-
 import org.apache.commons.collections.map.LRUMap;
 import org.apache.directory.mavibot.btree.exception.KeyNotFoundException;
 import org.slf4j.Logger;
@@ -165,15 +161,6 @@ public class PersistedBTree<K, V> extend
             // Create the queue containing the pending read transactions
             readTransactions = new ConcurrentLinkedQueue<ReadTransaction<K, V>>();
 
-            // Initialize the caches
-            CacheConfiguration cacheConfiguration = new CacheConfiguration();
-            cacheConfiguration.setName( "pages" );
-            cacheConfiguration.setEternal( true );
-            cacheConfiguration.setOverflowToDisk( false );
-            cacheConfiguration.setCacheLoaderTimeoutMillis( 0 );
-            cacheConfiguration.setMaxElementsInMemory( cacheSize );
-            cacheConfiguration.setMemoryStoreEvictionPolicy( "LRU" );
-
             if ( cacheSize < 1 )
             {
                 cacheSize = 1;

Modified: directory/mavibot/trunk/mavibot/src/main/java/org/apache/directory/mavibot/btree/PersistedPageHolder.java
URL: http://svn.apache.org/viewvc/directory/mavibot/trunk/mavibot/src/main/java/org/apache/directory/mavibot/btree/PersistedPageHolder.java?rev=1603911&r1=1603910&r2=1603911&view=diff
==============================================================================
--- directory/mavibot/trunk/mavibot/src/main/java/org/apache/directory/mavibot/btree/PersistedPageHolder.java (original)
+++ directory/mavibot/trunk/mavibot/src/main/java/org/apache/directory/mavibot/btree/PersistedPageHolder.java Thu Jun 19 15:04:31 2014
@@ -22,8 +22,6 @@ package org.apache.directory.mavibot.btr
 
 import java.io.IOException;
 
-import net.sf.ehcache.Element;
-
 import org.apache.commons.collections.map.LRUMap;
 import org.apache.directory.mavibot.btree.exception.BTreeOperationException;
 import org.apache.directory.mavibot.btree.exception.EndOfFileExceededException;