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 2010/03/04 00:05:32 UTC
svn commit: r918756 [3/6] - in /directory/shared/trunk:
dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/engine/
dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/reponse/
dsml-parser/src/main/java/org/apache/directory/shared/dsm...
Copied: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/name/DN.java (from r918714, directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/name/LdapDN.java)
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/name/DN.java?p2=directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/name/DN.java&p1=directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/name/LdapDN.java&r1=918714&r2=918756&rev=918756&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/name/LdapDN.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/name/DN.java Wed Mar 3 23:05:29 2010
@@ -43,7 +43,7 @@
/**
- * The LdapDN class contains a DN (Distinguished Name).
+ * The DN class contains a DN (Distinguished Name).
*
* Its specification can be found in RFC 2253,
* "UTF-8 String Representation of Distinguished Names".
@@ -61,10 +61,10 @@
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
* @version $Rev$, $Date$
*/
-public class LdapDN implements Name, Externalizable
+public class DN implements Name, Externalizable
{
/** The LoggerFactory used by this class */
- protected static final Logger LOG = LoggerFactory.getLogger( LdapDN.class );
+ protected static final Logger LOG = LoggerFactory.getLogger( DN.class );
/**
* Declares the Serial Version Uid.
@@ -102,17 +102,17 @@
/** The bytes representation of the normName */
private byte[] bytes;
- /** A null LdapDN */
- public static final LdapDN EMPTY_LDAPDN = new LdapDN();
+ /** A null DN */
+ public static final DN EMPTY_DN = new DN();
// ~ Methods
// ------------------------------------------------------------------------------------
/**
- * Construct an empty LdapDN object
+ * Construct an empty DN object
*/
- public LdapDN()
+ public DN()
{
upName = "";
normName = "";
@@ -121,12 +121,12 @@
/**
- * Transduces, or copies a Name to an LdapDN.
+ * Transduces, or copies a Name to an DN.
*
* @param name composed of String name components.
* @throws InvalidNameException If the Name is invalid.
*/
- public LdapDN( Name name ) throws InvalidNameException
+ public DN( Name name ) throws InvalidNameException
{
if ( ( name != null ) && ( name.size() != 0 ) )
{
@@ -154,11 +154,11 @@
* @param upName The String that contains the DN.
* @throws InvalidNameException if the String does not contain a valid DN.
*/
- public LdapDN( String upName ) throws InvalidNameException
+ public DN( String upName ) throws InvalidNameException
{
if ( upName != null )
{
- LdapDnParser.parseInternal( upName, rdns );
+ DnParser.parseInternal( upName, rdns );
}
// Stores the representations of a DN : internal (as a string and as a
@@ -171,7 +171,7 @@
/**
- * Creates a new instance of LdapDN, using varargs to declare the RDNs. Each
+ * Creates a new instance of DN, using varargs to declare the RDNs. Each
* String is either a full RDN, or a couple of AttributeType DI and a value.
* If the String contains a '=' symbol, the the constructor will assume that
* the String arg contains afull RDN, otherwise, it will consider that the
@@ -181,7 +181,7 @@
* String exampleName = "example";
* String baseDn = "dc=apache,dc=org";
*
- * LdapDN dn = new LdapDN(
+ * DN dn = new DN(
* "cn=Test",
* "ou", exampleName,
* baseDn);
@@ -190,7 +190,7 @@
* @param upNames
* @throws InvalidNameException
*/
- public LdapDN( String... upRdns ) throws InvalidNameException
+ public DN( String... upRdns ) throws InvalidNameException
{
StringBuilder sb = new StringBuilder();
boolean valueExpected = false;
@@ -232,7 +232,7 @@
// Stores the representations of a DN : internal (as a string and as a
// byte[]) and external.
upName = sb.toString();
- LdapDnParser.parseInternal( upName, rdns );
+ DnParser.parseInternal( upName, rdns );
normalizeInternal();
normalized = false;
}
@@ -245,7 +245,7 @@
* @param normName the normalized name
* @param bytes the name as a byte[]
*/
- /* No protection */ LdapDN( String upName, String normName, byte[] bytes )
+ DN( String upName, String normName, byte[] bytes )
{
normalized = true;
this.upName = upName;
@@ -268,12 +268,12 @@
{
if ( ( name == null ) || ( name.length() == 0 ) || ( oidsMap == null ) || ( oidsMap.size() == 0 ) )
{
- return LdapDN.EMPTY_LDAPDN;
+ return DN.EMPTY_DN;
}
try
{
- LdapDN newDn = new LdapDN( name );
+ DN newDn = new DN( name );
Enumeration<RDN> rdns = newDn.getAllRdn();
@@ -584,8 +584,8 @@
*/
public static int getNbBytes( Name dn )
{
- LdapDN ldapDn = ( LdapDN ) dn;
- return ldapDn.bytes == null ? 0 : ldapDn.bytes.length;
+ DN newDn = ( DN ) dn;
+ return newDn.bytes == null ? 0 : newDn.bytes.length;
}
@@ -595,7 +595,7 @@
* @param dn The DN.
* @return A byte[] representation of the DN
*/
- public static byte[] getBytes( LdapDN dn )
+ public static byte[] getBytes( DN dn )
{
return dn == null ? null : dn.bytes;
}
@@ -610,9 +610,9 @@
{
return true;
}
- else if ( name instanceof LdapDN )
+ else if ( name instanceof DN )
{
- LdapDN nameDN = ( LdapDN ) name;
+ DN nameDN = ( DN ) name;
if ( nameDN.size() == 0 )
{
@@ -621,7 +621,7 @@
if ( nameDN.size() > size() )
{
- // The name is longer than the current LdapDN.
+ // The name is longer than the current DN.
return false;
}
@@ -650,7 +650,7 @@
if ( name.size() > size() )
{
- // The name is longer than the current LdapDN.
+ // The name is longer than the current DN.
return false;
}
@@ -707,9 +707,9 @@
return true;
}
- if ( name instanceof LdapDN )
+ if ( name instanceof DN )
{
- LdapDN nameDN = ( LdapDN ) name;
+ DN nameDN = ( DN ) name;
if ( nameDN.size() == 0 )
{
@@ -718,7 +718,7 @@
if ( nameDN.size() > size() )
{
- // The name is longer than the current LdapDN.
+ // The name is longer than the current DN.
return false;
}
@@ -745,7 +745,7 @@
if ( name.size() > size() )
{
- // The name is longer than the current LdapDN.
+ // The name is longer than the current DN.
return false;
}
@@ -955,7 +955,7 @@
{
if ( rdns.size() == 0 )
{
- return EMPTY_LDAPDN;
+ return EMPTY_DN;
}
if ( ( posn < 0 ) || ( posn > rdns.size() ) )
@@ -965,18 +965,18 @@
throw new ArrayIndexOutOfBoundsException( message );
}
- LdapDN newLdapDN = new LdapDN();
+ DN newDN = new DN();
for ( int i = rdns.size() - posn; i < rdns.size(); i++ )
{
// Don't forget to clone the rdns !
- newLdapDN.rdns.add( ( RDN ) rdns.get( i ).clone() );
+ newDN.rdns.add( ( RDN ) rdns.get( i ).clone() );
}
- newLdapDN.normName = newLdapDN.toNormName();
- newLdapDN.upName = getUpNamePrefix( posn );
+ newDN.normName = newDN.toNormName();
+ newDN.upName = getUpNamePrefix( posn );
- return newLdapDN;
+ return newDN;
}
@@ -987,7 +987,7 @@
{
if ( rdns.size() == 0 )
{
- return EMPTY_LDAPDN;
+ return EMPTY_DN;
}
if ( ( posn < 0 ) || ( posn > rdns.size() ) )
@@ -997,18 +997,18 @@
throw new ArrayIndexOutOfBoundsException( message );
}
- LdapDN newLdapDN = new LdapDN();
+ DN newDN = new DN();
for ( int i = 0; i < size() - posn; i++ )
{
// Don't forget to clone the rdns !
- newLdapDN.rdns.add( ( RDN ) rdns.get( i ).clone() );
+ newDN.rdns.add( ( RDN ) rdns.get( i ).clone() );
}
- newLdapDN.normName = newLdapDN.toNormName();
- newLdapDN.upName = getUpNameSuffix( posn );
+ newDN.normName = newDN.toNormName();
+ newDN.upName = getUpNameSuffix( posn );
- return newLdapDN;
+ return newDN;
}
@@ -1030,9 +1030,9 @@
*/
public Name addAllNormalized( int posn, Name name ) throws InvalidNameException
{
- if ( name instanceof LdapDN )
+ if ( name instanceof DN )
{
- LdapDN dn = (LdapDN)name;
+ DN dn = (DN)name;
if ( ( dn == null ) || ( dn.size() == 0 ) )
{
@@ -1093,9 +1093,9 @@
*/
public Name addAll( int posn, Name name ) throws InvalidNameException
{
- if ( name instanceof LdapDN )
+ if ( name instanceof DN )
{
- LdapDN dn = (LdapDN)name;
+ DN dn = (DN)name;
if ( ( dn == null ) || ( dn.size() == 0 ) )
{
@@ -1261,7 +1261,7 @@
{
if ( rdns.size() == 0 )
{
- return EMPTY_LDAPDN;
+ return EMPTY_DN;
}
if ( ( posn < 0 ) || ( posn >= rdns.size() ) )
@@ -1288,7 +1288,7 @@
{
try
{
- LdapDN dn = ( LdapDN ) super.clone();
+ DN dn = ( DN ) super.clone();
dn.rdns = new ArrayList<RDN>();
for ( RDN rdn : rdns )
@@ -1316,9 +1316,9 @@
{
return normName.equals( obj );
}
- else if ( obj instanceof LdapDN )
+ else if ( obj instanceof DN )
{
- LdapDN name = ( LdapDN ) obj;
+ DN name = ( DN ) obj;
if ( name.size() != this.size() )
{
@@ -1348,9 +1348,9 @@
*/
public int compareTo( Object obj )
{
- if ( obj instanceof LdapDN )
+ if ( obj instanceof DN )
{
- LdapDN dn = ( LdapDN ) obj;
+ DN dn = ( DN ) obj;
if ( dn.size() != size() )
{
@@ -1475,7 +1475,7 @@
* @return A normalized form of the DN.
* @throws NamingException If something went wrong.
*/
- public static LdapDN normalize( LdapDN dn, Map<String, OidNormalizer> oidsMap ) throws NamingException
+ public static DN normalize( DN dn, Map<String, OidNormalizer> oidsMap ) throws NamingException
{
if ( ( dn == null ) || ( dn.size() == 0 ) || ( oidsMap == null ) || ( oidsMap.size() == 0 ) )
{
@@ -1517,7 +1517,7 @@
* @throws NamingException If something went wrong.
* @return The normalized DN
*/
- public LdapDN normalize( Map<String, OidNormalizer> oidsMap ) throws NamingException
+ public DN normalize( Map<String, OidNormalizer> oidsMap ) throws NamingException
{
if ( ( oidsMap == null ) || ( oidsMap.size() == 0 ) )
{
@@ -1557,7 +1557,7 @@
*/
public static boolean isValid( String dn )
{
- return LdapDnParser.validateInternal( dn );
+ return DnParser.validateInternal( dn );
}
/**
@@ -1634,8 +1634,8 @@
/**
* @see Externalizable#readExternal(ObjectInput)
*
- * We read back the data to create a new LdapDN. The structure
- * read is exposed in the {@link LdapDN#writeExternal(ObjectOutput)}
+ * We read back the data to create a new DN. The structure
+ * read is exposed in the {@link DN#writeExternal(ObjectOutput)}
* method<p>
*
* @param in The stream from which the DN is read
Copied: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/name/DnParser.java (from r918714, directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/name/LdapDnParser.java)
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/name/DnParser.java?p2=directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/name/DnParser.java&p1=directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/name/LdapDnParser.java&r1=918714&r2=918756&rev=918756&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/name/LdapDnParser.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/name/DnParser.java Wed Mar 3 23:05:29 2010
@@ -62,7 +62,7 @@
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
* @version $Rev$, $Date$
*/
-public enum LdapDnParser implements NameParser
+public enum DnParser implements NameParser
{
INSTANCE;
@@ -89,12 +89,12 @@
{
try
{
- FastLdapDnParser.INSTANCE.parseDn( name, rdns );
+ FastDnParser.INSTANCE.parseDn( name, rdns );
}
catch ( TooComplexException e )
{
rdns.clear();
- new ComplexLdapDnParser().parseDn( name, rdns );
+ new ComplexDnParser().parseDn( name, rdns );
}
}
@@ -108,7 +108,7 @@
*/
public static boolean validateInternal( String name )
{
- LdapDN dn = new LdapDN();
+ DN dn = new DN();
try
{
parseInternal( name, dn.rdns );
@@ -122,16 +122,16 @@
/**
- * Parse a String and return a LdapDN if the String is a valid DN
+ * Parse a String and return a DN if the String is a valid DN
*
* @param dn
* The DN to parse
- * @return A LdapDN
+ * @return A DN
* @throws InvalidNameException
* If the String is not a valid DN
*/
public Name parse( String dn ) throws InvalidNameException
{
- return new LdapDN( dn );
+ return new DN( dn );
}
}
Copied: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/name/DnSerializer.java (from r918714, directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/name/LdapDNSerializer.java)
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/name/DnSerializer.java?p2=directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/name/DnSerializer.java&p1=directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/name/LdapDNSerializer.java&r1=918714&r2=918756&rev=918756&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/name/LdapDNSerializer.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/name/DnSerializer.java Wed Mar 3 23:05:29 2010
@@ -34,10 +34,10 @@
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
* @version $Rev$, $Date$
*/
-public class LdapDNSerializer
+public class DnSerializer
{
/** The LoggerFactory used by this class */
- protected static final Logger LOG = LoggerFactory.getLogger( LdapDNSerializer.class );
+ protected static final Logger LOG = LoggerFactory.getLogger( DnSerializer.class );
/**
* Serialize a DN
@@ -56,7 +56,7 @@
* @param out the stream in which the DN will be serialized
* @throws IOException If we can't write in this stream
*/
- public static void serialize( LdapDN dn, ObjectOutput out ) throws IOException
+ public static void serialize( DN dn, ObjectOutput out ) throws IOException
{
if ( dn.getName() == null )
{
@@ -104,15 +104,15 @@
/**
* Deserialize a DN
*
- * We read back the data to create a new LdapDN. The structure
- * read is exposed in the {@link LdapDNSerializer#serialize(LdapDN, ObjectOutput)}
+ * We read back the data to create a new DN. The structure
+ * read is exposed in the {@link DnSerializer#serialize(DN, ObjectOutput)}
* method<p>
*
* @param in The input stream from which the DN is read
* @return a deserialized DN
* @throws IOException If the stream can't be read
*/
- public static LdapDN deserialize( ObjectInput in ) throws IOException
+ public static DN deserialize( ObjectInput in ) throws IOException
{
// Read the UPName
String upName = in.readUTF();
@@ -134,7 +134,7 @@
// Read the RDNs. Is it's null, the number will be -1.
int nbRdns = in.readInt();
- LdapDN dn = new LdapDN( upName, normName, bytes );
+ DN dn = new DN( upName, normName, bytes );
for ( int i = 0; i < nbRdns; i++ )
{
Copied: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/name/FastDnParser.java (from r918714, directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/name/FastLdapDnParser.java)
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/name/FastDnParser.java?p2=directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/name/FastDnParser.java&p1=directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/name/FastLdapDnParser.java&r1=918714&r2=918756&rev=918756&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/name/FastLdapDnParser.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/name/FastDnParser.java Wed Mar 3 23:05:29 2010
@@ -40,7 +40,7 @@
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
* @version $Rev: 664290 $, $Date: 2008-06-07 08:28:06 +0200 (Sa, 07 Jun 2008) $
*/
-public enum FastLdapDnParser implements NameParser
+public enum FastDnParser implements NameParser
{
INSTANCE;
@@ -60,21 +60,21 @@
*/
public Name parse( String name ) throws NamingException
{
- LdapDN dn = new LdapDN();
+ DN dn = new DN();
parseDn( name, dn );
return dn;
}
/**
- * Parses the given name string and fills the given LdapDN object.
+ * Parses the given name string and fills the given DN object.
*
* @param name the name to parse
- * @param dn the LdapDN to fill
+ * @param dn the DN to fill
*
* @throws InvalidNameException the invalid name exception
*/
- public void parseDn( String name, LdapDN dn ) throws InvalidNameException
+ public void parseDn( String name, DN dn ) throws InvalidNameException
{
parseDn(name, dn.rdns);
dn.setUpName( name );
Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/name/RDN.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/name/RDN.java?rev=918756&r1=918755&r2=918756&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/name/RDN.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/name/RDN.java Wed Mar 3 23:05:29 2010
@@ -399,7 +399,7 @@
public RDN normalize( Map<String, OidNormalizer> oidsMap ) throws InvalidNameException, NamingException
{
String upName = getUpName();
- LdapDN.rdnOidToName( this, oidsMap );
+ DN.rdnOidToName( this, oidsMap );
normalize();
this.upName = upName;
Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/name/RdnParser.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/name/RdnParser.java?rev=918756&r1=918755&r2=918756&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/name/RdnParser.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/name/RdnParser.java Wed Mar 3 23:05:29 2010
@@ -100,12 +100,12 @@
{
try
{
- FastLdapDnParser.INSTANCE.parseRdn( dn, rdn );
+ FastDnParser.INSTANCE.parseRdn( dn, rdn );
}
catch ( TooComplexException e )
{
rdn.clear();
- new ComplexLdapDnParser().parseRdn( dn, rdn );
+ new ComplexDnParser().parseRdn( dn, rdn );
}
}
Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/SchemaDao.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/SchemaDao.java?rev=918756&r1=918755&r2=918756&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/SchemaDao.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/SchemaDao.java Wed Mar 3 23:05:29 2010
@@ -7,7 +7,7 @@
import javax.naming.NamingException;
import org.apache.directory.shared.ldap.entry.Entry;
-import org.apache.directory.shared.ldap.name.LdapDN;
+import org.apache.directory.shared.ldap.name.DN;
import org.apache.directory.shared.ldap.schema.AttributeType;
import org.apache.directory.shared.ldap.schema.MatchingRule;
import org.apache.directory.shared.ldap.schema.ObjectClass;
@@ -64,7 +64,7 @@
String findSchema( String entityName ) throws Exception;
- LdapDN findDn( String entityName ) throws Exception;
+ DN findDn( String entityName ) throws Exception;
/**
Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/SchemaManager.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/SchemaManager.java?rev=918756&r1=918755&r2=918756&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/SchemaManager.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/SchemaManager.java Wed Mar 3 23:05:29 2010
@@ -26,7 +26,7 @@
import javax.naming.NamingException;
-import org.apache.directory.shared.ldap.name.LdapDN;
+import org.apache.directory.shared.ldap.name.DN;
import org.apache.directory.shared.ldap.schema.normalizers.OidNormalizer;
import org.apache.directory.shared.ldap.schema.registries.AttributeTypeRegistry;
import org.apache.directory.shared.ldap.schema.registries.ComparatorRegistry;
@@ -625,7 +625,7 @@
/**
* @return the namingContext
*/
- LdapDN getNamingContext();
+ DN getNamingContext();
/**
Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/comparators/DnComparator.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/comparators/DnComparator.java?rev=918756&r1=918755&r2=918756&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/comparators/DnComparator.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/comparators/DnComparator.java Wed Mar 3 23:05:29 2010
@@ -24,7 +24,7 @@
import javax.naming.NamingException;
import org.apache.directory.shared.i18n.I18n;
-import org.apache.directory.shared.ldap.name.LdapDN;
+import org.apache.directory.shared.ldap.name.DN;
import org.apache.directory.shared.ldap.schema.LdapComparator;
import org.apache.directory.shared.ldap.schema.SchemaManager;
@@ -51,8 +51,8 @@
*/
public int compare( Object obj0, Object obj1 )
{
- LdapDN dn0 = null;
- LdapDN dn1 = null;
+ DN dn0 = null;
+ DN dn1 = null;
try
{
@@ -69,24 +69,24 @@
}
- public LdapDN getDn( Object obj ) throws NamingException
+ public DN getDn( Object obj ) throws NamingException
{
- LdapDN dn = null;
+ DN dn = null;
- if ( obj instanceof LdapDN )
+ if ( obj instanceof DN )
{
- dn = (LdapDN)obj;
+ dn = (DN)obj;
- dn = ( dn.isNormalized() ? dn : LdapDN.normalize( dn, schemaManager.getNormalizerMapping() ) );
+ dn = ( dn.isNormalized() ? dn : DN.normalize( dn, schemaManager.getNormalizerMapping() ) );
}
else if ( obj instanceof Name )
{
- dn = new LdapDN( ( Name ) obj );
+ dn = new DN( ( Name ) obj );
dn.normalize( schemaManager.getNormalizerMapping() );
}
else if ( obj instanceof String )
{
- dn = new LdapDN( ( String ) obj );
+ dn = new DN( ( String ) obj );
dn.normalize( schemaManager.getNormalizerMapping() );
}
else
Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/comparators/UniqueMemberComparator.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/comparators/UniqueMemberComparator.java?rev=918756&r1=918755&r2=918756&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/comparators/UniqueMemberComparator.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/comparators/UniqueMemberComparator.java Wed Mar 3 23:05:29 2010
@@ -24,7 +24,7 @@
import javax.naming.NamingException;
import org.apache.directory.shared.i18n.I18n;
-import org.apache.directory.shared.ldap.name.LdapDN;
+import org.apache.directory.shared.ldap.name.DN;
import org.apache.directory.shared.ldap.schema.LdapComparator;
import org.apache.directory.shared.ldap.schema.SchemaManager;
import org.slf4j.Logger;
@@ -98,8 +98,8 @@
return 1;
}
- LdapDN dn0 = null;
- LdapDN dn1 = null;
+ DN dn0 = null;
+ DN dn1 = null;
// This is an UID if the '#' is immediatly
// followed by a BitString, except if the '#' is
@@ -110,7 +110,7 @@
{
try
{
- dn0 = new LdapDN( dnstr0.substring( 0, dash0 ) );
+ dn0 = new DN( dnstr0.substring( 0, dash0 ) );
}
catch ( NamingException ne )
{
@@ -131,7 +131,7 @@
{
try
{
- dn1 = new LdapDN( dnstr0.substring( 0, dash1 ) );
+ dn1 = new DN( dnstr0.substring( 0, dash1 ) );
}
catch ( NamingException ne )
{
@@ -164,24 +164,24 @@
}
- public LdapDN getDn( Object obj ) throws NamingException
+ public DN getDn( Object obj ) throws NamingException
{
- LdapDN dn = null;
+ DN dn = null;
- if ( obj instanceof LdapDN )
+ if ( obj instanceof DN )
{
- dn = ( LdapDN ) obj;
+ dn = ( DN ) obj;
- dn = ( dn.isNormalized() ? dn : LdapDN.normalize( dn, schemaManager.getNormalizerMapping() ) );
+ dn = ( dn.isNormalized() ? dn : DN.normalize( dn, schemaManager.getNormalizerMapping() ) );
}
else if ( obj instanceof Name )
{
- dn = new LdapDN( ( Name ) obj );
+ dn = new DN( ( Name ) obj );
dn.normalize( schemaManager.getNormalizerMapping() );
}
else if ( obj instanceof String )
{
- dn = new LdapDN( ( String ) obj );
+ dn = new DN( ( String ) obj );
dn.normalize( schemaManager.getNormalizerMapping() );
}
else
Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/normalizers/DnNormalizer.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/normalizers/DnNormalizer.java?rev=918756&r1=918755&r2=918756&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/normalizers/DnNormalizer.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/normalizers/DnNormalizer.java Wed Mar 3 23:05:29 2010
@@ -25,7 +25,7 @@
import org.apache.directory.shared.ldap.constants.SchemaConstants;
import org.apache.directory.shared.ldap.entry.Value;
import org.apache.directory.shared.ldap.entry.client.ClientStringValue;
-import org.apache.directory.shared.ldap.name.LdapDN;
+import org.apache.directory.shared.ldap.name.DN;
import org.apache.directory.shared.ldap.schema.Normalizer;
import org.apache.directory.shared.ldap.schema.SchemaManager;
@@ -58,11 +58,11 @@
*/
public Value<?> normalize( Value<?> value ) throws NamingException
{
- LdapDN dn = null;
+ DN dn = null;
String dnStr = value.getString();
- dn = new LdapDN( dnStr );
+ dn = new DN( dnStr );
dn.normalize( schemaManager.getNormalizerMapping() );
return new ClientStringValue( dn.getNormName() );
@@ -74,9 +74,9 @@
*/
public String normalize( String value ) throws NamingException
{
- LdapDN dn = null;
+ DN dn = null;
- dn = new LdapDN( value );
+ dn = new DN( value );
dn.normalize( schemaManager.getNormalizerMapping() );
return dn.getNormName();
@@ -89,11 +89,11 @@
* @return A normalized DN
* @throws NamingException
*/
- public String normalize( LdapDN value ) throws NamingException
+ public String normalize( DN value ) throws NamingException
{
- LdapDN dn = null;
+ DN dn = null;
- dn = new LdapDN( value );
+ dn = new DN( value );
dn.normalize( schemaManager.getNormalizerMapping() );
return dn.getNormName();
Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/normalizers/UniqueMemberNormalizer.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/normalizers/UniqueMemberNormalizer.java?rev=918756&r1=918755&r2=918756&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/normalizers/UniqueMemberNormalizer.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/normalizers/UniqueMemberNormalizer.java Wed Mar 3 23:05:29 2010
@@ -26,7 +26,7 @@
import org.apache.directory.shared.ldap.constants.SchemaConstants;
import org.apache.directory.shared.ldap.entry.Value;
import org.apache.directory.shared.ldap.entry.client.ClientStringValue;
-import org.apache.directory.shared.ldap.name.LdapDN;
+import org.apache.directory.shared.ldap.name.DN;
import org.apache.directory.shared.ldap.schema.Normalizer;
import org.apache.directory.shared.ldap.schema.SchemaManager;
import org.apache.directory.shared.ldap.util.StringTools;
@@ -82,7 +82,7 @@
if ( sharpPos > 0 )
{
- LdapDN dn = new LdapDN( nameAndUid.substring( 0, sharpPos ) );
+ DN dn = new DN( nameAndUid.substring( 0, sharpPos ) );
dn.normalize( schemaManager.getNormalizerMapping() );
@@ -97,7 +97,7 @@
{
// No UID, the strValue is a DN
// Return the normalized DN
- return new ClientStringValue( new LdapDN( nameAndUid ).getNormName() );
+ return new ClientStringValue( new DN( nameAndUid ).getNormName() );
}
}
@@ -129,7 +129,7 @@
if ( sharpPos > 0 )
{
- LdapDN dn = new LdapDN( value.substring( 0, sharpPos ) );
+ DN dn = new DN( value.substring( 0, sharpPos ) );
dn.normalize( schemaManager.getNormalizerMapping() );
@@ -144,7 +144,7 @@
{
// No UID, the strValue is a DN
// Return the normalized DN
- return new LdapDN( value ).normalize( schemaManager.getNormalizerMapping() ).getNormName();
+ return new DN( value ).normalize( schemaManager.getNormalizerMapping() ).getNormName();
}
}
Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxCheckers/DNSyntaxChecker.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxCheckers/DNSyntaxChecker.java?rev=918756&r1=918755&r2=918756&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxCheckers/DNSyntaxChecker.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxCheckers/DNSyntaxChecker.java Wed Mar 3 23:05:29 2010
@@ -21,7 +21,7 @@
import org.apache.directory.shared.ldap.constants.SchemaConstants;
-import org.apache.directory.shared.ldap.name.LdapDN;
+import org.apache.directory.shared.ldap.name.DN;
import org.apache.directory.shared.ldap.schema.SyntaxChecker;
import org.apache.directory.shared.ldap.util.StringTools;
import org.slf4j.Logger;
@@ -88,7 +88,7 @@
}
// Check that the value is a valid DN
- boolean result = LdapDN.isValid( strValue );
+ boolean result = DN.isValid( strValue );
if ( result )
{
Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxCheckers/NameAndOptionalUIDSyntaxChecker.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxCheckers/NameAndOptionalUIDSyntaxChecker.java?rev=918756&r1=918755&r2=918756&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxCheckers/NameAndOptionalUIDSyntaxChecker.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxCheckers/NameAndOptionalUIDSyntaxChecker.java Wed Mar 3 23:05:29 2010
@@ -21,7 +21,7 @@
import org.apache.directory.shared.ldap.constants.SchemaConstants;
-import org.apache.directory.shared.ldap.name.LdapDN;
+import org.apache.directory.shared.ldap.name.DN;
import org.apache.directory.shared.ldap.schema.SyntaxChecker;
import org.apache.directory.shared.ldap.util.StringTools;
import org.slf4j.Logger;
@@ -117,7 +117,7 @@
// except if the '#' is in first position
if ( sharpPos > 0 )
{
- boolean result = LdapDN.isValid( strValue.substring( 0, sharpPos ) );
+ boolean result = DN.isValid( strValue.substring( 0, sharpPos ) );
if ( result )
{
@@ -149,7 +149,7 @@
{
// No UID, the strValue is a DN
// Check that the value is a valid DN
- boolean result = LdapDN.isValid( strValue );
+ boolean result = DN.isValid( strValue );
if ( result )
{
Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/subtree/BaseSubtreeSpecification.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/subtree/BaseSubtreeSpecification.java?rev=918756&r1=918755&r2=918756&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/subtree/BaseSubtreeSpecification.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/subtree/BaseSubtreeSpecification.java Wed Mar 3 23:05:29 2010
@@ -21,7 +21,7 @@
import org.apache.directory.shared.ldap.filter.ExprNode;
-import org.apache.directory.shared.ldap.name.LdapDN;
+import org.apache.directory.shared.ldap.name.DN;
import java.util.Iterator;
import java.util.Set;
@@ -37,13 +37,13 @@
public class BaseSubtreeSpecification implements SubtreeSpecification
{
/** the subtree base relative to the administration point */
- private final LdapDN base;
+ private final DN base;
/** the set of subordinates entries and their subordinates to exclude */
- private final Set<LdapDN> chopBefore;
+ private final Set<DN> chopBefore;
/** the set of subordinates entries whose subordinates are to be excluded */
- private final Set<LdapDN> chopAfter;
+ private final Set<DN> chopAfter;
/** the minimum distance below base to start including entries */
private final int minBaseDistance;
@@ -70,7 +70,7 @@
@SuppressWarnings("unchecked")
public BaseSubtreeSpecification()
{
- this.base = new LdapDN();
+ this.base = new DN();
this.minBaseDistance = 0;
this.maxBaseDistance = UNBOUNDED_MAX;
this.chopAfter = Collections.EMPTY_SET;
@@ -91,7 +91,7 @@
@SuppressWarnings("unchecked")
public BaseSubtreeSpecification(ExprNode refinement)
{
- this.base = new LdapDN();
+ this.base = new DN();
this.minBaseDistance = 0;
this.maxBaseDistance = UNBOUNDED_MAX;
this.chopAfter = Collections.EMPTY_SET;
@@ -109,7 +109,7 @@
* the base of the subtree relative to the administrative point
*/
@SuppressWarnings("unchecked")
- public BaseSubtreeSpecification( LdapDN base )
+ public BaseSubtreeSpecification( DN base )
{
this.base = base;
this.minBaseDistance = 0;
@@ -137,8 +137,8 @@
* the set of subordinates entries and their subordinates to
* exclude
*/
- public BaseSubtreeSpecification( LdapDN base, int minBaseDistance, int maxBaseDistance,
- Set<LdapDN> chopAfter, Set<LdapDN> chopBefore )
+ public BaseSubtreeSpecification( DN base, int minBaseDistance, int maxBaseDistance,
+ Set<DN> chopAfter, Set<DN> chopBefore )
{
this( base, minBaseDistance, maxBaseDistance, chopAfter, chopBefore, null );
}
@@ -147,7 +147,7 @@
/**
* Creates a subtree which may be a refinement filter where all aspects of
* the specification can be set. If the refinement filter is null this
- * defaults to {@link #BaseSubtreeSpecification(LdapDN, int, int, Set, Set)}.
+ * defaults to {@link #BaseSubtreeSpecification(DN, int, int, Set, Set)}.
*
* @param base
* the base of the subtree relative to the administrative point
@@ -165,8 +165,8 @@
* the filter expression only composed of objectClass attribute
* value assertions
*/
- public BaseSubtreeSpecification( LdapDN base, int minBaseDistance, int maxBaseDistance,
- Set<LdapDN> chopAfter, Set<LdapDN> chopBefore, ExprNode refinement )
+ public BaseSubtreeSpecification( DN base, int minBaseDistance, int maxBaseDistance,
+ Set<DN> chopAfter, Set<DN> chopBefore, ExprNode refinement )
{
this.base = base;
this.minBaseDistance = minBaseDistance;
@@ -191,19 +191,19 @@
// -----------------------------------------------------------------------
- public LdapDN getBase()
+ public DN getBase()
{
return this.base;
}
- public Set<LdapDN> getChopBeforeExclusions()
+ public Set<DN> getChopBeforeExclusions()
{
return this.chopBefore;
}
- public Set<LdapDN> getChopAfterExclusions()
+ public Set<DN> getChopAfterExclusions()
{
return this.chopAfter;
}
@@ -270,9 +270,9 @@
buffer.append( ' ' );
buffer.append( '{' );
- for ( Iterator<LdapDN> it = chopBefore.iterator(); it.hasNext(); )
+ for ( Iterator<DN> it = chopBefore.iterator(); it.hasNext(); )
{
- LdapDN dn = it.next();
+ DN dn = it.next();
buffer.append( ' ' );
buffer.append( "chopBefore" );
buffer.append( ':' );
@@ -294,9 +294,9 @@
buffer.append( ' ' );
}
- for ( Iterator<LdapDN> it = chopAfter.iterator(); it.hasNext(); )
+ for ( Iterator<DN> it = chopAfter.iterator(); it.hasNext(); )
{
- LdapDN dn = it.next();
+ DN dn = it.next();
buffer.append( ' ' );
buffer.append( "chopAfter" );
buffer.append( ':' );
Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/subtree/SubtreeSpecification.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/subtree/SubtreeSpecification.java?rev=918756&r1=918755&r2=918756&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/subtree/SubtreeSpecification.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/subtree/SubtreeSpecification.java Wed Mar 3 23:05:29 2010
@@ -21,7 +21,7 @@
import org.apache.directory.shared.ldap.filter.ExprNode;
-import org.apache.directory.shared.ldap.name.LdapDN;
+import org.apache.directory.shared.ldap.name.DN;
import java.util.Set;
@@ -51,7 +51,7 @@
* if the base is the administrative point - note that this Name is
* not Normalized according to matchingRules.
*/
- LdapDN getBase();
+ DN getBase();
/**
@@ -63,7 +63,7 @@
* @return a set of relative {@link javax.naming.Name}s to the subtree base
* or the empty set
*/
- Set<LdapDN> getChopBeforeExclusions();
+ Set<DN> getChopBeforeExclusions();
/**
@@ -75,7 +75,7 @@
* @return a set of relative {@link javax.naming.Name}s to the subtree base
* or the empty set
*/
- Set<LdapDN> getChopAfterExclusions();
+ Set<DN> getChopAfterExclusions();
/**
Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/subtree/SubtreeSpecificationModifier.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/subtree/SubtreeSpecificationModifier.java?rev=918756&r1=918755&r2=918756&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/subtree/SubtreeSpecificationModifier.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/subtree/SubtreeSpecificationModifier.java Wed Mar 3 23:05:29 2010
@@ -21,7 +21,7 @@
import org.apache.directory.shared.ldap.filter.ExprNode;
-import org.apache.directory.shared.ldap.name.LdapDN;
+import org.apache.directory.shared.ldap.name.DN;
import java.util.Set;
import java.util.Collections;
@@ -38,13 +38,13 @@
public class SubtreeSpecificationModifier
{
/** the subtree base relative to the administration point */
- private LdapDN base = new LdapDN();
+ private DN base = new DN();
/** the set of subordinates entries and their subordinates to exclude */
- private Set<LdapDN> chopBefore = Collections.EMPTY_SET;
+ private Set<DN> chopBefore = Collections.EMPTY_SET;
/** the set of subordinates entries whose subordinates are to be excluded */
- private Set<LdapDN> chopAfter = Collections.EMPTY_SET;
+ private Set<DN> chopAfter = Collections.EMPTY_SET;
/** the minimum distance below base to start including entries */
private int minBaseDistance = 0;
@@ -87,7 +87,7 @@
* @param base
* subtree base relative to the administration point
*/
- public void setBase( LdapDN base )
+ public void setBase( DN base )
{
this.base = base;
}
@@ -100,7 +100,7 @@
* the set of subordinates entries and their subordinates to
* exclude
*/
- public void setChopBeforeExclusions( Set<LdapDN> chopBefore )
+ public void setChopBeforeExclusions( Set<DN> chopBefore )
{
this.chopBefore = chopBefore;
}
@@ -114,7 +114,7 @@
* the set of subordinates entries whose subordinates are to be
* excluded
*/
- public void setChopAfterExclusions( Set<LdapDN> chopAfter )
+ public void setChopAfterExclusions( Set<DN> chopAfter )
{
this.chopAfter = chopAfter;
}
Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/trigger/StoredProcedureParameter.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/trigger/StoredProcedureParameter.java?rev=918756&r1=918755&r2=918756&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/trigger/StoredProcedureParameter.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/trigger/StoredProcedureParameter.java Wed Mar 3 23:05:29 2010
@@ -20,7 +20,7 @@
package org.apache.directory.shared.ldap.trigger;
-import org.apache.directory.shared.ldap.name.LdapDN;
+import org.apache.directory.shared.ldap.name.DN;
/**
@@ -34,20 +34,20 @@
{
public static class Generic_LDAP_CONTEXT extends StoredProcedureParameter
{
- private LdapDN ctxName;
+ private DN ctxName;
- private Generic_LDAP_CONTEXT( LdapDN ctxName )
+ private Generic_LDAP_CONTEXT( DN ctxName )
{
super( "$ldapContext" );
this.ctxName = ctxName;
}
- public static StoredProcedureParameter instance( LdapDN ctxName )
+ public static StoredProcedureParameter instance( DN ctxName )
{
return new Generic_LDAP_CONTEXT( ctxName );
}
- public LdapDN getCtxName()
+ public DN getCtxName()
{
return ctxName;
}
Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/util/AttributeUtils.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/util/AttributeUtils.java?rev=918756&r1=918755&r2=918756&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/util/AttributeUtils.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/util/AttributeUtils.java Wed Mar 3 23:05:29 2010
@@ -39,7 +39,7 @@
import org.apache.directory.shared.ldap.entry.Value;
import org.apache.directory.shared.ldap.entry.client.DefaultClientAttribute;
import org.apache.directory.shared.ldap.entry.client.DefaultClientEntry;
-import org.apache.directory.shared.ldap.name.LdapDN;
+import org.apache.directory.shared.ldap.name.DN;
import org.apache.directory.shared.ldap.schema.AttributeType;
import org.apache.directory.shared.ldap.schema.MatchingRule;
import org.apache.directory.shared.ldap.schema.Normalizer;
@@ -1184,7 +1184,7 @@
*
* @throws InvalidAttributeIdentifierException If we get an invalid attribute
*/
- public static Entry toClientEntry( Attributes attributes, LdapDN dn ) throws InvalidAttributeIdentifierException
+ public static Entry toClientEntry( Attributes attributes, DN dn ) throws InvalidAttributeIdentifierException
{
if ( attributes instanceof BasicAttributes )
{
Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/util/DNUtils.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/util/DNUtils.java?rev=918756&r1=918755&r2=918756&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/util/DNUtils.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/util/DNUtils.java Wed Mar 3 23:05:29 2010
@@ -21,7 +21,7 @@
/**
- * Utility class used by the LdapDN Parser.
+ * Utility class used by the DN Parser.
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
* @version $Rev$, $Date$
Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/util/LdapURL.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/util/LdapURL.java?rev=918756&r1=918755&r2=918756&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/util/LdapURL.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/util/LdapURL.java Wed Mar 3 23:05:29 2010
@@ -38,7 +38,7 @@
import org.apache.directory.shared.ldap.codec.util.UrlDecoderException;
import org.apache.directory.shared.ldap.filter.FilterParser;
import org.apache.directory.shared.ldap.filter.SearchScope;
-import org.apache.directory.shared.ldap.name.LdapDN;
+import org.apache.directory.shared.ldap.name.DN;
/**
@@ -50,7 +50,7 @@
* scheme = "ldap"
* attributes = attrdesc *("," attrdesc)
* scope = "base" / "one" / "sub"
- * dn = LdapDN
+ * dn = DN
* hostport = hostport from Section 5 of RFC 1738
* attrdesc = AttributeDescription from Section 4.1.5 of RFC 2251
* filter = filter from Section 4 of RFC 2254
@@ -92,7 +92,7 @@
private int port;
/** The DN */
- private LdapDN dn;
+ private DN dn;
/** The attributes */
private List<String> attributes;
@@ -750,7 +750,7 @@
/**
* Parse a string and check that it complies with RFC 2253. Here, we will
- * just call the LdapDN parser to do the job.
+ * just call the DN parser to do the job.
*
* @param chars The char array to be checked
* @param pos the starting position
@@ -768,7 +768,7 @@
try
{
- dn = new LdapDN( decode( new String( chars, pos, end - pos ) ) );
+ dn = new DN( decode( new String( chars, pos, end - pos ) ) );
}
catch ( URIException ue )
{
@@ -1466,7 +1466,7 @@
/**
* @return Returns the dn.
*/
- public LdapDN getDn()
+ public DN getDn()
{
return dn;
}
@@ -1699,7 +1699,7 @@
*
* @param dn the new dn
*/
- public void setDn( LdapDN dn )
+ public void setDn( DN dn )
{
this.dn = dn;
}
Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/util/NamespaceTools.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/util/NamespaceTools.java?rev=918756&r1=918755&r2=918756&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/util/NamespaceTools.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/util/NamespaceTools.java Wed Mar 3 23:05:29 2010
@@ -20,7 +20,7 @@
package org.apache.directory.shared.ldap.util;
-import org.apache.directory.shared.ldap.name.LdapDN;
+import org.apache.directory.shared.ldap.name.DN;
import java.util.ArrayList;
import java.util.List;
@@ -79,7 +79,7 @@
{
if ( name1.size() == name2.size() )
{
- LdapDN parentDn = ( LdapDN ) name1.clone();
+ DN parentDn = ( DN ) name1.clone();
parentDn.remove( name1.size() - 1 );
return name2.startsWith( parentDn );
}
@@ -114,15 +114,15 @@
*/
public static Name getRelativeName( Name ancestor, Name descendant ) throws NamingException
{
- LdapDN rdn = null;
+ DN rdn = null;
- if ( descendant instanceof LdapDN )
+ if ( descendant instanceof DN )
{
- rdn = ( LdapDN ) descendant.clone();
+ rdn = ( DN ) descendant.clone();
}
else
{
- rdn = new LdapDN( descendant.toString() );
+ rdn = new DN( descendant.toString() );
}
if ( rdn.startsWith( ancestor ) )
Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/util/tree/DnBranchNode.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/util/tree/DnBranchNode.java?rev=918756&r1=918755&r2=918756&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/util/tree/DnBranchNode.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/util/tree/DnBranchNode.java Wed Mar 3 23:05:29 2010
@@ -26,7 +26,7 @@
import javax.naming.NamingException;
-import org.apache.directory.shared.ldap.name.LdapDN;
+import org.apache.directory.shared.ldap.name.DN;
import org.apache.directory.shared.ldap.name.RDN;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -83,7 +83,7 @@
* @param element The associated element to add as a tree node
* @return The modified tree structure.
*/
- private DnNode<N> recursivelyAddElement( DnBranchNode<N> current, LdapDN dn, int index, N element ) throws NamingException
+ private DnNode<N> recursivelyAddElement( DnBranchNode<N> current, DN dn, int index, N element ) throws NamingException
{
String rdnAtIndex = dn.getRdn( index ).toString();
@@ -185,7 +185,7 @@
* @param dn the normalized distinguished name to resolve to a parent
* @return the parent associated with the normalized dn
*/
- public N getParentElement( LdapDN dn )
+ public N getParentElement( DN dn )
{
Enumeration<String> rdns = dn.getAll();
@@ -237,7 +237,7 @@
* @param dn the normalized distinguished name to resolve to a parent
* @return the parent associated with the normalized dn
*/
- public boolean hasParentElement( LdapDN dn )
+ public boolean hasParentElement( DN dn )
{
Enumeration<RDN> rdns = dn.getAllRdn();
@@ -346,7 +346,7 @@
* @param element
* @throws NamingException
*/
- public void add( LdapDN dn, N element ) throws NamingException
+ public void add( DN dn, N element ) throws NamingException
{
recursivelyAddElement( this, dn, 0, element );
}
Modified: directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/bind/BindRequestPerfTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/bind/BindRequestPerfTest.java?rev=918756&r1=918755&r2=918756&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/bind/BindRequestPerfTest.java (original)
+++ directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/bind/BindRequestPerfTest.java Wed Mar 3 23:05:29 2010
@@ -33,7 +33,7 @@
import org.apache.directory.shared.ldap.codec.LdapMessageContainer;
import org.apache.directory.shared.ldap.codec.controls.ControlImpl;
import org.apache.directory.shared.ldap.message.control.Control;
-import org.apache.directory.shared.ldap.name.LdapDN;
+import org.apache.directory.shared.ldap.name.DN;
import org.apache.directory.shared.ldap.util.StringTools;
import org.junit.Test;
@@ -149,7 +149,7 @@
@Test
public void testEncodeBindRequestPerf() throws Exception
{
- LdapDN name = new LdapDN( "uid=akarasulu,dc=example,dc=com" );
+ DN name = new DN( "uid=akarasulu,dc=example,dc=com" );
int nbLoops = 1;
long t0 = System.currentTimeMillis();
Modified: directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/bind/BindRequestTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/bind/BindRequestTest.java?rev=918756&r1=918755&r2=918756&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/bind/BindRequestTest.java (original)
+++ directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/bind/BindRequestTest.java Wed Mar 3 23:05:29 2010
@@ -1333,7 +1333,7 @@
@Test
public void testPerf() throws Exception
{
- LdapDN name = new LdapDN( "uid=akarasulu,dc=example,dc=com" );
+ DN name = new DN( "uid=akarasulu,dc=example,dc=com" );
long t0 = System.currentTimeMillis();
for ( int i = 0; i< 10000; i++)
Modified: directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/search/controls/EntryChangeControlTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/search/controls/EntryChangeControlTest.java?rev=918756&r1=918755&r2=918756&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/search/controls/EntryChangeControlTest.java (original)
+++ directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/search/controls/EntryChangeControlTest.java Wed Mar 3 23:05:29 2010
@@ -32,7 +32,7 @@
import org.apache.directory.shared.ldap.codec.search.controls.entryChange.EntryChangeControl;
import org.apache.directory.shared.ldap.codec.search.controls.entryChange.EntryChangeControlContainer;
import org.apache.directory.shared.ldap.codec.search.controls.entryChange.EntryChangeControlDecoder;
-import org.apache.directory.shared.ldap.name.LdapDN;
+import org.apache.directory.shared.ldap.name.DN;
import org.apache.directory.shared.ldap.util.StringTools;
import org.junit.Test;
@@ -345,7 +345,7 @@
EntryChangeControl entry = new EntryChangeControl();
entry.setChangeType( ChangeType.MODDN );
entry.setChangeNumber( 16 );
- entry.setPreviousDn( new LdapDN( "a=b" ) );
+ entry.setPreviousDn( new DN( "a=b" ) );
bb = entry.encode( ByteBuffer.allocate( entry.computeLength() ) );
String decoded = StringTools.dumpBytes( bb.array() );
assertEquals( expected, decoded );
@@ -382,7 +382,7 @@
EntryChangeControl entry = new EntryChangeControl();
entry.setChangeType( ChangeType.MODDN );
entry.setChangeNumber( 5124095576030430L );
- entry.setPreviousDn( new LdapDN( "a=b" ) );
+ entry.setPreviousDn( new DN( "a=b" ) );
bb = entry.encode( ByteBuffer.allocate( entry.computeLength() ) );
String decoded = StringTools.dumpBytes( bb.array() );
assertEquals( expected, decoded );
Modified: directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/entry/client/DefaultClientEntryTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/entry/client/DefaultClientEntryTest.java?rev=918756&r1=918755&r2=918756&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/entry/client/DefaultClientEntryTest.java (original)
+++ directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/entry/client/DefaultClientEntryTest.java Wed Mar 3 23:05:29 2010
@@ -46,7 +46,7 @@
import org.apache.directory.shared.ldap.entry.Entry;
import org.apache.directory.shared.ldap.entry.EntryAttribute;
import org.apache.directory.shared.ldap.entry.Value;
-import org.apache.directory.shared.ldap.name.LdapDN;
+import org.apache.directory.shared.ldap.name.DN;
import org.apache.directory.shared.ldap.schema.normalizers.DeepTrimToLowerNormalizer;
import org.apache.directory.shared.ldap.schema.normalizers.OidNormalizer;
import org.apache.directory.shared.ldap.util.StringTools;
@@ -61,7 +61,7 @@
*/
public class DefaultClientEntryTest
{
- private static LdapDN EXAMPLE_DN;
+ private static DN EXAMPLE_DN;
private static final byte[] BYTES1 = new byte[]{ 'a', 'b' };
private static final byte[] BYTES2 = new byte[]{ 'b' };
private static final byte[] BYTES3 = new byte[]{ 'c' };
@@ -174,7 +174,7 @@
@BeforeClass
public static void setUpBeforeClass() throws Exception
{
- EXAMPLE_DN = new LdapDN( "dc=example,dc=com" );
+ EXAMPLE_DN = new DN( "dc=example,dc=com" );
oids = new HashMap<String, OidNormalizer>();
@@ -205,13 +205,13 @@
Entry entry = new DefaultClientEntry();
assertNotNull( entry );
- assertEquals( LdapDN.EMPTY_LDAPDN, entry.getDn() );
+ assertEquals( DN.EMPTY_DN, entry.getDn() );
assertEquals( 0, entry.size() );
}
/**
- * Test method for DefaultClientEntry( LdapDN )
+ * Test method for DefaultClientEntry( DN )
*/
@Test
public void testDefaultClientEntryLdapDN()
@@ -226,7 +226,7 @@
/**
- * Test method for DefaultClientEntry( LdapDN, String... )
+ * Test method for DefaultClientEntry( DN, String... )
*/
@Test
public void testDefaultClientEntryLdapDNStringArray()
@@ -264,7 +264,7 @@
/**
- * Test method for DefaultClientEntry( LdapDN, EntryAttribute... )
+ * Test method for DefaultClientEntry( DN, EntryAttribute... )
*/
@Test
public void testDefaultClientEntryLdapDNEntryAttributeArray()
@@ -465,7 +465,7 @@
assertEquals( entry1, entry2 );
entry2.setDn( EXAMPLE_DN );
- assertEquals( LdapDN.EMPTY_LDAPDN, entry1.getDn() );
+ assertEquals( DN.EMPTY_DN, entry1.getDn() );
entry1.setDn( EXAMPLE_DN );
entry2 = entry1.clone();
@@ -715,7 +715,7 @@
assertEquals( EXAMPLE_DN, entry.getDn() );
- LdapDN testDn = new LdapDN( "cn=test" );
+ DN testDn = new DN( "cn=test" );
entry.setDn( testDn );
assertEquals( testDn, entry.getDn() );
@@ -733,7 +733,7 @@
assertEquals( entry1.hashCode(), entry2.hashCode() );
- entry2.setDn( new LdapDN( "ou=system,dc=com" ) );
+ entry2.setDn( new DN( "ou=system,dc=com" ) );
assertNotSame( entry1.hashCode(), entry2.hashCode() );
entry2.setDn( EXAMPLE_DN );
@@ -1193,14 +1193,14 @@
/**
- * Test method for setDN( LdapDN )
+ * Test method for setDN( DN )
*/
@Test
public void testSetDn()
{
Entry entry = new DefaultClientEntry();
- assertEquals( LdapDN.EMPTY_LDAPDN, entry.getDn() );
+ assertEquals( DN.EMPTY_DN, entry.getDn() );
entry.setDn( EXAMPLE_DN );
assertEquals( EXAMPLE_DN, entry.getDn() );
@@ -1268,7 +1268,7 @@
@Test
public void testSerializeCompleteEntry() throws NamingException, IOException, ClassNotFoundException
{
- LdapDN dn = new LdapDN( "ou=system" );
+ DN dn = new DN( "ou=system" );
dn.normalize( oids );
@@ -1322,7 +1322,7 @@
@Test
public void testSerializeEntryWithNoAttribute() throws NamingException, IOException, ClassNotFoundException
{
- LdapDN dn = new LdapDN( "ou=system" );
+ DN dn = new DN( "ou=system" );
dn.normalize( oids );
Modified: directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/message/AbstractResultResponseTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/message/AbstractResultResponseTest.java?rev=918756&r1=918755&r2=918756&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/message/AbstractResultResponseTest.java (original)
+++ directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/message/AbstractResultResponseTest.java Wed Mar 3 23:05:29 2010
@@ -30,7 +30,7 @@
import org.apache.directory.shared.ldap.message.internal.InternalAbstractResultResponse;
import org.apache.directory.shared.ldap.message.internal.InternalLdapResult;
import org.apache.directory.shared.ldap.message.internal.InternalReferral;
-import org.apache.directory.shared.ldap.name.LdapDN;
+import org.apache.directory.shared.ldap.name.DN;
import org.junit.Test;
@@ -77,8 +77,8 @@
r0.setErrorMessage( "blah blah blah" );
r1.setErrorMessage( "blah blah blah" );
- r0.setMatchedDn( new LdapDN( "dc=example,dc=com" ) );
- r1.setMatchedDn( new LdapDN( "dc=example,dc=com" ) );
+ r0.setMatchedDn( new DN( "dc=example,dc=com" ) );
+ r1.setMatchedDn( new DN( "dc=example,dc=com" ) );
r0.setResultCode( ResultCodeEnum.TIME_LIMIT_EXCEEDED );
r1.setResultCode( ResultCodeEnum.TIME_LIMIT_EXCEEDED );
@@ -116,8 +116,8 @@
r0.setErrorMessage( "blah blah blah" );
r1.setErrorMessage( "blah blah blah" );
- r0.setMatchedDn( new LdapDN( "dc=example,dc=com" ) );
- r1.setMatchedDn( new LdapDN( "dc=apache,dc=org" ) );
+ r0.setMatchedDn( new DN( "dc=example,dc=com" ) );
+ r1.setMatchedDn( new DN( "dc=apache,dc=org" ) );
r0.setResultCode( ResultCodeEnum.TIME_LIMIT_EXCEEDED );
r1.setResultCode( ResultCodeEnum.TIME_LIMIT_EXCEEDED );
Modified: directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/message/AddRequestImplTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/message/AddRequestImplTest.java?rev=918756&r1=918755&r2=918756&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/message/AddRequestImplTest.java (original)
+++ directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/message/AddRequestImplTest.java Wed Mar 3 23:05:29 2010
@@ -37,7 +37,7 @@
import org.apache.directory.shared.ldap.message.control.Control;
import org.apache.directory.shared.ldap.message.internal.InternalAddRequest;
import org.apache.directory.shared.ldap.message.internal.InternalResultResponse;
-import org.apache.directory.shared.ldap.name.LdapDN;
+import org.apache.directory.shared.ldap.name.DN;
import org.junit.Test;
@@ -110,11 +110,11 @@
public void testEqualsExactCopy() throws InvalidNameException, NamingException
{
AddRequestImpl req0 = new AddRequestImpl( 5 );
- req0.setEntryDn( new LdapDN( "cn=admin,dc=example,dc=com" ) );
+ req0.setEntryDn( new DN( "cn=admin,dc=example,dc=com" ) );
req0.setEntry( getEntry() );
AddRequestImpl req1 = new AddRequestImpl( 5 );
- req1.setEntryDn( new LdapDN( "cn=admin,dc=example,dc=com" ) );
+ req1.setEntryDn( new DN( "cn=admin,dc=example,dc=com" ) );
req1.setEntry( getEntry() );
assertTrue( req0.equals( req1 ) );
@@ -128,11 +128,11 @@
public void testNotEqualDiffId() throws InvalidNameException, NamingException
{
AddRequestImpl req0 = new AddRequestImpl( 7 );
- req0.setEntryDn( new LdapDN( "cn=admin,dc=example,dc=com" ) );
+ req0.setEntryDn( new DN( "cn=admin,dc=example,dc=com" ) );
req0.setEntry( getEntry() );
AddRequestImpl req1 = new AddRequestImpl( 5 );
- req1.setEntryDn( new LdapDN( "cn=admin,dc=example,dc=com" ) );
+ req1.setEntryDn( new DN( "cn=admin,dc=example,dc=com" ) );
req1.setEntry( getEntry() );
assertFalse( req0.equals( req1 ) );
@@ -147,11 +147,11 @@
{
AddRequestImpl req0 = new AddRequestImpl( 5 );
req0.setEntry( getEntry() );
- req0.setEntryDn( new LdapDN( "cn=admin,dc=example,dc=com" ) );
+ req0.setEntryDn( new DN( "cn=admin,dc=example,dc=com" ) );
AddRequestImpl req1 = new AddRequestImpl( 5 );
req1.setEntry( getEntry() );
- req1.setEntryDn( new LdapDN( "cn=admin,dc=apache,dc=org" ) );
+ req1.setEntryDn( new DN( "cn=admin,dc=apache,dc=org" ) );
assertFalse( req0.equals( req1 ) );
}
@@ -164,11 +164,11 @@
public void testNotEqualDiffAttributes() throws InvalidNameException, NamingException
{
AddRequestImpl req0 = new AddRequestImpl( 5 );
- req0.setEntryDn( new LdapDN( "cn=admin,dc=apache,dc=org" ) );
+ req0.setEntryDn( new DN( "cn=admin,dc=apache,dc=org" ) );
req0.setEntry( getEntry() );
AddRequestImpl req1 = new AddRequestImpl( 5 );
- req1.setEntryDn( new LdapDN( "cn=admin,dc=apache,dc=org" ) );
+ req1.setEntryDn( new DN( "cn=admin,dc=apache,dc=org" ) );
assertFalse( req0.equals( req1 ) );
assertFalse( req1.equals( req0 ) );
@@ -204,13 +204,13 @@
}
- public LdapDN getEntryDn()
+ public DN getEntryDn()
{
return null;
}
- public void setEntryDn( LdapDN entryDn )
+ public void setEntryDn( DN entryDn )
{
}
Modified: directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/message/BindRequestImplTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/message/BindRequestImplTest.java?rev=918756&r1=918755&r2=918756&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/message/BindRequestImplTest.java (original)
+++ directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/message/BindRequestImplTest.java Wed Mar 3 23:05:29 2010
@@ -32,7 +32,7 @@
import org.apache.directory.shared.ldap.message.control.Control;
import org.apache.directory.shared.ldap.message.internal.InternalBindRequest;
import org.apache.directory.shared.ldap.message.internal.InternalResultResponse;
-import org.apache.directory.shared.ldap.name.LdapDN;
+import org.apache.directory.shared.ldap.name.DN;
import org.junit.Test;
@@ -65,13 +65,13 @@
{
BindRequestImpl req0 = new BindRequestImpl( 5 );
req0.setCredentials( "password".getBytes() );
- req0.setName( new LdapDN( "cn=admin,dc=example,dc=com" ) );
+ req0.setName( new DN( "cn=admin,dc=example,dc=com" ) );
req0.setSimple( true );
req0.setVersion3( true );
BindRequestImpl req1 = new BindRequestImpl( 5 );
req1.setCredentials( "password".getBytes() );
- req1.setName( new LdapDN( "cn=admin,dc=example,dc=com" ) );
+ req1.setName( new DN( "cn=admin,dc=example,dc=com" ) );
req1.setSimple( true );
req1.setVersion3( true );
@@ -87,13 +87,13 @@
{
BindRequestImpl req0 = new BindRequestImpl( 7 );
req0.setCredentials( "password".getBytes() );
- req0.setName( new LdapDN( "cn=admin,dc=example,dc=com" ) );
+ req0.setName( new DN( "cn=admin,dc=example,dc=com" ) );
req0.setSimple( true );
req0.setVersion3( true );
BindRequestImpl req1 = new BindRequestImpl( 5 );
req1.setCredentials( "password".getBytes() );
- req1.setName( new LdapDN( "cn=admin,dc=example,dc=com" ) );
+ req1.setName( new DN( "cn=admin,dc=example,dc=com" ) );
req1.setSimple( true );
req1.setVersion3( true );
@@ -109,13 +109,13 @@
{
BindRequestImpl req0 = new BindRequestImpl( 5 );
req0.setCredentials( "abcdefg".getBytes() );
- req0.setName( new LdapDN( "cn=admin,dc=example,dc=com" ) );
+ req0.setName( new DN( "cn=admin,dc=example,dc=com" ) );
req0.setSimple( true );
req0.setVersion3( true );
BindRequestImpl req1 = new BindRequestImpl( 5 );
req1.setCredentials( "password".getBytes() );
- req1.setName( new LdapDN( "cn=admin,dc=example,dc=com" ) );
+ req1.setName( new DN( "cn=admin,dc=example,dc=com" ) );
req1.setSimple( true );
req1.setVersion3( true );
@@ -131,13 +131,13 @@
{
BindRequestImpl req0 = new BindRequestImpl( 5 );
req0.setCredentials( "password".getBytes() );
- req0.setName( new LdapDN( "uid=akarasulu,dc=example,dc=com" ) );
+ req0.setName( new DN( "uid=akarasulu,dc=example,dc=com" ) );
req0.setSimple( true );
req0.setVersion3( true );
BindRequestImpl req1 = new BindRequestImpl( 5 );
req1.setCredentials( "password".getBytes() );
- req1.setName( new LdapDN( "cn=admin,dc=example,dc=com" ) );
+ req1.setName( new DN( "cn=admin,dc=example,dc=com" ) );
req1.setSimple( true );
req1.setVersion3( true );
@@ -153,13 +153,13 @@
{
BindRequestImpl req0 = new BindRequestImpl( 5 );
req0.setCredentials( "password".getBytes() );
- req0.setName( new LdapDN( "cn=admin,dc=example,dc=com" ) );
+ req0.setName( new DN( "cn=admin,dc=example,dc=com" ) );
req0.setSimple( false );
req0.setVersion3( true );
BindRequestImpl req1 = new BindRequestImpl( 5 );
req1.setCredentials( "password".getBytes() );
- req1.setName( new LdapDN( "cn=admin,dc=example,dc=com" ) );
+ req1.setName( new DN( "cn=admin,dc=example,dc=com" ) );
req1.setSimple( true );
req1.setVersion3( true );
@@ -175,13 +175,13 @@
{
BindRequestImpl req0 = new BindRequestImpl( 5 );
req0.setCredentials( "password".getBytes() );
- req0.setName( new LdapDN( "cn=admin,dc=example,dc=com" ) );
+ req0.setName( new DN( "cn=admin,dc=example,dc=com" ) );
req0.setSimple( true );
req0.setVersion3( false );
BindRequestImpl req1 = new BindRequestImpl( 5 );
req1.setCredentials( "password".getBytes() );
- req1.setName( new LdapDN( "cn=admin,dc=example,dc=com" ) );
+ req1.setName( new DN( "cn=admin,dc=example,dc=com" ) );
req1.setSimple( true );
req1.setVersion3( true );
@@ -225,13 +225,13 @@
}
- public LdapDN getName()
+ public DN getName()
{
return null;
}
- public void setName( LdapDN name )
+ public void setName( DN name )
{
}
Modified: directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/message/BindResponseImplTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/message/BindResponseImplTest.java?rev=918756&r1=918755&r2=918756&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/message/BindResponseImplTest.java (original)
+++ directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/message/BindResponseImplTest.java Wed Mar 3 23:05:29 2010
@@ -27,7 +27,7 @@
import org.apache.directory.shared.ldap.message.ReferralImpl;
import org.apache.directory.shared.ldap.message.ResultCodeEnum;
import org.apache.directory.shared.ldap.message.internal.InternalReferral;
-import org.apache.directory.shared.ldap.name.LdapDN;
+import org.apache.directory.shared.ldap.name.DN;
import org.junit.Test;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
@@ -108,8 +108,8 @@
r0.setErrorMessage( "blah blah blah" );
r1.setErrorMessage( "blah blah blah" );
- r0.setMatchedDn( new LdapDN( "dc=example,dc=com" ) );
- r1.setMatchedDn( new LdapDN( "dc=example,dc=com" ) );
+ r0.setMatchedDn( new DN( "dc=example,dc=com" ) );
+ r1.setMatchedDn( new DN( "dc=example,dc=com" ) );
r0.setResultCode( ResultCodeEnum.TIME_LIMIT_EXCEEDED );
r1.setResultCode( ResultCodeEnum.TIME_LIMIT_EXCEEDED );
Modified: directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/message/CompareRequestImplTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/message/CompareRequestImplTest.java?rev=918756&r1=918755&r2=918756&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/message/CompareRequestImplTest.java (original)
+++ directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/message/CompareRequestImplTest.java Wed Mar 3 23:05:29 2010
@@ -33,7 +33,7 @@
import org.apache.directory.shared.ldap.message.control.Control;
import org.apache.directory.shared.ldap.message.internal.InternalCompareRequest;
import org.apache.directory.shared.ldap.message.internal.InternalResultResponse;
-import org.apache.directory.shared.ldap.name.LdapDN;
+import org.apache.directory.shared.ldap.name.DN;
import org.junit.Test;
@@ -65,12 +65,12 @@
public void testEqualsExactCopy() throws InvalidNameException
{
CompareRequestImpl req0 = new CompareRequestImpl( 5 );
- req0.setName( new LdapDN( "cn=admin,dc=example,dc=com" ) );
+ req0.setName( new DN( "cn=admin,dc=example,dc=com" ) );
req0.setAttributeId( "objectClass" );
req0.setAssertionValue( "top" );
CompareRequestImpl req1 = new CompareRequestImpl( 5 );
- req1.setName( new LdapDN( "cn=admin,dc=example,dc=com" ) );
+ req1.setName( new DN( "cn=admin,dc=example,dc=com" ) );
req1.setAttributeId( "objectClass" );
req1.setAssertionValue( "top" );
@@ -86,10 +86,10 @@
public void testNotEqualDiffId() throws InvalidNameException
{
CompareRequestImpl req0 = new CompareRequestImpl( 7 );
- req0.setName( new LdapDN( "cn=admin,dc=example,dc=com" ) );
+ req0.setName( new DN( "cn=admin,dc=example,dc=com" ) );
CompareRequestImpl req1 = new CompareRequestImpl( 5 );
- req1.setName( new LdapDN( "cn=admin,dc=example,dc=com" ) );
+ req1.setName( new DN( "cn=admin,dc=example,dc=com" ) );
assertFalse( req0.equals( req1 ) );
assertFalse( req1.equals( req0 ) );
@@ -103,12 +103,12 @@
public void testNotEqualDiffAttributeIds() throws InvalidNameException
{
CompareRequestImpl req0 = new CompareRequestImpl( 5 );
- req0.setName( new LdapDN( "cn=admin,dc=apache,dc=org" ) );
+ req0.setName( new DN( "cn=admin,dc=apache,dc=org" ) );
req0.setAttributeId( "dc" );
req0.setAssertionValue( "apache.org" );
CompareRequestImpl req1 = new CompareRequestImpl( 5 );
- req1.setName( new LdapDN( "cn=admin,dc=apache,dc=org" ) );
+ req1.setName( new DN( "cn=admin,dc=apache,dc=org" ) );
req1.setAttributeId( "nisDomain" );
req1.setAssertionValue( "apache.org" );
@@ -124,12 +124,12 @@
public void testNotEqualDiffValue() throws InvalidNameException
{
CompareRequestImpl req0 = new CompareRequestImpl( 5 );
- req0.setName( new LdapDN( "cn=admin,dc=apache,dc=org" ) );
+ req0.setName( new DN( "cn=admin,dc=apache,dc=org" ) );
req0.setAttributeId( "dc" );
req0.setAssertionValue( "apache.org" );
CompareRequestImpl req1 = new CompareRequestImpl( 5 );
- req1.setName( new LdapDN( "cn=admin,dc=apache,dc=org" ) );
+ req1.setName( new DN( "cn=admin,dc=apache,dc=org" ) );
req1.setAttributeId( "dc" );
req1.setAssertionValue( "nagoya.apache.org" );
@@ -177,13 +177,13 @@
}
- public LdapDN getName()
+ public DN getName()
{
return null;
}
- public void setName( LdapDN name )
+ public void setName( DN name )
{
}
Modified: directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/message/DeleteRequestImplTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/message/DeleteRequestImplTest.java?rev=918756&r1=918755&r2=918756&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/message/DeleteRequestImplTest.java (original)
+++ directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/message/DeleteRequestImplTest.java Wed Mar 3 23:05:29 2010
@@ -32,7 +32,7 @@
import org.apache.directory.shared.ldap.message.control.Control;
import org.apache.directory.shared.ldap.message.internal.InternalDeleteRequest;
import org.apache.directory.shared.ldap.message.internal.InternalResultResponse;
-import org.apache.directory.shared.ldap.name.LdapDN;
+import org.apache.directory.shared.ldap.name.DN;
import org.junit.Test;
@@ -64,10 +64,10 @@
public void testEqualsExactCopy() throws InvalidNameException
{
DeleteRequestImpl req0 = new DeleteRequestImpl( 5 );
- req0.setName( new LdapDN( "cn=admin,dc=example,dc=com" ) );
+ req0.setName( new DN( "cn=admin,dc=example,dc=com" ) );
DeleteRequestImpl req1 = new DeleteRequestImpl( 5 );
- req1.setName( new LdapDN( "cn=admin,dc=example,dc=com" ) );
+ req1.setName( new DN( "cn=admin,dc=example,dc=com" ) );
assertTrue( req0.equals( req1 ) );
}
@@ -80,10 +80,10 @@
public void testNotEqualDiffId() throws InvalidNameException
{
DeleteRequestImpl req0 = new DeleteRequestImpl( 7 );
- req0.setName( new LdapDN( "cn=admin,dc=example,dc=com" ) );
+ req0.setName( new DN( "cn=admin,dc=example,dc=com" ) );
DeleteRequestImpl req1 = new DeleteRequestImpl( 5 );
- req1.setName( new LdapDN( "cn=admin,dc=example,dc=com" ) );
+ req1.setName( new DN( "cn=admin,dc=example,dc=com" ) );
assertFalse( req0.equals( req1 ) );
}
@@ -96,10 +96,10 @@
public void testNotEqualDiffName() throws InvalidNameException
{
DeleteRequestImpl req0 = new DeleteRequestImpl( 5 );
- req0.setName( new LdapDN( "uid=akarasulu,dc=example,dc=com" ) );
+ req0.setName( new DN( "uid=akarasulu,dc=example,dc=com" ) );
DeleteRequestImpl req1 = new DeleteRequestImpl( 5 );
- req1.setName( new LdapDN( "cn=admin,dc=example,dc=com" ) );
+ req1.setName( new DN( "cn=admin,dc=example,dc=com" ) );
assertFalse( req0.equals( req1 ) );
}
@@ -114,13 +114,13 @@
{
InternalDeleteRequest req0 = new InternalDeleteRequest()
{
- public LdapDN getName()
+ public DN getName()
{
return null;
}
- public void setName( LdapDN name )
+ public void setName( DN name )
{
}
Modified: directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/message/ExtendedResponseImplTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/message/ExtendedResponseImplTest.java?rev=918756&r1=918755&r2=918756&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/message/ExtendedResponseImplTest.java (original)
+++ directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/message/ExtendedResponseImplTest.java Wed Mar 3 23:05:29 2010
@@ -32,7 +32,7 @@
import org.apache.directory.shared.ldap.message.control.Control;
import org.apache.directory.shared.ldap.message.internal.InternalExtendedResponse;
import org.apache.directory.shared.ldap.message.internal.InternalLdapResult;
-import org.apache.directory.shared.ldap.name.LdapDN;
+import org.apache.directory.shared.ldap.name.DN;
import org.junit.Test;
@@ -61,7 +61,7 @@
try
{
- result.setMatchedDn( new LdapDN( "dc=example,dc=com" ) );
+ result.setMatchedDn( new DN( "dc=example,dc=com" ) );
}
catch ( InvalidNameException ine )
{
@@ -142,7 +142,7 @@
try
{
- result.setMatchedDn( new LdapDN( "dc=example,dc=com" ) );
+ result.setMatchedDn( new DN( "dc=example,dc=com" ) );
}
catch ( InvalidNameException ine )
{