You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by ak...@apache.org on 2011/01/23 02:17:26 UTC
svn commit: r1062306 [22/32] - in /directory:
apacheds-manuals/trunk/src/advanced-user-guide/
apacheds-manuals/trunk/src/basic-user-guide/
apacheds/trunk/core-annotations/src/main/java/org/apache/directory/server/core/factory/
apacheds/trunk/core-api/s...
Copied: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/name/Rdn.java (from r1062292, 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?p2=directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/name/Rdn.java&p1=directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/name/RDN.java&r1=1062292&r2=1062306&rev=1062306&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 Sun Jan 23 01:17:06 2011
@@ -72,14 +72,14 @@ import org.slf4j.LoggerFactory;
* [\"] <br> - <separator> ::= ',' | ';' <br> - <spaces> ::= ' '
* <spaces> | e <br>
* <br>
- * A RDN is a part of a DN. It can be composed of many types, as in the RDN
- * following RDN :<br>
+ * A Rdn is a part of a Dn. It can be composed of many types, as in the Rdn
+ * following Rdn :<br>
* ou=value + cn=other value<br>
* <br>
* or <br>
* ou=value + ou=another value<br>
* <br>
- * In this case, we have to store an 'ou' and a 'cn' in the RDN.<br>
+ * In this case, we have to store an 'ou' and a 'cn' in the Rdn.<br>
* <br>
* The types are case insensitive. <br>
* Spaces before and after types and values are not stored.<br>
@@ -111,13 +111,13 @@ import org.slf4j.LoggerFactory;
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
-public class RDN implements Cloneable, Comparable<RDN>, Externalizable, Iterable<AVA>
+public class Rdn implements Cloneable, Comparable<Rdn>, Externalizable, Iterable<Ava>
{
/** The LoggerFactory used by this class */
- protected static final Logger LOG = LoggerFactory.getLogger( RDN.class );
+ protected static final Logger LOG = LoggerFactory.getLogger( Rdn.class );
- /** An empty RDN */
- public static final RDN EMPTY_RDN = new RDN();
+ /** An empty Rdn */
+ public static final Rdn EMPTY_RDN = new Rdn();
/**
* Declares the Serial Version Uid.
@@ -128,17 +128,17 @@ public class RDN implements Cloneable, C
*/
private static final long serialVersionUID = 1L;
- /** The User Provided RDN */
+ /** The User Provided Rdn */
private String upName = null;
- /** The normalized RDN */
+ /** The normalized Rdn */
private String normName = null;
- /** The starting position of this RDN in the given string from which
+ /** The starting position of this Rdn in the given string from which
* we have extracted the upName */
private int start;
- /** The length of this RDN upName */
+ /** The length of this Rdn upName */
private int length;
/**
@@ -147,7 +147,7 @@ public class RDN implements Cloneable, C
* because we want the ATAVs to be sorted. An atav may contain more than one
* value. In this case, the values are String stored in a List.
*/
- private Set<AVA> atavs = null;
+ private Set<Ava> atavs = null;
/**
* We also keep a set of types, in order to use manipulations. A type is
@@ -158,7 +158,7 @@ public class RDN implements Cloneable, C
private MultiMap atavTypes = new MultiValueMap();
/**
- * We keep the type for a single valued RDN, to avoid the creation of an HashMap
+ * We keep the type for a single valued Rdn, to avoid the creation of an HashMap
*/
private String atavType = null;
@@ -167,7 +167,7 @@ public class RDN implements Cloneable, C
* case where we only have a single type=value. This will be 99.99% the
* case. This avoids the creation of a HashMap.
*/
- protected AVA atav = null;
+ protected Ava atav = null;
/**
* The number of atavs. We store this number here to avoid complex
@@ -187,7 +187,7 @@ public class RDN implements Cloneable, C
/** Constant used in comparisons */
public static final int EQUAL = 0;
- /** A flag used to tell if the RDN has been normalized */
+ /** A flag used to tell if the Rdn has been normalized */
private AtomicBoolean normalized = new AtomicBoolean();
/** the schema manager */
@@ -197,7 +197,7 @@ public class RDN implements Cloneable, C
/**
* A empty constructor.
*/
- public RDN()
+ public Rdn()
{
this( ( SchemaManager ) null );
}
@@ -205,14 +205,14 @@ public class RDN implements Cloneable, C
/**
*
- * Creates a new instance of RDN.
+ * Creates a new instance of Rdn.
*
* @param schemaManager the schema manager
*/
- public RDN( SchemaManager schemaManager )
+ public Rdn(SchemaManager schemaManager)
{
// Don't waste space... This is not so often we have multiple
- // name-components in a RDN... So we won't initialize the Map and the
+ // name-components in a Rdn... So we won't initialize the Map and the
// treeSet.
this.schemaManager = schemaManager;
upName = "";
@@ -222,13 +222,13 @@ public class RDN implements Cloneable, C
/**
- * A constructor that parse a String representing a RDN.
+ * A constructor that parse a String representing a Rdn.
*
- * @param rdn the String containing the RDN to parse
+ * @param rdn the String containing the Rdn to parse
* @param schemaManager the schema manager
- * @throws LdapInvalidDnException if the RDN is invalid
+ * @throws LdapInvalidDnException if the Rdn is invalid
*/
- public RDN( String rdn, SchemaManager schemaManager ) throws LdapInvalidDnException
+ public Rdn(String rdn, SchemaManager schemaManager) throws LdapInvalidDnException
{
start = 0;
@@ -265,31 +265,31 @@ public class RDN implements Cloneable, C
/**
- * A constructor that parse a String representing a RDN.
+ * A constructor that parse a String representing a Rdn.
*
- * @param rdn the String containing the RDN to parse
- * @throws LdapInvalidDnException if the RDN is invalid
+ * @param rdn the String containing the Rdn to parse
+ * @throws LdapInvalidDnException if the Rdn is invalid
*/
- public RDN( String rdn ) throws LdapInvalidDnException
+ public Rdn(String rdn) throws LdapInvalidDnException
{
this( rdn, ( SchemaManager ) null );
}
/**
- * A constructor that constructs a RDN from a type and a value. Constructs
- * an RDN from the given attribute type and value. The string attribute
- * values are not interpreted as RFC 4514 formatted RDN strings. That is,
+ * A constructor that constructs a Rdn from a type and a value. Constructs
+ * an Rdn from the given attribute type and value. The string attribute
+ * values are not interpreted as RFC 4514 formatted Rdn strings. That is,
* the values are used literally (not parsed) and assumed to be un-escaped.
*
- * @param upType the user provided type of the RDN
- * @param upValue the user provided value of the RDN
- * @param normType the normalized provided type of the RDN
- * @param normValue the normalized provided value of the RDN
+ * @param upType the user provided type of the Rdn
+ * @param upValue the user provided value of the Rdn
+ * @param normType the normalized provided type of the Rdn
+ * @param normValue the normalized provided value of the Rdn
* @param schemaManager the schema manager
- * @throws LdapInvalidDnException if the RDN is invalid
+ * @throws LdapInvalidDnException if the Rdn is invalid
*/
- public RDN( String upType, String normType, String upValue, String normValue, SchemaManager schemaManager ) throws LdapInvalidDnException
+ public Rdn(String upType, String normType, String upValue, String normValue, SchemaManager schemaManager) throws LdapInvalidDnException
{
this.schemaManager = schemaManager;
@@ -308,40 +308,40 @@ public class RDN implements Cloneable, C
}
else
{
- // As strange as it seems, the RDN is *not* normalized against the schema at this point
+ // As strange as it seems, the Rdn is *not* normalized against the schema at this point
normalized.set( false );
}
}
/**
- * A constructor that constructs a RDN from a type and a value.
+ * A constructor that constructs a Rdn from a type and a value.
*
- * @param upType the user provided type of the RDN
- * @param upValue the user provided value of the RDN
- * @param normType the normalized provided type of the RDN
- * @param normValue the normalized provided value of the RDN
- * @throws LdapInvalidDnException if the RDN is invalid
- * @see #RDN(String, String, String, String, SchemaManager)
+ * @param upType the user provided type of the Rdn
+ * @param upValue the user provided value of the Rdn
+ * @param normType the normalized provided type of the Rdn
+ * @param normValue the normalized provided value of the Rdn
+ * @throws LdapInvalidDnException if the Rdn is invalid
+ * @see #Rdn(String, String, String, String, SchemaManager)
*/
- public RDN( String upType, String normType, String upValue, String normValue ) throws LdapInvalidDnException
+ public Rdn(String upType, String normType, String upValue, String normValue) throws LdapInvalidDnException
{
this( upType, normType, upValue, normValue, null );
}
/**
- * A constructor that constructs a RDN from a type and a value. Constructs
- * an RDN from the given attribute type and value. The string attribute
- * values are not interpreted as RFC 414 formatted RDN strings. That is,
+ * A constructor that constructs a Rdn from a type and a value. Constructs
+ * an Rdn from the given attribute type and value. The string attribute
+ * values are not interpreted as RFC 414 formatted Rdn strings. That is,
* the values are used literally (not parsed) and assumed to be un-escaped.
*
- * @param upType the user provided type of the RDN
- * @param upValue the user provided value of the RDN
+ * @param upType the user provided type of the Rdn
+ * @param upValue the user provided value of the Rdn
* @param schemaManager the schema manager
- * @throws LdapInvalidDnException if the RDN is invalid
+ * @throws LdapInvalidDnException if the Rdn is invalid
*/
- public RDN( String upType, String upValue, SchemaManager schemaManager ) throws LdapInvalidDnException
+ public Rdn(String upType, String upValue, SchemaManager schemaManager) throws LdapInvalidDnException
{
addAVA( upType, upType, new StringValue( upValue ), new StringValue( upValue ) );
@@ -360,35 +360,35 @@ public class RDN implements Cloneable, C
// create the internal normalized form
normalize();
- // As strange as it seems, the RDN is *not* normalized against the schema at this point
+ // As strange as it seems, the Rdn is *not* normalized against the schema at this point
normalized.set( false );
}
}
/**
- * A constructor that constructs a RDN from a type and a value.
+ * A constructor that constructs a Rdn from a type and a value.
*
- * @param upType the user provided type of the RDN
- * @param upValue the user provided value of the RDN
- * @throws LdapInvalidDnException if the RDN is invalid
- * @see #RDN(String, String, SchemaManager)
+ * @param upType the user provided type of the Rdn
+ * @param upValue the user provided value of the Rdn
+ * @throws LdapInvalidDnException if the Rdn is invalid
+ * @see #Rdn(String, String, SchemaManager)
*/
- public RDN( String upType, String upValue ) throws LdapInvalidDnException
+ public Rdn(String upType, String upValue) throws LdapInvalidDnException
{
this( upType, upValue, null );
}
/**
- * A constructor that constructs a RDN from a type, a position and a length.
+ * A constructor that constructs a Rdn from a type, a position and a length.
*
- * @param start the starting point for this RDN in the user provided DN
- * @param length the RDN's length
+ * @param start the starting point for this Rdn in the user provided Dn
+ * @param length the Rdn's length
* @param upName the user provided name
* @param normName the normalized name
*/
- RDN( int start, int length, String upName, String normName )
+ Rdn(int start, int length, String upName, String normName)
{
this.start = start;
this.length = length;
@@ -404,7 +404,7 @@ public class RDN implements Cloneable, C
*
* @param rdn The non-null Rdn to be copied.
*/
- public RDN( RDN rdn )
+ public Rdn(Rdn rdn)
{
nbAtavs = rdn.getNbAtavs();
this.normName = rdn.normName;
@@ -419,17 +419,17 @@ public class RDN implements Cloneable, C
return;
case 1:
- this.atav = ( AVA ) rdn.atav.clone();
+ this.atav = (Ava) rdn.atav.clone();
return;
default:
// We must duplicate the treeSet and the hashMap
- atavs = new TreeSet<AVA>();
+ atavs = new TreeSet<Ava>();
atavTypes = new MultiValueMap();
- for ( AVA currentAtav : rdn.atavs )
+ for ( Ava currentAtav : rdn.atavs )
{
- atavs.add( ( AVA ) currentAtav.clone() );
+ atavs.add( (Ava) currentAtav.clone() );
atavTypes.put( currentAtav.getNormType(), currentAtav );
}
@@ -439,7 +439,7 @@ public class RDN implements Cloneable, C
/**
- * Transform the external representation of the current RDN to an internal
+ * Transform the external representation of the current Rdn to an internal
* normalized form where :
* - types are trimmed and lower cased
* - values are trimmed and lower cased
@@ -452,7 +452,7 @@ public class RDN implements Cloneable, C
switch ( nbAtavs )
{
case 0:
- // An empty RDN
+ // An empty Rdn
normName = "";
break;
@@ -476,7 +476,7 @@ public class RDN implements Cloneable, C
boolean isFirst = true;
- for ( AVA ata : atavs )
+ for ( Ava ata : atavs )
{
if ( isFirst )
{
@@ -497,28 +497,28 @@ public class RDN implements Cloneable, C
/**
- * Transform a RDN by changing the value to its OID counterpart and
+ * Transform a Rdn by changing the value to its OID counterpart and
* normalizing the value accordingly to its type.
*
* @param sm the SchemaManager
- * @return this RDN, normalized
- * @throws LdapInvalidDnException if the RDN is invalid
+ * @return this Rdn, normalized
+ * @throws LdapInvalidDnException if the Rdn is invalid
*/
- public RDN normalize( SchemaManager sm ) throws LdapInvalidDnException
+ public Rdn normalize( SchemaManager sm ) throws LdapInvalidDnException
{
return normalize( sm.getNormalizerMapping() );
}
/**
- * Transform a RDN by changing the value to its OID counterpart and
+ * Transform a Rdn by changing the value to its OID counterpart and
* normalizing the value accordingly to its type.
*
* @param oidsMap the mapping between names and OIDs
- * @return this RDN, normalized
- * @throws LdapInvalidDnException if the RDN is invalid
+ * @return this Rdn, normalized
+ * @throws LdapInvalidDnException if the Rdn is invalid
*/
- public RDN normalize( Map<String, OidNormalizer> oidsMap ) throws LdapInvalidDnException
+ public Rdn normalize( Map<String, OidNormalizer> oidsMap ) throws LdapInvalidDnException
{
if ( ( oidsMap == null ) || ( oidsMap.isEmpty() ) )
{
@@ -533,7 +533,7 @@ public class RDN implements Cloneable, C
synchronized ( this )
{
String savedUpName = getName();
- DN.rdnOidToName( this, oidsMap );
+ Dn.rdnOidToName(this, oidsMap);
normalize();
this.upName = savedUpName;
normalized.set( true );
@@ -544,14 +544,14 @@ public class RDN implements Cloneable, C
/**
- * Add a AttributeTypeAndValue to the current RDN
+ * Add a AttributeTypeAndValue to the current Rdn
*
- * @param upType The user provided type of the added RDN.
- * @param type The normalized provided type of the added RDN.
- * @param upValue The user provided value of the added RDN
- * @param value The normalized provided value of the added RDN
+ * @param upType The user provided type of the added Rdn.
+ * @param type The normalized provided type of the added Rdn.
+ * @param upValue The user provided value of the added Rdn
+ * @param value The normalized provided value of the added Rdn
* @throws LdapInvalidDnException
- * If the RDN is invalid
+ * If the Rdn is invalid
*/
// WARNING : The protection level is left unspecified intentionally.
// We need this method to be visible from the DnParser class, but not
@@ -581,7 +581,7 @@ public class RDN implements Cloneable, C
{
case 0:
// This is the first AttributeTypeAndValue. Just stores it.
- atav = new AVA( upType, normalizedType, upValue, normalizedValue );
+ atav = new Ava( upType, normalizedType, upValue, normalizedValue );
nbAtavs = 1;
atavType = normalizedType;
return;
@@ -590,7 +590,7 @@ public class RDN implements Cloneable, C
// We already have an atav. We have to put it in the HashMap
// before adding a new one.
// First, create the HashMap,
- atavs = new TreeSet<AVA>();
+ atavs = new TreeSet<Ava>();
// and store the existing AttributeTypeAndValue into it.
atavs.add( atav );
@@ -604,7 +604,7 @@ public class RDN implements Cloneable, C
default:
// add a new AttributeTypeAndValue
- AVA newAtav = new AVA( upType, normalizedType, upValue, normalizedValue );
+ Ava newAtav = new Ava( upType, normalizedType, upValue, normalizedValue );
atavs.add( newAtav );
atavTypes.put( normalizedType, newAtav );
@@ -616,14 +616,14 @@ public class RDN implements Cloneable, C
/**
- * Add a AttributeTypeAndValue to the current RDN
+ * Add a AttributeTypeAndValue to the current Rdn
*
* @param value The added AttributeTypeAndValue
*/
// WARNING : The protection level is left unspecified intentionally.
// We need this method to be visible from the DnParser class, but not
// from outside this package.
- /* Unspecified protection */void addAVA( AVA value )
+ /* Unspecified protection */void addAVA( Ava value )
{
String normalizedType = value.getNormType();
@@ -640,7 +640,7 @@ public class RDN implements Cloneable, C
// We already have an atav. We have to put it in the HashMap
// before adding a new one.
// First, create the HashMap,
- atavs = new TreeSet<AVA>();
+ atavs = new TreeSet<Ava>();
// and store the existing AttributeTypeAndValue into it.
atavs.add( atav );
@@ -665,7 +665,7 @@ public class RDN implements Cloneable, C
/**
- * Clear the RDN, removing all the AttributeTypeAndValues.
+ * Clear the Rdn, removing all the AttributeTypeAndValues.
*/
// WARNING : The protection level is left unspecified intentionally.
// We need this method to be visible from the DnParser class, but not
@@ -691,7 +691,7 @@ public class RDN implements Cloneable, C
*
* @param type the type of the NameArgument
* @return the Value to be returned, or null if none found.
- * @throws LdapInvalidDnException if the RDN is invalid
+ * @throws LdapInvalidDnException if the Rdn is invalid
*/
public Object getValue( String type ) throws LdapInvalidDnException
{
@@ -714,11 +714,11 @@ public class RDN implements Cloneable, C
default:
if ( atavTypes.containsKey( normalizedType ) )
{
- Collection<AVA> atavList = ( Collection<AVA> ) atavTypes.get( normalizedType );
+ Collection<Ava> atavList = ( Collection<Ava> ) atavTypes.get( normalizedType );
StringBuffer sb = new StringBuffer();
boolean isFirst = true;
- for ( AVA elem : atavList )
+ for ( Ava elem : atavList )
{
if ( isFirst )
{
@@ -743,7 +743,7 @@ public class RDN implements Cloneable, C
/**
* Get the start position
*
- * @return The start position in the DN
+ * @return The start position in the Dn
*/
public int getStart()
{
@@ -752,9 +752,9 @@ public class RDN implements Cloneable, C
/**
- * Get the RDN length
+ * Get the Rdn length
*
- * @return the RDN length
+ * @return the Rdn length
*/
public int getLength()
{
@@ -771,7 +771,7 @@ public class RDN implements Cloneable, C
* The type of the NameArgument to be returned
* @return The AttributeTypeAndValue, of null if none is found.
*/
- public AVA getAttributeTypeAndValue( String type )
+ public Ava getAttributeTypeAndValue( String type )
{
// First, let's normalize the type
String normalizedType = Strings.lowerCaseAscii(Strings.trim(type));
@@ -792,7 +792,7 @@ public class RDN implements Cloneable, C
default:
if ( atavTypes.containsKey( normalizedType ) )
{
- Collection<AVA> atavList = ( Collection<AVA> ) atavTypes.get( normalizedType );
+ Collection<Ava> atavList = ( Collection<Ava> ) atavTypes.get( normalizedType );
return atavList.iterator().next();
}
@@ -802,17 +802,17 @@ public class RDN implements Cloneable, C
/**
- * Retrieves the components of this RDN as an iterator of AttributeTypeAndValue.
- * The effect on the iterator of updates to this RDN is undefined. If the
- * RDN has zero components, an empty (non-null) iterator is returned.
+ * Retrieves the components of this Rdn as an iterator of AttributeTypeAndValue.
+ * The effect on the iterator of updates to this Rdn is undefined. If the
+ * Rdn has zero components, an empty (non-null) iterator is returned.
*
- * @return an iterator of the components of this RDN, each an AttributeTypeAndValue
+ * @return an iterator of the components of this Rdn, each an AttributeTypeAndValue
*/
- public Iterator<AVA> iterator()
+ public Iterator<Ava> iterator()
{
if ( nbAtavs == 1 || nbAtavs == 0 )
{
- return new Iterator<AVA>()
+ return new Iterator<Ava>()
{
private boolean hasMoreElement = nbAtavs == 1;
@@ -823,9 +823,9 @@ public class RDN implements Cloneable, C
}
- public AVA next()
+ public Ava next()
{
- AVA obj = atav;
+ Ava obj = atav;
hasMoreElement = false;
return obj;
}
@@ -847,13 +847,13 @@ public class RDN implements Cloneable, C
/**
* Clone the Rdn
*
- * @return A clone of the current RDN
+ * @return A clone of the current Rdn
*/
- public RDN clone()
+ public Rdn clone()
{
try
{
- RDN rdn = ( RDN ) super.clone();
+ Rdn rdn = (Rdn) super.clone();
rdn.normalized = new AtomicBoolean( normalized.get() );
// The AttributeTypeAndValue is immutable. We won't clone it
@@ -864,18 +864,18 @@ public class RDN implements Cloneable, C
break;
case 1:
- rdn.atav = ( AVA ) this.atav.clone();
+ rdn.atav = (Ava) this.atav.clone();
rdn.atavTypes = atavTypes;
break;
default:
// We must duplicate the treeSet and the hashMap
rdn.atavTypes = new MultiValueMap();
- rdn.atavs = new TreeSet<AVA>();
+ rdn.atavs = new TreeSet<Ava>();
- for ( AVA currentAtav : this.atavs )
+ for ( Ava currentAtav : this.atavs )
{
- rdn.atavs.add( ( AVA ) currentAtav.clone() );
+ rdn.atavs.add( (Ava) currentAtav.clone() );
rdn.atavTypes.put( currentAtav.getNormType(), currentAtav );
}
@@ -898,13 +898,13 @@ public class RDN implements Cloneable, C
* <li>comparison of type are done case insensitive
* <li>each value is equal, case sensitive
* <li>Order of ATAV is not important If the RDNs are not equals, a positive number is
- * returned if the first RDN is greater, negative otherwise
+ * returned if the first Rdn is greater, negative otherwise
*
- * @param rdn the RDN to be compared
- * @return 0 if both RDNs are equals. -1 if the current RDN is inferior, 1 if
- * the current RDN is superior, UNDEFINED otherwise.
+ * @param rdn the Rdn to be compared
+ * @return 0 if both RDNs are equals. -1 if the current Rdn is inferior, 1 if
+ * the current Rdn is superior, UNDEFINED otherwise.
*/
- public int compareTo( RDN rdn )
+ public int compareTo( Rdn rdn )
{
if ( rdn == null )
{
@@ -933,8 +933,8 @@ public class RDN implements Cloneable, C
// the types are already normalized and sorted in the atavs TreeSet
// so we could compare the 1st with the 1st, then the 2nd with the 2nd, etc.
- Iterator<AVA> localIterator = atavs.iterator();
- Iterator<AVA> paramIterator = rdn.atavs.iterator();
+ Iterator<Ava> localIterator = atavs.iterator();
+ Iterator<Ava> paramIterator = rdn.atavs.iterator();
while ( localIterator.hasNext() || paramIterator.hasNext() )
{
@@ -947,8 +947,8 @@ public class RDN implements Cloneable, C
return INFERIOR;
}
- AVA localAtav = localIterator.next();
- AVA paramAtav = paramIterator.next();
+ Ava localAtav = localIterator.next();
+ Ava paramAtav = paramIterator.next();
int result = localAtav.compareTo( paramAtav );
if ( result != EQUAL )
{
@@ -982,7 +982,7 @@ public class RDN implements Cloneable, C
/**
* Set the User Provided Name.
*
- * Package private because RDN is immutable, only used by the DN parser.
+ * Package private because Rdn is immutable, only used by the Dn parser.
*
* @param upName the User Provided dame
*/
@@ -1005,9 +1005,9 @@ public class RDN implements Cloneable, C
* Return the unique AttributeTypeAndValue, or the first one of we have more
* than one
*
- * @return The first AttributeTypeAndValue of this RDN
+ * @return The first AttributeTypeAndValue of this Rdn
*/
- public AVA getAVA()
+ public Ava getAVA()
{
switch ( nbAtavs )
{
@@ -1018,7 +1018,7 @@ public class RDN implements Cloneable, C
return atav;
default:
- return ( ( TreeSet<AVA> ) atavs ).first().clone();
+ return ( ( TreeSet<Ava> ) atavs ).first().clone();
}
}
@@ -1026,7 +1026,7 @@ public class RDN implements Cloneable, C
/**
* Return the user provided type, or the first one of we have more than one (the lowest)
*
- * @return The first user provided type of this RDN
+ * @return The first user provided type of this Rdn
*/
public String getUpType()
{
@@ -1039,7 +1039,7 @@ public class RDN implements Cloneable, C
return atav.getUpType();
default:
- return ( ( TreeSet<AVA> ) atavs ).first().getUpType();
+ return ( ( TreeSet<Ava> ) atavs ).first().getUpType();
}
}
@@ -1047,7 +1047,7 @@ public class RDN implements Cloneable, C
/**
* Return the normalized type, or the first one of we have more than one (the lowest)
*
- * @return The first normalized type of this RDN
+ * @return The first normalized type of this Rdn
*/
public String getNormType()
{
@@ -1060,7 +1060,7 @@ public class RDN implements Cloneable, C
return atav.getNormType();
default:
- return ( ( TreeSet<AVA> ) atavs ).first().getNormType();
+ return ( ( TreeSet<Ava> ) atavs ).first().getNormType();
}
}
@@ -1068,7 +1068,7 @@ public class RDN implements Cloneable, C
/**
* Return the User Provided value
*
- * @return The first User provided value of this RDN
+ * @return The first User provided value of this Rdn
*/
public Value<?> getUpValue()
{
@@ -1081,7 +1081,7 @@ public class RDN implements Cloneable, C
return atav.getUpValue();
default:
- return ( ( TreeSet<AVA> ) atavs ).first().getUpValue();
+ return ( ( TreeSet<Ava> ) atavs ).first().getUpValue();
}
}
@@ -1089,7 +1089,7 @@ public class RDN implements Cloneable, C
/**
* Return the normalized value, or the first one of we have more than one (the lowest)
*
- * @return The first normalized value of this RDN
+ * @return The first normalized value of this Rdn
*/
public Value<?> getNormValue()
{
@@ -1102,7 +1102,7 @@ public class RDN implements Cloneable, C
return atav.getNormValue();
default:
- return ( ( TreeSet<AVA> ) atavs ).first().getNormValue();
+ return ( ( TreeSet<Ava> ) atavs ).first().getNormValue();
}
}
@@ -1124,12 +1124,12 @@ public class RDN implements Cloneable, C
return true;
}
- if ( !( rdn instanceof RDN ) )
+ if ( !( rdn instanceof Rdn) )
{
return false;
}
- return compareTo( ( RDN ) rdn ) == EQUAL;
+ return compareTo( (Rdn) rdn ) == EQUAL;
}
@@ -1451,9 +1451,9 @@ public class RDN implements Cloneable, C
/**
- * Tells if the RDN has already been normalized or not
+ * Tells if the Rdn has already been normalized or not
*
- * @return <code>true</code> if the RDN is already normalized.
+ * @return <code>true</code> if the Rdn is already normalized.
*/
public boolean isNormalized()
{
@@ -1474,7 +1474,7 @@ public class RDN implements Cloneable, C
switch ( nbAtavs )
{
case 0:
- // An empty RDN
+ // An empty Rdn
break;
case 1:
@@ -1485,7 +1485,7 @@ public class RDN implements Cloneable, C
default:
// We have more than one AttributeTypeAndValue
- for ( AVA ata : atavs )
+ for ( Ava ata : atavs )
{
result = result * 17 + ata.hashCode();
}
@@ -1498,7 +1498,7 @@ public class RDN implements Cloneable, C
/**
- * A RDN is composed of on to many ATAVs (AttributeType And Value).
+ * A Rdn is composed of on to many ATAVs (AttributeType And Value).
* We should write all those ATAVs sequencially, following the
* structure :
* <ul>
@@ -1509,10 +1509,10 @@ public class RDN implements Cloneable, C
* <b>nbAtavs</b> The number of ATAVs to write. Can't be 0.
* </li>
* <li>
- * <b>upName</b> The User provided RDN
+ * <b>upName</b> The User provided Rdn
* </li>
* <li>
- * <b>normName</b> The normalized RDN. It can be empty if the normalized
+ * <b>normName</b> The normalized Rdn. It can be empty if the normalized
* name equals the upName.
* </li>
* <li>
@@ -1534,7 +1534,7 @@ public class RDN implements Cloneable, C
* </ul>
*
* @see Externalizable#readExternal(ObjectInput)
- * @param out The stream into which the serialized RDN will be put
+ * @param out The stream into which the serialized Rdn will be put
* @throws IOException If the stream can't be written
*/
public void writeExternal( ObjectOutput out ) throws IOException
@@ -1564,7 +1564,7 @@ public class RDN implements Cloneable, C
break;
default:
- for ( AVA value : atavs )
+ for ( Ava value : atavs )
{
out.writeObject( value );
}
@@ -1576,13 +1576,13 @@ public class RDN implements Cloneable, C
/**
* We read back the data to create a new RDB. The structure
- * read is exposed in the {@link RDN#writeExternal(ObjectOutput)}
+ * read is exposed in the {@link Rdn#writeExternal(ObjectOutput)}
* method
*
* @see Externalizable#readExternal(ObjectInput)
- * @param in The input stream from which the RDN will be read
+ * @param in The input stream from which the Rdn will be read
* @throws IOException If we can't read from the input stream
- * @throws ClassNotFoundException If we can't create a new RDN
+ * @throws ClassNotFoundException If we can't create a new Rdn
*/
public void readExternal( ObjectInput in ) throws IOException, ClassNotFoundException
{
@@ -1610,19 +1610,19 @@ public class RDN implements Cloneable, C
break;
case 1:
- atav = ( AVA ) in.readObject();
+ atav = (Ava) in.readObject();
atavType = atav.getNormType();
break;
default:
- atavs = new TreeSet<AVA>();
+ atavs = new TreeSet<Ava>();
atavTypes = new MultiValueMap();
for ( int i = 0; i < nbAtavs; i++ )
{
- AVA value = ( AVA ) in.readObject();
+ Ava value = (Ava) in.readObject();
atavs.add( value );
atavTypes.put( value.getNormType(), value );
}
@@ -1636,7 +1636,7 @@ public class RDN implements Cloneable, C
/**
- * @return a String representation of the RDN
+ * @return a String representation of the Rdn
*/
public String toString()
{
Propchange: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/name/Rdn.java
------------------------------------------------------------------------------
svn:eol-style = native
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=1062306&r1=1062305&r2=1062306&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 Sun Jan 23 01:17:06 2011
@@ -50,11 +50,11 @@ import org.apache.directory.shared.ldap.
* [\"] <br> - <separator> ::= ',' | ';' <br> - <spaces> ::= ' '
* <spaces> | e <br>
* <br>
- * A RDN is a part of a DN. It can be composed of many types, as in the RDN
- * following RDN :<br>
+ * A Rdn is a part of a Dn. It can be composed of many types, as in the Rdn
+ * following Rdn :<br>
* ou=value + cn=other value<br>
* <br>
- * In this case, we have to store an 'ou' and a 'cn' in the RDN.<br>
+ * In this case, we have to store an 'ou' and a 'cn' in the Rdn.<br>
* <br>
* The types are case insensitive. <br>
* Spaces before and after types and values are not stored.<br>
@@ -99,11 +99,11 @@ public final class RdnParser
* </p>
*
* @param dn The String to parse
- * @param rdn The RDN to fill. Beware that if the RDN is not empty, the new
+ * @param rdn The Rdn to fill. Beware that if the Rdn is not empty, the new
* AttributeTypeAndValue will be added.
* @throws LdapInvalidDnException If the NameComponent is invalid
*/
- public static void parse( String dn, RDN rdn ) throws LdapInvalidDnException
+ public static void parse( String dn, Rdn rdn ) throws LdapInvalidDnException
{
try
{
@@ -125,11 +125,11 @@ public final class RdnParser
* </p>
*
* @param dn The string to parse
- * @return <code>true</code> if the RDN is valid
+ * @return <code>true</code> if the Rdn is valid
*/
public static boolean isValid( String dn )
{
- RDN rdn = new RDN();
+ Rdn rdn = new Rdn();
try
{
parse( dn, rdn );
Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/name/RdnSerializer.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/name/RdnSerializer.java?rev=1062306&r1=1062305&r2=1062306&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/name/RdnSerializer.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/name/RdnSerializer.java Sun Jan 23 01:17:06 2011
@@ -29,7 +29,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
/**
- * A helper class which serialize and deserialize a RDN
+ * A helper class which serialize and deserialize a Rdn
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
@@ -48,15 +48,15 @@ public final class RdnSerializer
/**
- * Serialize a RDN instance
+ * Serialize a Rdn instance
*
- * A RDN is composed of on to many ATAVs (AttributeType And Value).
+ * A Rdn is composed of on to many ATAVs (AttributeType And Value).
* We should write all those ATAVs sequencially, following the
* structure :
*
* <li>nbAtavs</li> The number of ATAVs to write. Can't be 0.
- * <li>upName</li> The User provided RDN
- * <li>normName</li> The normalized RDN. It can be empty if the normalized
+ * <li>upName</li> The User provided Rdn
+ * <li>normName</li> The normalized Rdn. It can be empty if the normalized
* name equals the upName.
* <li>atavs</li>
* <p>
@@ -65,11 +65,11 @@ public final class RdnSerializer
* <li>length</li> The ATAV user provided length
* <li>Call the ATAV write method</li> The ATAV itself
*
- * @param rdn The RDN to serialize
- * @param out the stream in which the RDN will be serialized
+ * @param rdn The Rdn to serialize
+ * @param out the stream in which the Rdn will be serialized
* @throws IOException If we can't write in this stream
*/
- public static void serialize( RDN rdn, ObjectOutput out ) throws IOException
+ public static void serialize( Rdn rdn, ObjectOutput out ) throws IOException
{
out.writeInt( rdn.getNbAtavs() );
Unicode.writeUTF(out, rdn.getName());
@@ -83,13 +83,13 @@ public final class RdnSerializer
break;
case 1 :
- AVASerializer.serialize( rdn.getAVA(), out );
+ AvaSerializer.serialize(rdn.getAVA(), out);
break;
default :
- for ( AVA atav:rdn )
+ for ( Ava atav:rdn )
{
- AVASerializer.serialize( atav, out );
+ AvaSerializer.serialize(atav, out);
}
break;
@@ -98,17 +98,17 @@ public final class RdnSerializer
/**
- * Deserialize a RDN instance
+ * Deserialize a Rdn instance
*
* We read back the data to create a new RDB. The structure
- * read is exposed in the {@link RDN#writeExternal(ObjectOutput)}
+ * read is exposed in the {@link Rdn#writeExternal(ObjectOutput)}
* method<p>
*
- * @param in The input stream from which the RDN is read
- * @return a deserialized RDN
+ * @param in The input stream from which the Rdn is read
+ * @return a deserialized Rdn
* @throws IOException If the stream can't be read
*/
- public static RDN deserialize( ObjectInput in ) throws IOException
+ public static Rdn deserialize( ObjectInput in ) throws IOException
{
// Read the ATAV number
int nbAtavs = in.readInt();
@@ -124,12 +124,12 @@ public final class RdnSerializer
normName = upName;
}
- // Read the RDN's position and length
+ // Read the Rdn's position and length
int start = in.readInt();
int length = in.readInt();
- // Now creates the RDN
- RDN rdn = new RDN( length, start, upName, normName );
+ // Now creates the Rdn
+ Rdn rdn = new Rdn( length, start, upName, normName );
// Read through the Atavs
switch ( nbAtavs )
@@ -138,7 +138,7 @@ public final class RdnSerializer
return rdn;
case 1 :
- AVA atav = AVASerializer.deserialize( in );
+ Ava atav = AvaSerializer.deserialize(in);
rdn.addAVA( atav );
@@ -147,7 +147,7 @@ public final class RdnSerializer
default :
for ( int i = 0; i < nbAtavs; i++ )
{
- atav = AVASerializer.deserialize( in );
+ atav = AvaSerializer.deserialize(in);
rdn.addAVA( atav );
}
Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/NameForm.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/NameForm.java?rev=1062306&r1=1062305&r2=1062306&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/NameForm.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/NameForm.java Sun Jan 23 01:17:06 2011
@@ -34,7 +34,7 @@ import org.apache.directory.shared.ldap.
* A nameForm description. NameForms define the relationship between a
* STRUCTURAL objectClass definition and the attributeTypes allowed to be used
* for the naming of an Entry of that objectClass: it defines which attributes
- * can be used for the RDN.
+ * can be used for the Rdn.
* <p>
* According to ldapbis [MODELS]:
* </p>
@@ -42,10 +42,10 @@ import org.apache.directory.shared.ldap.
* <pre>
* 4.1.7.2. Name Forms
*
- * A name form "specifies a permissible RDN for entries of a particular
+ * A name form "specifies a permissible Rdn for entries of a particular
* structural object class. A name form identifies a named object
* class and one or more attribute types to be used for naming (i.e.
- * for the RDN). Name forms are primitive pieces of specification
+ * for the Rdn). Name forms are primitive pieces of specification
* used in the definition of DIT structure rules" [X.501].
*
* Each name form indicates the structural object class to be named,
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=1062306&r1=1062305&r2=1062306&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 Sun Jan 23 01:17:06 2011
@@ -24,7 +24,7 @@ import java.util.Map;
import java.util.Set;
import org.apache.directory.shared.ldap.entry.Entry;
-import org.apache.directory.shared.ldap.name.DN;
+import org.apache.directory.shared.ldap.name.Dn;
import org.apache.directory.shared.ldap.schema.registries.Schema;
@@ -78,7 +78,7 @@ public interface SchemaDao
String findSchema( String entityName ) throws Exception;
- DN 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=1062306&r1=1062305&r2=1062306&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 Sun Jan 23 01:17:06 2011
@@ -25,7 +25,7 @@ import java.util.Map;
import java.util.Set;
import org.apache.directory.shared.ldap.exception.LdapException;
-import org.apache.directory.shared.ldap.name.DN;
+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;
@@ -634,7 +634,7 @@ public interface SchemaManager
/**
* @return the namingContext
*/
- DN getNamingContext();
+ Dn getNamingContext();
/**
Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/SchemaObjectType.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/SchemaObjectType.java?rev=1062306&r1=1062305&r2=1062306&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/SchemaObjectType.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/SchemaObjectType.java Sun Jan 23 01:17:06 2011
@@ -61,9 +61,9 @@ public enum SchemaObjectType
/**
- * Get the RDN associated with a schemaObjectType
+ * Get the Rdn associated with a schemaObjectType
*
- * @return The associated RDN
+ * @return The associated Rdn
*/
public String getRdn()
{
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=1062306&r1=1062305&r2=1062306&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 Sun Jan 23 01:17:06 2011
@@ -24,7 +24,7 @@ import org.apache.directory.shared.ldap.
import org.apache.directory.shared.ldap.exception.LdapInvalidDnException;
import org.apache.directory.shared.i18n.I18n;
-import org.apache.directory.shared.ldap.name.DN;
+import org.apache.directory.shared.ldap.name.Dn;
import org.apache.directory.shared.ldap.schema.LdapComparator;
import org.apache.directory.shared.ldap.schema.SchemaManager;
@@ -50,8 +50,8 @@ public class DnComparator extends LdapCo
*/
public int compare( Object obj0, Object obj1 )
{
- DN dn0 = null;
- DN dn1 = null;
+ Dn dn0 = null;
+ Dn dn1 = null;
try
{
@@ -68,19 +68,19 @@ public class DnComparator extends LdapCo
}
- public DN getDn( Object obj ) throws LdapInvalidDnException
+ public Dn getDn( Object obj ) throws LdapInvalidDnException
{
- DN dn = null;
+ Dn dn = null;
- if ( obj instanceof DN )
+ if ( obj instanceof Dn)
{
- dn = (DN)obj;
+ dn = (Dn)obj;
- dn = ( dn.isNormalized() ? dn : DN.normalize( dn, schemaManager.getNormalizerMapping() ) );
+ dn = ( dn.isNormalized() ? dn : Dn.normalize(dn, schemaManager.getNormalizerMapping()) );
}
else if ( obj instanceof String )
{
- dn = new DN( ( String ) obj, schemaManager );
+ dn = new Dn( ( String ) obj, schemaManager );
}
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=1062306&r1=1062305&r2=1062306&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 Sun Jan 23 01:17:06 2011
@@ -23,7 +23,7 @@ package org.apache.directory.shared.ldap
import org.apache.directory.shared.i18n.I18n;
import org.apache.directory.shared.ldap.exception.LdapException;
import org.apache.directory.shared.ldap.exception.LdapInvalidDnException;
-import org.apache.directory.shared.ldap.name.DN;
+import org.apache.directory.shared.ldap.name.Dn;
import org.apache.directory.shared.ldap.schema.LdapComparator;
import org.apache.directory.shared.ldap.schema.SchemaManager;
@@ -91,8 +91,8 @@ public class UniqueMemberComparator exte
return 1;
}
- DN dn0 = null;
- DN dn1 = null;
+ Dn dn0 = null;
+ Dn dn1 = null;
// This is an UID if the '#' is immediatly
// followed by a BitString, except if the '#' is
@@ -103,7 +103,7 @@ public class UniqueMemberComparator exte
{
try
{
- dn0 = new DN( dnstr0.substring( 0, dash0 ) );
+ dn0 = new Dn( dnstr0.substring( 0, dash0 ) );
}
catch ( LdapException ne )
{
@@ -124,7 +124,7 @@ public class UniqueMemberComparator exte
{
try
{
- dn1 = new DN( dnstr0.substring( 0, dash1 ) );
+ dn1 = new Dn( dnstr0.substring( 0, dash1 ) );
}
catch ( LdapException ne )
{
@@ -157,19 +157,19 @@ public class UniqueMemberComparator exte
}
- public DN getDn( Object obj ) throws LdapInvalidDnException
+ public Dn getDn( Object obj ) throws LdapInvalidDnException
{
- DN dn = null;
+ Dn dn = null;
- if ( obj instanceof DN )
+ if ( obj instanceof Dn)
{
- dn = ( DN ) obj;
+ dn = (Dn) obj;
- dn = ( dn.isNormalized() ? dn : DN.normalize( dn, schemaManager.getNormalizerMapping() ) );
+ dn = ( dn.isNormalized() ? dn : Dn.normalize(dn, schemaManager.getNormalizerMapping()) );
}
else if ( obj instanceof String )
{
- dn = new DN( ( String ) obj, schemaManager );
+ dn = new Dn( ( String ) obj, schemaManager );
}
else
{
Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/normalizers/ConcreteNameComponentNormalizer.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/normalizers/ConcreteNameComponentNormalizer.java?rev=1062306&r1=1062305&r2=1062306&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/normalizers/ConcreteNameComponentNormalizer.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/normalizers/ConcreteNameComponentNormalizer.java Sun Jan 23 01:17:06 2011
@@ -36,7 +36,7 @@ import org.slf4j.LoggerFactory;
/**
- * A DN Name component Normalizer which uses the bootstrap registries to find
+ * A Dn Name component Normalizer which uses the bootstrap registries to find
* the appropriate normalizer for the attribute of the name component with which
* to normalize the name component value.
*
@@ -52,7 +52,7 @@ public class ConcreteNameComponentNormal
/**
- * Creates a DN Name component Normalizer which uses the bootstrap
+ * Creates a Dn Name component Normalizer which uses the bootstrap
* registries to find the appropriate normalizer for the attribute of the
* name component with which to normalize the name component value.
*
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=1062306&r1=1062305&r2=1062306&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 Sun Jan 23 01:17:06 2011
@@ -24,13 +24,13 @@ import org.apache.directory.shared.ldap.
import org.apache.directory.shared.ldap.entry.StringValue;
import org.apache.directory.shared.ldap.entry.Value;
import org.apache.directory.shared.ldap.exception.LdapException;
-import org.apache.directory.shared.ldap.name.DN;
+import org.apache.directory.shared.ldap.name.Dn;
import org.apache.directory.shared.ldap.schema.Normalizer;
import org.apache.directory.shared.ldap.schema.SchemaManager;
/**
- * Normalizer a DN
+ * Normalizer a Dn
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
@@ -39,7 +39,7 @@ public class DnNormalizer extends Normal
// The serial UID
private static final long serialVersionUID = 1L;
- /** A reference to the schema manager used to normalize the DN */
+ /** A reference to the schema manager used to normalize the Dn */
private SchemaManager schemaManager;
/**
@@ -56,11 +56,11 @@ public class DnNormalizer extends Normal
*/
public Value<?> normalize( Value<?> value ) throws LdapException
{
- DN dn = null;
+ Dn dn = null;
String dnStr = value.getString();
- dn = new DN( dnStr, schemaManager );
+ dn = new Dn( dnStr, schemaManager );
return new StringValue( dn.getNormName() );
}
@@ -71,25 +71,25 @@ public class DnNormalizer extends Normal
*/
public String normalize( String value ) throws LdapException
{
- DN dn = null;
+ Dn dn = null;
- dn = new DN( value, schemaManager );
+ dn = new Dn( value, schemaManager );
return dn.getNormName();
}
/**
- * Normalize a DN
- * @param value The DN to normalize
- * @return A normalized DN
+ * Normalize a Dn
+ * @param value The Dn to normalize
+ * @return A normalized Dn
* @throws LdapException
*/
- public String normalize( DN value ) throws LdapException
+ public String normalize( Dn value ) throws LdapException
{
- DN dn = null;
+ Dn dn = null;
- dn = new DN( value, schemaManager );
+ dn = new Dn( value, schemaManager );
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=1062306&r1=1062305&r2=1062306&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 Sun Jan 23 01:17:06 2011
@@ -25,7 +25,7 @@ import org.apache.directory.shared.ldap.
import org.apache.directory.shared.ldap.entry.StringValue;
import org.apache.directory.shared.ldap.entry.Value;
import org.apache.directory.shared.ldap.exception.LdapException;
-import org.apache.directory.shared.ldap.name.DN;
+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.util.Strings;
@@ -41,7 +41,7 @@ public class UniqueMemberNormalizer exte
// The serial UID
private static final long serialVersionUID = 1L;
- /** A reference to the schema manager used to normalize the DN */
+ /** A reference to the schema manager used to normalize the Dn */
private SchemaManager schemaManager;
@@ -80,7 +80,7 @@ public class UniqueMemberNormalizer exte
if ( sharpPos > 0 )
{
- DN dn = new DN( nameAndUid.substring( 0, sharpPos ), schemaManager );
+ Dn dn = new Dn( nameAndUid.substring( 0, sharpPos ), schemaManager );
return new StringValue( dn.getNormName() + '#' + uid );
}
@@ -91,9 +91,9 @@ public class UniqueMemberNormalizer exte
}
else
{
- // No UID, the strValue is a DN
- // Return the normalized DN
- return new StringValue( new DN( nameAndUid ).getNormName() );
+ // No UID, the strValue is a Dn
+ // Return the normalized Dn
+ return new StringValue( new Dn( nameAndUid ).getNormName() );
}
}
@@ -125,7 +125,7 @@ public class UniqueMemberNormalizer exte
if ( sharpPos > 0 )
{
- DN dn = new DN( value.substring( 0, sharpPos ), schemaManager );
+ Dn dn = new Dn( value.substring( 0, sharpPos ), schemaManager );
return dn.getNormName() + '#' + uid;
}
@@ -136,9 +136,9 @@ public class UniqueMemberNormalizer exte
}
else
{
- // No UID, the strValue is a DN
- // Return the normalized DN
- return new DN( value, schemaManager ).getNormName();
+ // No UID, the strValue is a Dn
+ // Return the normalized Dn
+ return new Dn( value, schemaManager ).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=1062306&r1=1062305&r2=1062306&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 Sun Jan 23 01:17:06 2011
@@ -21,7 +21,7 @@ package org.apache.directory.shared.ldap
import org.apache.directory.shared.ldap.constants.SchemaConstants;
-import org.apache.directory.shared.ldap.name.DN;
+import org.apache.directory.shared.ldap.name.Dn;
import org.apache.directory.shared.ldap.schema.SyntaxChecker;
import org.apache.directory.shared.util.Strings;
import org.slf4j.Logger;
@@ -29,8 +29,8 @@ import org.slf4j.LoggerFactory;
/**
- * A SyntaxChecker which verifies that a value is a valid DN. We just check
- * that the DN is valid, we don't need to verify each of the RDN syntax.
+ * A SyntaxChecker which verifies that a value is a valid Dn. We just check
+ * that the Dn is valid, we don't need to verify each of the Rdn syntax.
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
@@ -86,8 +86,8 @@ public class DNSyntaxChecker extends Syn
return true;
}
- // Check that the value is a valid DN
- boolean result = DN.isValid( strValue );
+ // Check that the value is a valid Dn
+ 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=1062306&r1=1062305&r2=1062306&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 Sun Jan 23 01:17:06 2011
@@ -21,7 +21,7 @@ package org.apache.directory.shared.ldap
import org.apache.directory.shared.ldap.constants.SchemaConstants;
-import org.apache.directory.shared.ldap.name.DN;
+import org.apache.directory.shared.ldap.name.Dn;
import org.apache.directory.shared.ldap.schema.SyntaxChecker;
import org.apache.directory.shared.util.Strings;
import org.slf4j.Logger;
@@ -31,13 +31,13 @@ import org.slf4j.LoggerFactory;
/**
* A SyntaxChecker which verifies that a value is a valid Name and Optional UID.
*
- * This element is a composition of two parts : a DN and an optional UID :
+ * This element is a composition of two parts : a Dn and an optional UID :
* NameAndOptionalUID = distinguishedName [ SHARP BitString ]
*
* Both part already have their syntax checkers, so we will just call them
* after having splitted the element in two ( if necessary)
*
- * We just check that the DN is valid, we don't need to verify each of the RDN
+ * We just check that the Dn is valid, we don't need to verify each of the Rdn
* syntax.
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
@@ -112,11 +112,11 @@ public class NameAndOptionalUIDSyntaxChe
if ( BitStringSyntaxChecker.isValid( strValue.substring( sharpPos + 1 ) )
&& ( sharpPos < strValue.length() ) )
{
- // Ok, we have a BitString, now check the DN,
+ // Ok, we have a BitString, now check the Dn,
// except if the '#' is in first position
if ( sharpPos > 0 )
{
- boolean result = DN.isValid( strValue.substring( 0, sharpPos ) );
+ boolean result = Dn.isValid(strValue.substring(0, sharpPos));
if ( result )
{
@@ -132,7 +132,7 @@ public class NameAndOptionalUIDSyntaxChe
}
else
{
- // The DN must not be null ?
+ // The Dn must not be null ?
LOG.debug( "Syntax invalid for '{}'", value );
return false;
}
@@ -146,9 +146,9 @@ public class NameAndOptionalUIDSyntaxChe
}
else
{
- // No UID, the strValue is a DN
- // Check that the value is a valid DN
- boolean result = DN.isValid( strValue );
+ // No UID, the strValue is a Dn
+ // Check that the value is a valid Dn
+ 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=1062306&r1=1062305&r2=1062306&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 Sun Jan 23 01:17:06 2011
@@ -24,7 +24,7 @@ import java.util.Collections;
import java.util.Set;
import org.apache.directory.shared.ldap.filter.ExprNode;
-import org.apache.directory.shared.ldap.name.DN;
+import org.apache.directory.shared.ldap.name.Dn;
/**
@@ -35,13 +35,13 @@ import org.apache.directory.shared.ldap.
public class BaseSubtreeSpecification implements SubtreeSpecification
{
/** the subtree base relative to the administration point */
- private final DN base;
+ private final Dn base;
/** the set of subordinates entries and their subordinates to exclude */
- private final Set<DN> chopBefore;
+ private final Set<Dn> chopBefore;
/** the set of subordinates entries whose subordinates are to be excluded */
- private final Set<DN> chopAfter;
+ private final Set<Dn> chopAfter;
/** the minimum distance below base to start including entries */
private final int minBaseDistance;
@@ -68,7 +68,7 @@ public class BaseSubtreeSpecification im
@SuppressWarnings("unchecked")
public BaseSubtreeSpecification()
{
- this.base = new DN();
+ this.base = new Dn();
this.minBaseDistance = 0;
this.maxBaseDistance = UNBOUNDED_MAX;
this.chopAfter = Collections.EMPTY_SET;
@@ -88,7 +88,7 @@ public class BaseSubtreeSpecification im
@SuppressWarnings("unchecked")
public BaseSubtreeSpecification( ExprNode refinement )
{
- this.base = new DN();
+ this.base = new Dn();
this.minBaseDistance = 0;
this.maxBaseDistance = UNBOUNDED_MAX;
this.chopAfter = Collections.EMPTY_SET;
@@ -105,7 +105,7 @@ public class BaseSubtreeSpecification im
* @param base the base of the subtree relative to the administrative point
*/
@SuppressWarnings("unchecked")
- public BaseSubtreeSpecification( DN base )
+ public BaseSubtreeSpecification( Dn base )
{
this.base = base;
this.minBaseDistance = 0;
@@ -128,8 +128,8 @@ public class BaseSubtreeSpecification im
* @param chopBefore the set of subordinates entries and their subordinates to
* exclude
*/
- public BaseSubtreeSpecification( DN base, int minBaseDistance, int maxBaseDistance,
- Set<DN> chopAfter, Set<DN> chopBefore )
+ public BaseSubtreeSpecification( Dn base, int minBaseDistance, int maxBaseDistance,
+ Set<Dn> chopAfter, Set<Dn> chopBefore )
{
this( base, minBaseDistance, maxBaseDistance, chopAfter, chopBefore, null );
}
@@ -138,7 +138,7 @@ public class BaseSubtreeSpecification im
/**
* 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(DN, int, int, Set, Set)}.
+ * defaults to {@link #BaseSubtreeSpecification(org.apache.directory.shared.ldap.name.Dn, int, int, Set, Set)}.
*
* @param base the base of the subtree relative to the administrative point
* @param minBaseDistance the minimum distance below base to start including entries
@@ -150,8 +150,8 @@ public class BaseSubtreeSpecification im
* @param refinement the filter expression only composed of objectClass attribute
* value assertions
*/
- public BaseSubtreeSpecification( DN base, int minBaseDistance, int maxBaseDistance,
- Set<DN> chopAfter, Set<DN> 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;
@@ -177,7 +177,7 @@ public class BaseSubtreeSpecification im
/**
* @return The base
*/
- public DN getBase()
+ public Dn getBase()
{
return this.base;
}
@@ -185,7 +185,7 @@ public class BaseSubtreeSpecification im
/**
* @return The set of ChopBefore exclusions
*/
- public Set<DN> getChopBeforeExclusions()
+ public Set<Dn> getChopBeforeExclusions()
{
return this.chopBefore;
}
@@ -194,7 +194,7 @@ public class BaseSubtreeSpecification im
/**
* @return The set of ChopAfter exclusions
*/
- public Set<DN> getChopAfterExclusions()
+ public Set<Dn> getChopAfterExclusions()
{
return this.chopAfter;
}
@@ -310,7 +310,7 @@ public class BaseSubtreeSpecification im
if ( chopBefore != null )
{
- for ( DN exclusion : chopBefore )
+ for ( Dn exclusion : chopBefore )
{
if ( isFirstExclusion )
{
@@ -329,7 +329,7 @@ public class BaseSubtreeSpecification im
if ( chopAfter != null )
{
- for ( DN exclusion : chopAfter )
+ for ( Dn exclusion : chopAfter )
{
if ( isFirstExclusion )
{
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=1062306&r1=1062305&r2=1062306&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 Sun Jan 23 01:17:06 2011
@@ -23,7 +23,7 @@ package org.apache.directory.shared.ldap
import java.util.Set;
import org.apache.directory.shared.ldap.filter.ExprNode;
-import org.apache.directory.shared.ldap.name.DN;
+import org.apache.directory.shared.ldap.name.Dn;
/**
@@ -39,18 +39,18 @@ public interface SubtreeSpecification
/**
- * Gets an RDN relative to the administrative context where the subtree
+ * Gets an Rdn relative to the administrative context where the subtree
* scope begins. All subentries containing these specifications are
* immediate subordinates to the administrative point, and are considered to
* be part of the same naming context. Hence the base for the subtree
* specification of a subentry immediately subordinate to dc=apache,dc=org
* would be relative to the dc=apache,dc=org context.
*
- * @return the RDN representing the base of the subtree, or the empty name
+ * @return the Rdn representing the base of the subtree, or the empty name
* if the base is the administrative point - note that this Name is
* not Normalized according to matchingRules.
*/
- DN getBase();
+ Dn getBase();
/**
@@ -62,7 +62,7 @@ public interface SubtreeSpecification
* @return a set of relative {@link javax.naming.Name}s to the subtree base
* or the empty set
*/
- Set<DN> getChopBeforeExclusions();
+ Set<Dn> getChopBeforeExclusions();
/**
@@ -74,16 +74,16 @@ public interface SubtreeSpecification
* @return a set of relative {@link javax.naming.Name}s to the subtree base
* or the empty set
*/
- Set<DN> getChopAfterExclusions();
+ Set<Dn> getChopAfterExclusions();
/**
* Gets the distance at which to start including entries in the subtree. All
- * entries whose RDN arcs relative to the base are less than the minimum are
+ * entries whose Rdn arcs relative to the base are less than the minimum are
* excluded from the subtree or subtree refinement. The default is zero and
* therefore excludes nothing.
*
- * @return the minimum number of RDN arcs relative to base for inclusion
+ * @return the minimum number of Rdn arcs relative to base for inclusion
*/
int getMinBaseDistance();
@@ -91,9 +91,9 @@ public interface SubtreeSpecification
/**
* Gets the distance after which to start excluding entries in the subtree
* or subtree refinement. RFC 3672 Section 2.1.3 states: "Entries that are
- * more than the maximum number of RDN arcs below the base entry are
+ * more than the maximum number of Rdn arcs below the base entry are
* excluded from the subtree or subtree refinement. An absent maximum
- * component indicates that there is no upper limit on the number of RDN
+ * component indicates that there is no upper limit on the number of Rdn
* arcs below the base entry for entries in the subtree or subtree
* refinement." If the maximum is limitless a negative value should be used
* to represent the maximum distance - which makes no sense other than to
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=1062306&r1=1062305&r2=1062306&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 Sun Jan 23 01:17:06 2011
@@ -25,7 +25,7 @@ import java.util.Set;
import org.apache.directory.shared.i18n.I18n;
import org.apache.directory.shared.ldap.filter.ExprNode;
-import org.apache.directory.shared.ldap.name.DN;
+import org.apache.directory.shared.ldap.name.Dn;
/**
@@ -38,13 +38,13 @@ import org.apache.directory.shared.ldap.
public class SubtreeSpecificationModifier
{
/** the subtree base relative to the administration point */
- private DN base = new DN();
+ private Dn base = new Dn();
/** the set of subordinates entries and their subordinates to exclude */
- private Set<DN> chopBefore = Collections.emptySet();
+ private Set<Dn> chopBefore = Collections.emptySet();
/** the set of subordinates entries whose subordinates are to be excluded */
- private Set<DN> chopAfter = Collections.emptySet();
+ private Set<Dn> chopAfter = Collections.emptySet();
/** the minimum distance below base to start including entries */
private int minBaseDistance = 0;
@@ -87,7 +87,7 @@ public class SubtreeSpecificationModifie
* @param base
* subtree base relative to the administration point
*/
- public void setBase( DN base )
+ public void setBase( Dn base )
{
this.base = base;
}
@@ -100,7 +100,7 @@ public class SubtreeSpecificationModifie
* the set of subordinates entries and their subordinates to
* exclude
*/
- public void setChopBeforeExclusions( Set<DN> chopBeforeExclusions )
+ public void setChopBeforeExclusions( Set<Dn> chopBeforeExclusions )
{
this.chopBefore = chopBeforeExclusions;
}
@@ -114,7 +114,7 @@ public class SubtreeSpecificationModifie
* the set of subordinates entries whose subordinates are to be
* excluded
*/
- public void setChopAfterExclusions( Set<DN> chopAfterExclusions )
+ public void setChopAfterExclusions( Set<Dn> chopAfterExclusions )
{
this.chopAfter = chopAfterExclusions;
}
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=1062306&r1=1062305&r2=1062306&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 Sun Jan 23 01:17:06 2011
@@ -20,7 +20,7 @@
package org.apache.directory.shared.ldap.trigger;
-import org.apache.directory.shared.ldap.name.DN;
+import org.apache.directory.shared.ldap.name.Dn;
/**
@@ -33,20 +33,20 @@ public abstract class StoredProcedurePar
{
public static final class Generic_LDAP_CONTEXT extends StoredProcedureParameter
{
- private DN ctxName;
+ private Dn ctxName;
- private Generic_LDAP_CONTEXT( DN ctxName )
+ private Generic_LDAP_CONTEXT( Dn ctxName )
{
super( "$ldapContext" );
this.ctxName = ctxName;
}
- public static StoredProcedureParameter instance( DN ctxName )
+ public static StoredProcedureParameter instance( Dn ctxName )
{
return new Generic_LDAP_CONTEXT( ctxName );
}
- public DN getCtxName()
+ public Dn getCtxName()
{
return ctxName;
}
Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/trigger/StoredProcedureSearchContextOption.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/trigger/StoredProcedureSearchContextOption.java?rev=1062306&r1=1062305&r2=1062306&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/trigger/StoredProcedureSearchContextOption.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/trigger/StoredProcedureSearchContextOption.java Sun Jan 23 01:17:06 2011
@@ -22,7 +22,7 @@ package org.apache.directory.shared.ldap
import org.apache.directory.shared.ldap.filter.SearchScope;
-import org.apache.directory.shared.ldap.name.DN;
+import org.apache.directory.shared.ldap.name.Dn;
/**
@@ -33,7 +33,7 @@ import org.apache.directory.shared.ldap.
public class StoredProcedureSearchContextOption implements StoredProcedureOption
{
- private final DN baseObject;
+ private final Dn baseObject;
private SearchScope searchScope;
@@ -42,7 +42,7 @@ public class StoredProcedureSearchContex
*
* @param baseObject the base object
*/
- public StoredProcedureSearchContextOption( DN baseObject )
+ public StoredProcedureSearchContextOption( Dn baseObject )
{
// the default search scope is "base"
this( baseObject, SearchScope.OBJECT );
@@ -55,7 +55,7 @@ public class StoredProcedureSearchContex
* @param baseObject the base object
* @param searchScope the search scope
*/
- public StoredProcedureSearchContextOption( DN baseObject, SearchScope searchScope )
+ public StoredProcedureSearchContextOption( Dn baseObject, SearchScope searchScope )
{
this.baseObject = baseObject;
this.searchScope = searchScope;
@@ -67,7 +67,7 @@ public class StoredProcedureSearchContex
*
* @return the base object
*/
- public DN getBaseObject()
+ public Dn getBaseObject()
{
return baseObject;
}
Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/util/JndiUtils.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/util/JndiUtils.java?rev=1062306&r1=1062305&r2=1062306&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/util/JndiUtils.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/util/JndiUtils.java Sun Jan 23 01:17:06 2011
@@ -82,7 +82,7 @@ import org.apache.directory.shared.ldap.
import org.apache.directory.shared.ldap.message.MessageException;
import org.apache.directory.shared.ldap.message.ResultResponse;
import org.apache.directory.shared.ldap.message.control.Control;
-import org.apache.directory.shared.ldap.name.DN;
+import org.apache.directory.shared.ldap.name.Dn;
/**
@@ -637,12 +637,12 @@ public final class JndiUtils
/**
- * Convert a DN to a {@link javax.naming.Name}
+ * Convert a Dn to a {@link javax.naming.Name}
*
- * @param name The DN to convert
+ * @param name The Dn to convert
* @return A Name
*/
- public static Name toName( DN dn )
+ public static Name toName( Dn dn )
{
try
{
@@ -653,23 +653,23 @@ public final class JndiUtils
catch ( InvalidNameException ine )
{
// TODO : check if we must throw an exception.
- // Logically, the DN must be valid.
+ // Logically, the Dn must be valid.
return null;
}
}
/**
- * Convert a {@link javax.naming.Name} to a DN
+ * Convert a {@link javax.naming.Name} to a Dn
*
* @param name The Name to convert
- * @return A DN
+ * @return A Dn
*/
- public static DN fromName( Name name )
+ public static Dn fromName( Name name )
{
try
{
- DN dn = new DN( name.toString() );
+ Dn dn = new Dn( name.toString() );
return dn;
}