Return-Path: Delivered-To: apmail-directory-commits-archive@www.apache.org Received: (qmail 60444 invoked from network); 1 May 2010 16:22:21 -0000 Received: from unknown (HELO mail.apache.org) (140.211.11.3) by 140.211.11.9 with SMTP; 1 May 2010 16:22:21 -0000 Received: (qmail 40144 invoked by uid 500); 1 May 2010 16:22:21 -0000 Delivered-To: apmail-directory-commits-archive@directory.apache.org Received: (qmail 40085 invoked by uid 500); 1 May 2010 16:22:21 -0000 Mailing-List: contact commits-help@directory.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@directory.apache.org Delivered-To: mailing list commits@directory.apache.org Received: (qmail 40078 invoked by uid 99); 1 May 2010 16:22:21 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 01 May 2010 16:22:21 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.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; Sat, 01 May 2010 16:22:18 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 5EB7D23889B9; Sat, 1 May 2010 16:21:27 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r940071 - in /directory/apacheds/trunk: avl-partition/src/main/java/org/apache/directory/server/core/partition/avl/ jdbm-store/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/ xdbm-base/src/main/java/org/apache/dire... Date: Sat, 01 May 2010 16:21:27 -0000 To: commits@directory.apache.org From: seelmann@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20100501162127.5EB7D23889B9@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: seelmann Date: Sat May 1 16:21:26 2010 New Revision: 940071 URL: http://svn.apache.org/viewvc?rev=940071&view=rev Log: Introduce type parameter for master table Modified: directory/apacheds/trunk/avl-partition/src/main/java/org/apache/directory/server/core/partition/avl/AvlMasterTable.java directory/apacheds/trunk/jdbm-store/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmMasterTable.java directory/apacheds/trunk/xdbm-base/src/main/java/org/apache/directory/server/xdbm/MasterTable.java Modified: directory/apacheds/trunk/avl-partition/src/main/java/org/apache/directory/server/core/partition/avl/AvlMasterTable.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/avl-partition/src/main/java/org/apache/directory/server/core/partition/avl/AvlMasterTable.java?rev=940071&r1=940070&r2=940071&view=diff ============================================================================== --- directory/apacheds/trunk/avl-partition/src/main/java/org/apache/directory/server/core/partition/avl/AvlMasterTable.java (original) +++ directory/apacheds/trunk/avl-partition/src/main/java/org/apache/directory/server/core/partition/avl/AvlMasterTable.java Sat May 1 16:21:26 2010 @@ -34,7 +34,7 @@ import org.apache.directory.server.xdbm. * @author Apache Directory Project * @version $Rev$, $Date$ */ -public class AvlMasterTable extends AvlTable implements MasterTable +public class AvlMasterTable extends AvlTable implements MasterTable { private Properties props = new Properties(); private AtomicLong counter = new AtomicLong( 0 ); Modified: directory/apacheds/trunk/jdbm-store/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmMasterTable.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/jdbm-store/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmMasterTable.java?rev=940071&r1=940070&r2=940071&view=diff ============================================================================== --- directory/apacheds/trunk/jdbm-store/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmMasterTable.java (original) +++ directory/apacheds/trunk/jdbm-store/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmMasterTable.java Sat May 1 16:21:26 2010 @@ -37,7 +37,7 @@ import org.apache.directory.shared.ldap. * @author Apache Directory Project * @version $Rev$ */ -public class JdbmMasterTable extends JdbmTable implements MasterTable +public class JdbmMasterTable extends JdbmTable implements MasterTable { private static final StringComparator STRCOMP = new StringComparator(); Modified: directory/apacheds/trunk/xdbm-base/src/main/java/org/apache/directory/server/xdbm/MasterTable.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-base/src/main/java/org/apache/directory/server/xdbm/MasterTable.java?rev=940071&r1=940070&r2=940071&view=diff ============================================================================== --- directory/apacheds/trunk/xdbm-base/src/main/java/org/apache/directory/server/xdbm/MasterTable.java (original) +++ directory/apacheds/trunk/xdbm-base/src/main/java/org/apache/directory/server/xdbm/MasterTable.java Sat May 1 16:21:26 2010 @@ -21,12 +21,12 @@ package org.apache.directory.server.xdbm /** - * A master table used to store indexible entries. + * A master table used to store indexable entries. * * @author Apache Directory Project * @version $Rev$ */ -public interface MasterTable extends Table +public interface MasterTable extends Table { /** the base name for the db file for this table */ String DBF = "master"; @@ -42,7 +42,7 @@ public interface MasterTable extends * @return the entry with operational attributes and all. * @throws Exception if there is a read error on the underlying Db. */ - E get( Long id ) throws Exception; + E get( ID id ) throws Exception; /** @@ -53,7 +53,7 @@ public interface MasterTable extends * @param id unique identifier of the entry to put * @throws Exception if there is a write error on the underlying Db. */ - void put( Long id, E entry ) throws Exception; + void put( ID id, E entry ) throws Exception; /** @@ -63,7 +63,7 @@ public interface MasterTable extends * @return the deleted entry * @throws Exception if there is a write error on the underlying Db */ - void delete( Long id ) throws Exception; + void delete( ID id ) throws Exception; /** @@ -72,7 +72,7 @@ public interface MasterTable extends * * @throws Exception if the admin table storing sequences cannot be read */ - Long getCurrentId() throws Exception; + ID getCurrentId() throws Exception; /** @@ -83,7 +83,7 @@ public interface MasterTable extends * by one * @throws Exception on failure to update the id sequence */ - Long getNextId() throws Exception; + ID getNextId() throws Exception; /**