You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by el...@apache.org on 2006/01/18 23:48:25 UTC
svn commit: r370298 -
/directory/trunks/apacheds/core/src/main/java/org/apache/ldap/server/partition/impl/btree/jdbm/JdbmIndex.java
Author: elecharny
Date: Wed Jan 18 14:48:22 2006
New Revision: 370298
URL: http://svn.apache.org/viewcvs?rev=370298&view=rev
Log:
- Get rid of a.o.regexp and oro, replaced them by jdk 1.4 regexp
Modified:
directory/trunks/apacheds/core/src/main/java/org/apache/ldap/server/partition/impl/btree/jdbm/JdbmIndex.java
Modified: directory/trunks/apacheds/core/src/main/java/org/apache/ldap/server/partition/impl/btree/jdbm/JdbmIndex.java
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/core/src/main/java/org/apache/ldap/server/partition/impl/btree/jdbm/JdbmIndex.java?rev=370298&r1=370297&r2=370298&view=diff
==============================================================================
--- directory/trunks/apacheds/core/src/main/java/org/apache/ldap/server/partition/impl/btree/jdbm/JdbmIndex.java (original)
+++ directory/trunks/apacheds/core/src/main/java/org/apache/ldap/server/partition/impl/btree/jdbm/JdbmIndex.java Wed Jan 18 14:48:22 2006
@@ -20,6 +20,7 @@
import java.io.File;
import java.io.IOException;
import java.math.BigInteger;
+import java.util.regex.Pattern;
import javax.naming.NamingEnumeration;
import javax.naming.NamingException;
@@ -37,7 +38,6 @@
import org.apache.ldap.server.partition.impl.btree.IndexComparator;
import org.apache.ldap.server.partition.impl.btree.IndexEnumeration;
import org.apache.ldap.server.schema.SerializableComparator;
-import org.apache.regexp.RE;
/**
@@ -386,7 +386,7 @@
/**
* @see Index#listIndices(org.apache.regexp.RE)
*/
- public IndexEnumeration listIndices( RE regex )
+ public IndexEnumeration listIndices( Pattern regex )
throws NamingException
{
return new IndexEnumeration( forward.listTuples(), false, regex );
@@ -397,7 +397,7 @@
* @see Index#listIndices(org.apache.regexp.RE,
* java.lang.String)
*/
- public IndexEnumeration listIndices( RE regex, String prefix )
+ public IndexEnumeration listIndices( Pattern regex, String prefix )
throws NamingException
{
return new IndexEnumeration( forward.listTuples(
@@ -438,7 +438,7 @@
* @see Index#hasValue(org.apache.regexp.RE,
* java.math.BigInteger)
*/
- public boolean hasValue( RE regex, BigInteger id )
+ public boolean hasValue( Pattern regex, BigInteger id )
throws NamingException
{
IndexEnumeration list = new IndexEnumeration(