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 [2/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/sr...
Modified: directory/apacheds-manuals/trunk/src/advanced-user-guide/chapter-embedding-apacheds.xml
URL: http://svn.apache.org/viewvc/directory/apacheds-manuals/trunk/src/advanced-user-guide/chapter-embedding-apacheds.xml?rev=1062306&r1=1062305&r2=1062306&view=diff
==============================================================================
--- directory/apacheds-manuals/trunk/src/advanced-user-guide/chapter-embedding-apacheds.xml (original)
+++ directory/apacheds-manuals/trunk/src/advanced-user-guide/chapter-embedding-apacheds.xml Sun Jan 23 01:17:06 2011
@@ -698,7 +698,7 @@ Tests run: 1, Failures: 0, Errors: 0, Sk
/**
* Creates a JNDI LdapContext with a connection over the wire using the
* SUN LDAP provider. The connection is made using the administrative
- * user as the principalDN. The context is to the rootDSE.
+ * user as the principalDn. The context is to the rootDSE.
*
* @param ldapServer the LDAP server to get the connection to
* @return an LdapContext as the administrative user to the RootDSE
@@ -709,7 +709,7 @@ public static LdapContext getWiredContex
/**
* Creates a JNDI LdapContext with a connection over the wire using the
* SUN LDAP provider. The connection is made using the administrative
- * user as the principalDN. The context is to the rootDSE.
+ * user as the principalDn. The context is to the rootDSE.
*
* @param ldapServer the LDAP server to get the connection to
* @return an LdapContext as the administrative user to the RootDSE
@@ -720,7 +720,7 @@ public static LdapContext getWiredContex
/**
* Creates a JNDI LdapContext with a connection over the wire using the
* SUN LDAP provider. The connection is made using the administrative
- * user as the principalDN. The context is to the rootDSE.
+ * user as the principalDn. The context is to the rootDSE.
*
* @param ldapServer the LDAP server to get the connection to
* @return an LdapContext as the administrative user to the RootDSE
Modified: directory/apacheds-manuals/trunk/src/basic-user-guide/chapter-basic-security.xml
URL: http://svn.apache.org/viewvc/directory/apacheds-manuals/trunk/src/basic-user-guide/chapter-basic-security.xml?rev=1062306&r1=1062305&r2=1062306&view=diff
==============================================================================
--- directory/apacheds-manuals/trunk/src/basic-user-guide/chapter-basic-security.xml (original)
+++ directory/apacheds-manuals/trunk/src/basic-user-guide/chapter-basic-security.xml Sun Jan 23 01:17:06 2011
@@ -153,7 +153,7 @@ public class SimpleBindDemo {
public static void main(String[] args) throws NamingException {
if (args.length < 2) {
- System.err.println("Usage: java SimpleBindDemo <userDN> <password>");
+ System.err.println("Usage: java SimpleBindDemo <userDn> <password>");
System.exit(1);
}
Modified: directory/apacheds/trunk/core-annotations/src/main/java/org/apache/directory/server/core/factory/AvlPartitionFactory.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-annotations/src/main/java/org/apache/directory/server/core/factory/AvlPartitionFactory.java?rev=1062306&r1=1062305&r2=1062306&view=diff
==============================================================================
--- directory/apacheds/trunk/core-annotations/src/main/java/org/apache/directory/server/core/factory/AvlPartitionFactory.java (original)
+++ directory/apacheds/trunk/core-annotations/src/main/java/org/apache/directory/server/core/factory/AvlPartitionFactory.java Sun Jan 23 01:17:06 2011
@@ -27,7 +27,7 @@ import org.apache.directory.server.core.
import org.apache.directory.server.xdbm.Index;
import org.apache.directory.server.xdbm.impl.avl.AvlIndex;
import org.apache.directory.shared.ldap.entry.Entry;
-import org.apache.directory.shared.ldap.name.DN;
+import org.apache.directory.shared.ldap.name.Dn;
/**
@@ -46,7 +46,7 @@ public class AvlPartitionFactory impleme
{
AvlPartition partition = new AvlPartition();
partition.setId( id );
- partition.setSuffix( new DN( suffix ) );
+ partition.setSuffix( new Dn( suffix ) );
partition.setCacheSize( 500 );
partition.setPartitionPath( workingDirectory.toURI() );
return partition;
Modified: directory/apacheds/trunk/core-annotations/src/main/java/org/apache/directory/server/core/factory/DSAnnotationProcessor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-annotations/src/main/java/org/apache/directory/server/core/factory/DSAnnotationProcessor.java?rev=1062306&r1=1062305&r2=1062306&view=diff
==============================================================================
--- directory/apacheds/trunk/core-annotations/src/main/java/org/apache/directory/server/core/factory/DSAnnotationProcessor.java (original)
+++ directory/apacheds/trunk/core-annotations/src/main/java/org/apache/directory/server/core/factory/DSAnnotationProcessor.java Sun Jan 23 01:17:06 2011
@@ -47,7 +47,7 @@ import org.apache.directory.shared.ldap.
import org.apache.directory.shared.ldap.exception.LdapException;
import org.apache.directory.shared.ldap.ldif.LdifEntry;
import org.apache.directory.shared.ldap.ldif.LdifReader;
-import org.apache.directory.shared.ldap.name.DN;
+import org.apache.directory.shared.ldap.name.Dn;
import org.junit.runner.Description;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -158,7 +158,7 @@ public class DSAnnotationProcessor
// that type.
partition = createPartition.type().newInstance();
partition.setId( createPartition.name() );
- partition.setSuffix( new DN( createPartition.suffix() ) );
+ partition.setSuffix( new Dn( createPartition.suffix() ) );
if ( partition instanceof BTreePartition<?> )
{
@@ -349,7 +349,7 @@ public class DSAnnotationProcessor
/**
- * Inject an ldif String into the server. DN must be relative to the root.
+ * Inject an ldif String into the server. Dn must be relative to the root.
*
* @param service
* the directory service to use
@@ -412,7 +412,7 @@ public class DSAnnotationProcessor
{
sb.append( s ).append( '\n' );
- // read the rest of lines till we encounter DN again
+ // read the rest of lines till we encounter Dn again
while ( i < ldifs.length )
{
s = ldifs[i++];
Modified: directory/apacheds/trunk/core-annotations/src/main/java/org/apache/directory/server/core/factory/DefaultDirectoryServiceFactory.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-annotations/src/main/java/org/apache/directory/server/core/factory/DefaultDirectoryServiceFactory.java?rev=1062306&r1=1062305&r2=1062306&view=diff
==============================================================================
--- directory/apacheds/trunk/core-annotations/src/main/java/org/apache/directory/server/core/factory/DefaultDirectoryServiceFactory.java (original)
+++ directory/apacheds/trunk/core-annotations/src/main/java/org/apache/directory/server/core/factory/DefaultDirectoryServiceFactory.java Sun Jan 23 01:17:06 2011
@@ -182,7 +182,7 @@ public class DefaultDirectoryServiceFact
// We have to load the schema now, otherwise we won't be able
// to initialize the Partitions, as we won't be able to parse
- // and normalize their suffix DN
+ // and normalize their suffix Dn
schemaManager.loadAllEnabled();
schemaPartition.setSchemaManager( schemaManager );
Modified: directory/apacheds/trunk/core-annotations/src/main/java/org/apache/directory/server/core/factory/JdbmPartitionFactory.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-annotations/src/main/java/org/apache/directory/server/core/factory/JdbmPartitionFactory.java?rev=1062306&r1=1062305&r2=1062306&view=diff
==============================================================================
--- directory/apacheds/trunk/core-annotations/src/main/java/org/apache/directory/server/core/factory/JdbmPartitionFactory.java (original)
+++ directory/apacheds/trunk/core-annotations/src/main/java/org/apache/directory/server/core/factory/JdbmPartitionFactory.java Sun Jan 23 01:17:06 2011
@@ -27,7 +27,7 @@ import org.apache.directory.server.core.
import org.apache.directory.server.core.partition.impl.btree.jdbm.JdbmPartition;
import org.apache.directory.server.xdbm.Index;
import org.apache.directory.shared.ldap.entry.Entry;
-import org.apache.directory.shared.ldap.name.DN;
+import org.apache.directory.shared.ldap.name.Dn;
/**
@@ -46,7 +46,7 @@ public class JdbmPartitionFactory implem
{
JdbmPartition partition = new JdbmPartition();
partition.setId( id );
- partition.setSuffix( new DN( suffix ) );
+ partition.setSuffix( new Dn( suffix ) );
partition.setCacheSize( 500 );
partition.setPartitionPath( workingDirectory.toURI() );
return partition;
Modified: directory/apacheds/trunk/core-annotations/src/main/java/org/apache/directory/server/core/factory/LdifPartitionFactory.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-annotations/src/main/java/org/apache/directory/server/core/factory/LdifPartitionFactory.java?rev=1062306&r1=1062305&r2=1062306&view=diff
==============================================================================
--- directory/apacheds/trunk/core-annotations/src/main/java/org/apache/directory/server/core/factory/LdifPartitionFactory.java (original)
+++ directory/apacheds/trunk/core-annotations/src/main/java/org/apache/directory/server/core/factory/LdifPartitionFactory.java Sun Jan 23 01:17:06 2011
@@ -27,7 +27,7 @@ import org.apache.directory.server.core.
import org.apache.directory.server.xdbm.Index;
import org.apache.directory.server.xdbm.impl.avl.AvlIndex;
import org.apache.directory.shared.ldap.entry.Entry;
-import org.apache.directory.shared.ldap.name.DN;
+import org.apache.directory.shared.ldap.name.Dn;
/**
@@ -46,7 +46,7 @@ public class LdifPartitionFactory implem
{
LdifPartition partition = new LdifPartition();
partition.setId( id );
- partition.setSuffix( new DN( suffix ) );
+ partition.setSuffix( new Dn( suffix ) );
partition.setCacheSize( 500 );
partition.setPartitionPath( workingDirectory.toURI() );
return partition;
Modified: directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/CoreSession.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/CoreSession.java?rev=1062306&r1=1062305&r2=1062306&view=diff
==============================================================================
--- directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/CoreSession.java (original)
+++ directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/CoreSession.java Sun Jan 23 01:17:06 2011
@@ -43,8 +43,8 @@ import org.apache.directory.shared.ldap.
import org.apache.directory.shared.ldap.message.SearchRequest;
import org.apache.directory.shared.ldap.message.UnbindRequest;
import org.apache.directory.shared.ldap.message.control.Control;
-import org.apache.directory.shared.ldap.name.DN;
-import org.apache.directory.shared.ldap.name.RDN;
+import org.apache.directory.shared.ldap.name.Dn;
+import org.apache.directory.shared.ldap.name.Rdn;
import org.apache.directory.shared.ldap.schema.AttributeTypeOptions;
@@ -272,7 +272,7 @@ public interface CoreSession
* @param value the value to check for
* @throws Exception if there are failures while comparing
*/
- boolean compare( DN dn, String oid, Object value ) throws LdapException;
+ boolean compare( Dn dn, String oid, Object value ) throws LdapException;
/**
@@ -286,7 +286,7 @@ public interface CoreSession
* @param ignoreReferral a flag to tell the server to ignore referrals
* @throws Exception if there are failures while comparing
*/
- boolean compare( DN dn, String oid, Object value, boolean ignoreReferral ) throws LdapException;
+ boolean compare( Dn dn, String oid, Object value, boolean ignoreReferral ) throws LdapException;
/**
@@ -304,7 +304,7 @@ public interface CoreSession
* @param dn the distinguished name of the entry to delete
* @throws Exception if there are failures while deleting the entry
*/
- void delete( DN dn ) throws LdapException;
+ void delete( Dn dn ) throws LdapException;
/**
@@ -314,7 +314,7 @@ public interface CoreSession
* @param log a flag set if the added entry should be stored in the changeLog
* @throws Exception if there are failures while deleting the entry
*/
- void delete( DN dn, LogChange log ) throws LdapException;
+ void delete( Dn dn, LogChange log ) throws LdapException;
void delete( DeleteRequest deleteRequest ) throws LdapException;
@@ -332,7 +332,7 @@ public interface CoreSession
* @param ignoreReferral a flag to tell the server to ignore referrals
* @throws Exception if there are failures while deleting the entry
*/
- void delete( DN dn, boolean ignoreReferral ) throws LdapException;
+ void delete( Dn dn, boolean ignoreReferral ) throws LdapException;
/**
@@ -345,13 +345,13 @@ public interface CoreSession
* @param log a flag set if the added entry should be stored in the changeLog
* @throws Exception if there are failures while deleting the entry
*/
- void delete( DN dn, boolean ignoreReferral, LogChange log ) throws LdapException;
+ void delete( Dn dn, boolean ignoreReferral, LogChange log ) throws LdapException;
/**
* Checks to see if an entry exists.
*/
- boolean exists( DN dn ) throws LdapException;
+ boolean exists( Dn dn ) throws LdapException;
/**
@@ -361,7 +361,7 @@ public interface CoreSession
* @param dn the name of the entry to lookup
* @throws Exception if there are failures while looking up the entry
*/
- Entry lookup( DN dn ) throws LdapException;
+ Entry lookup( Dn dn ) throws LdapException;
/**
@@ -372,7 +372,7 @@ public interface CoreSession
* @param atIds The list of attributes to return
* @throws Exception if there are failures while looking up the entry
*/
- Entry lookup( DN dn, String... atIds ) throws LdapException;
+ Entry lookup( Dn dn, String... atIds ) throws LdapException;
/**
@@ -384,7 +384,7 @@ public interface CoreSession
* @param atIds The list of attributes to return
* @throws Exception if there are failures while looking up the entry
*/
- Entry lookup( DN dn, Control[] controls, String... atIds ) throws LdapException;
+ Entry lookup( Dn dn, Control[] controls, String... atIds ) throws LdapException;
/**
@@ -395,7 +395,7 @@ public interface CoreSession
* @param mods the list of modifications to apply
* @throws Exception if there are failures while modifying the entry
*/
- void modify( DN dn, List<Modification> mods ) throws LdapException;
+ void modify( Dn dn, List<Modification> mods ) throws LdapException;
/**
@@ -407,7 +407,7 @@ public interface CoreSession
* @param log a flag set if the added entry should be stored in the changeLog
* @throws Exception if there are failures while modifying the entry
*/
- void modify( DN dn, List<Modification> mods, LogChange log ) throws LdapException;
+ void modify( Dn dn, List<Modification> mods, LogChange log ) throws LdapException;
/**
@@ -421,7 +421,7 @@ public interface CoreSession
* @param mods the list of modifications to apply
* @throws Exception if there are failures while modifying the entry
*/
- void modify( DN dn, List<Modification> mods, boolean ignoreReferral ) throws LdapException;
+ void modify( Dn dn, List<Modification> mods, boolean ignoreReferral ) throws LdapException;
/**
@@ -436,7 +436,7 @@ public interface CoreSession
* @param log a flag set if the added entry should be stored in the changeLog
* @throws Exception if there are failures while modifying the entry
*/
- void modify( DN dn, List<Modification> mods, boolean ignoreReferral, LogChange log ) throws LdapException;
+ void modify( Dn dn, List<Modification> mods, boolean ignoreReferral, LogChange log ) throws LdapException;
void modify( ModifyRequest modifyRequest ) throws LdapException;
@@ -453,7 +453,7 @@ public interface CoreSession
* @param newParent the new parent under which the entry/branch is moved
* @exception if there are failures while moving the entry/branch
*/
- void move( DN dn, DN newParent ) throws LdapException;
+ void move( Dn dn, Dn newParent ) throws LdapException;
/**
@@ -465,7 +465,7 @@ public interface CoreSession
* @param log a flag set if the added entry should be stored in the changeLog
* @exception if there are failures while moving the entry/branch
*/
- void move( DN dn, DN newParent, LogChange log ) throws LdapException;
+ void move( Dn dn, Dn newParent, LogChange log ) throws LdapException;
/**
@@ -477,7 +477,7 @@ public interface CoreSession
* @param ignoreReferral a flag to tell the server to ignore referrals
* @exception if there are failures while moving the entry/branch
*/
- void move( DN dn, DN newParent, boolean ignoreReferral ) throws Exception;
+ void move( Dn dn, Dn newParent, boolean ignoreReferral ) throws Exception;
/**
@@ -490,7 +490,7 @@ public interface CoreSession
* @param log a flag set if the added entry should be stored in the changeLog
* @exception if there are failures while moving the entry/branch
*/
- void move( DN dn, DN newParent, boolean ignoreReferral, LogChange log ) throws LdapException;
+ void move( Dn dn, Dn newParent, boolean ignoreReferral, LogChange log ) throws LdapException;
/**
@@ -524,7 +524,7 @@ public interface CoreSession
* @exception if there are failures while moving and renaming the entry
* or branch
*/
- void moveAndRename( DN dn, DN newParent, RDN newRdn, boolean deleteOldRdn ) throws LdapException;
+ void moveAndRename( Dn dn, Dn newParent, Rdn newRdn, boolean deleteOldRdn ) throws LdapException;
/**
@@ -540,7 +540,7 @@ public interface CoreSession
* @exception if there are failures while moving and renaming the entry
* or branch
*/
- void moveAndRename( DN dn, DN newParent, RDN newRdn, boolean deleteOldRdn, LogChange log ) throws LdapException;
+ void moveAndRename( Dn dn, Dn newParent, Rdn newRdn, boolean deleteOldRdn, LogChange log ) throws LdapException;
/**
@@ -556,7 +556,7 @@ public interface CoreSession
* @exception if there are failures while moving and renaming the entry
* or branch
*/
- void moveAndRename( DN dn, DN newParent, RDN newRdn, boolean deleteOldRdn, boolean ignoreReferral ) throws LdapException;
+ void moveAndRename( Dn dn, Dn newParent, Rdn newRdn, boolean deleteOldRdn, boolean ignoreReferral ) throws LdapException;
/**
@@ -573,11 +573,11 @@ public interface CoreSession
* @exception if there are failures while moving and renaming the entry
* or branch
*/
- void moveAndRename( DN dn, DN newParent, RDN newRdn, boolean deleteOldRdn, boolean ignoreReferral, LogChange log ) throws LdapException;
+ void moveAndRename( Dn dn, Dn newParent, Rdn newRdn, boolean deleteOldRdn, boolean ignoreReferral, LogChange log ) throws LdapException;
/**
- * Move and rename an entry. We change the RDN and the superior.
+ * Move and rename an entry. We change the Rdn and the superior.
*
* @param modifyDnRequest The move and rename request
* @throws Exception if there are failures while moving and renaming the entry
@@ -587,7 +587,7 @@ public interface CoreSession
/**
- * Move and rename an entry. We change the RDN and the superior.
+ * Move and rename an entry. We change the Rdn and the superior.
*
* @param modifyDnRequest The move and rename request
* @param log a flag set if the added entry should be stored in the changeLog
@@ -609,7 +609,7 @@ public interface CoreSession
* distinguished name is to be deleted from the entry
* @throws Exception if there are failures while renaming the entry
*/
- void rename( DN dn, RDN newRdn, boolean deleteOldRdn ) throws LdapException;
+ void rename( Dn dn, Rdn newRdn, boolean deleteOldRdn ) throws LdapException;
/**
@@ -625,7 +625,7 @@ public interface CoreSession
* @param log a flag set if the added entry should be stored in the changeLog
* @throws Exception if there are failures while renaming the entry
*/
- void rename( DN dn, RDN newRdn, boolean deleteOldRdn, LogChange log ) throws LdapException;
+ void rename( Dn dn, Rdn newRdn, boolean deleteOldRdn, LogChange log ) throws LdapException;
/**
@@ -641,7 +641,7 @@ public interface CoreSession
* @param ignoreReferral a flag to tell the server to ignore referrals
* @throws Exception if there are failures while renaming the entry
*/
- void rename( DN dn, RDN newRdn, boolean deleteOldRdn, boolean ignoreReferral ) throws LdapException;
+ void rename( Dn dn, Rdn newRdn, boolean deleteOldRdn, boolean ignoreReferral ) throws LdapException;
/**
@@ -658,7 +658,7 @@ public interface CoreSession
* @param log a flag set if the added entry should be stored in the changeLog
* @throws Exception if there are failures while renaming the entry
*/
- void rename( DN dn, RDN newRdn, boolean deleteOldRdn, boolean ignoreReferral, LogChange log ) throws LdapException;
+ void rename( Dn dn, Rdn newRdn, boolean deleteOldRdn, boolean ignoreReferral, LogChange log ) throws LdapException;
/**
@@ -691,7 +691,7 @@ public interface CoreSession
* @param returningAttributes the attributes to return
* @throws Exception if there are failures while listing children
*/
- EntryFilteringCursor list( DN dn, AliasDerefMode aliasDerefMode,
+ EntryFilteringCursor list( Dn dn, AliasDerefMode aliasDerefMode,
Set<AttributeTypeOptions> returningAttributes ) throws LdapException;
@@ -710,7 +710,7 @@ public interface CoreSession
* terminating the search
* @throws Exception if there are failures while listing children
*/
- EntryFilteringCursor list( DN dn, AliasDerefMode aliasDerefMode,
+ EntryFilteringCursor list( Dn dn, AliasDerefMode aliasDerefMode,
Set<AttributeTypeOptions> returningAttributes, long sizeLimit, int timeLimit ) throws LdapException;
@@ -723,7 +723,7 @@ public interface CoreSession
* @param filter the search filter
* @throws Exception if there are failures while listing children
*/
- EntryFilteringCursor search( DN dn, String filter ) throws LdapException;
+ EntryFilteringCursor search( Dn dn, String filter ) throws LdapException;
/**
@@ -736,7 +736,7 @@ public interface CoreSession
* @param ignoreReferrals a flag to tell the server to ignore referrals
* @throws Exception if there are failures while listing children
*/
- EntryFilteringCursor search( DN dn, String filter, boolean ignoreReferrals ) throws LdapException;
+ EntryFilteringCursor search( Dn dn, String filter, boolean ignoreReferrals ) throws LdapException;
/**
@@ -749,7 +749,7 @@ public interface CoreSession
* @param returningAttributes the attributes to return
* @throws Exception if there are failures while listing children
*/
- EntryFilteringCursor search( DN dn, SearchScope scope, ExprNode filter, AliasDerefMode aliasDerefMode,
+ EntryFilteringCursor search( Dn dn, SearchScope scope, ExprNode filter, AliasDerefMode aliasDerefMode,
Set<AttributeTypeOptions> returningAttributes ) throws LdapException;
@@ -764,7 +764,7 @@ public interface CoreSession
* terminating the search
* @throws Exception if there are failures while listing children
*/
- EntryFilteringCursor search( DN dn, SearchScope scope, ExprNode filter, AliasDerefMode aliasDerefMode,
+ EntryFilteringCursor search( Dn dn, SearchScope scope, ExprNode filter, AliasDerefMode aliasDerefMode,
Set<AttributeTypeOptions> returningAttributes, long sizeLimit, int timeLimit ) throws LdapException;
Modified: directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/DNFactory.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/DNFactory.java?rev=1062306&r1=1062305&r2=1062306&view=diff
==============================================================================
--- directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/DNFactory.java (original)
+++ directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/DNFactory.java Sun Jan 23 01:17:06 2011
@@ -21,7 +21,7 @@ package org.apache.directory.server.core
import org.apache.directory.shared.ldap.exception.LdapInvalidDnException;
-import org.apache.directory.shared.ldap.name.DN;
+import org.apache.directory.shared.ldap.name.Dn;
/**
@@ -33,22 +33,22 @@ public interface DNFactory
{
/**
- * Creates a DN from user provided RDNs.
+ * Creates a Dn from user provided RDNs.
*
* @param upRdns the user provided RDNs
- * @return the created DN
- * @throws LdapInvalidDnException if one of the strings isn't a valid RDN
+ * @return the created Dn
+ * @throws LdapInvalidDnException if one of the strings isn't a valid Rdn
*/
- DN create( String... upRdns ) throws LdapInvalidDnException;
+ Dn create( String... upRdns ) throws LdapInvalidDnException;
/**
- * Creates a DN form a user provided DN.
+ * Creates a Dn form a user provided Dn.
*
- * @param upDn the user provided DN
- * @return the created DN
- * @throws LdapInvalidDnException if the string isn't a valid DN
+ * @param upDn the user provided Dn
+ * @return the created Dn
+ * @throws LdapInvalidDnException if the string isn't a valid Dn
*/
- DN create( String upDn ) throws LdapInvalidDnException;
+ Dn create( String upDn ) throws LdapInvalidDnException;
}
\ No newline at end of file
Modified: directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/DirectoryService.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/DirectoryService.java?rev=1062306&r1=1062305&r2=1062306&view=diff
==============================================================================
--- directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/DirectoryService.java (original)
+++ directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/DirectoryService.java Sun Jan 23 01:17:06 2011
@@ -41,7 +41,7 @@ import org.apache.directory.shared.ldap.
import org.apache.directory.shared.ldap.entry.Entry;
import org.apache.directory.shared.ldap.exception.LdapException;
import org.apache.directory.shared.ldap.ldif.LdifEntry;
-import org.apache.directory.shared.ldap.name.DN;
+import org.apache.directory.shared.ldap.name.Dn;
import org.apache.directory.shared.ldap.schema.SchemaManager;
import org.apache.directory.shared.ldap.util.tree.DnNode;
@@ -201,7 +201,7 @@ public interface DirectoryService extend
*
* @return a logical session as a specific user
*/
- CoreSession getSession( DN principalDn, byte[] credentials ) throws LdapException;
+ CoreSession getSession( Dn principalDn, byte[] credentials ) throws LdapException;
/**
@@ -212,7 +212,7 @@ public interface DirectoryService extend
*
* @return a logical session as a specific user
*/
- CoreSession getSession( DN principalDn, byte[] credentials, String saslMechanism, String saslAuthId )
+ CoreSession getSession( Dn principalDn, byte[] credentials, String saslMechanism, String saslAuthId )
throws Exception;
@@ -422,7 +422,7 @@ public interface DirectoryService extend
* Create a new Entry.
*
* @param ldif the String representing the attributes, in LDIF format
- * @param dn the DN for this new entry
+ * @param dn the Dn for this new entry
*/
Entry newEntry( String ldif, String dn );
@@ -562,7 +562,7 @@ public interface DirectoryService extend
/**
* Gets the effective password policy of the given entry.
* If the entry has defined a custom password policy by setting "pwdPolicySubentry" attribute
- * then the password policy associated with the DN specified at the above attribute's value will be returned.
+ * then the password policy associated with the Dn specified at the above attribute's value will be returned.
* Otherwise the default password policy will be returned (if present)
*
* @param userEntry the user's entry
@@ -582,9 +582,9 @@ public interface DirectoryService extend
/**
- * Gets the DN factory.
+ * Gets the Dn factory.
*
- * @return the DN factory
+ * @return the Dn factory
*/
DNFactory getDNFactory();
}
Modified: directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/LdapCoreSessionConnection.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/LdapCoreSessionConnection.java?rev=1062306&r1=1062305&r2=1062306&view=diff
==============================================================================
--- directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/LdapCoreSessionConnection.java (original)
+++ directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/LdapCoreSessionConnection.java Sun Jan 23 01:17:06 2011
@@ -80,8 +80,8 @@ import org.apache.directory.shared.ldap.
import org.apache.directory.shared.ldap.message.SearchRequest;
import org.apache.directory.shared.ldap.message.SearchRequestImpl;
import org.apache.directory.shared.ldap.message.control.Control;
-import org.apache.directory.shared.ldap.name.DN;
-import org.apache.directory.shared.ldap.name.RDN;
+import org.apache.directory.shared.ldap.name.Dn;
+import org.apache.directory.shared.ldap.name.Rdn;
import org.apache.directory.shared.ldap.schema.SchemaManager;
import org.apache.directory.shared.util.StringConstants;
import org.apache.directory.shared.util.Strings;
@@ -255,7 +255,7 @@ public class LdapCoreSessionConnection i
/**
* {@inheritDoc}
*/
- public CompareResponse compare( DN dn, String attributeName, byte[] value ) throws LdapException
+ public CompareResponse compare( Dn dn, String attributeName, byte[] value ) throws LdapException
{
CompareRequest compareRequest = new CompareRequestImpl();
compareRequest.setName( dn );
@@ -269,7 +269,7 @@ public class LdapCoreSessionConnection i
/**
* {@inheritDoc}
*/
- public CompareResponse compare( DN dn, String attributeName, String value ) throws LdapException
+ public CompareResponse compare( Dn dn, String attributeName, String value ) throws LdapException
{
CompareRequest compareRequest = new CompareRequestImpl();
compareRequest.setName( dn );
@@ -285,7 +285,7 @@ public class LdapCoreSessionConnection i
*/
public CompareResponse compare( String dn, String attributeName, byte[] value ) throws LdapException
{
- return compare( new DN( dn ), attributeName, value );
+ return compare( new Dn( dn ), attributeName, value );
}
@@ -294,14 +294,14 @@ public class LdapCoreSessionConnection i
*/
public CompareResponse compare( String dn, String attributeName, String value ) throws LdapException
{
- return compare( new DN( dn ), attributeName, value );
+ return compare( new Dn( dn ), attributeName, value );
}
/**
* {@inheritDoc}
*/
- public CompareResponse compare( DN dn, String attributeName, Value<?> value ) throws LdapException
+ public CompareResponse compare( Dn dn, String attributeName, Value<?> value ) throws LdapException
{
CompareRequest compareRequest = new CompareRequestImpl();
compareRequest.setName( dn );
@@ -325,7 +325,7 @@ public class LdapCoreSessionConnection i
*/
public CompareResponse compare( String dn, String attributeName, Value<?> value ) throws LdapException
{
- return compare( new DN( dn ), attributeName, value );
+ return compare( new Dn( dn ), attributeName, value );
}
@@ -367,7 +367,7 @@ public class LdapCoreSessionConnection i
/**
* {@inheritDoc}
*/
- public DeleteResponse delete( DN dn ) throws LdapException
+ public DeleteResponse delete( Dn dn ) throws LdapException
{
DeleteRequest deleteRequest = new DeleteRequestImpl();
deleteRequest.setName( dn );
@@ -381,7 +381,7 @@ public class LdapCoreSessionConnection i
*/
public DeleteResponse delete( String dn ) throws LdapException
{
- return delete( new DN( dn ) );
+ return delete( new Dn( dn ) );
}
@@ -451,7 +451,7 @@ public class LdapCoreSessionConnection i
/**
* {@inheritDoc}
*/
- public Entry lookup( DN dn, String... attributes ) throws LdapException
+ public Entry lookup( Dn dn, String... attributes ) throws LdapException
{
return _lookup( dn, null, attributes );
}
@@ -460,7 +460,7 @@ public class LdapCoreSessionConnection i
/**
* {@inheritDoc}
*/
- public Entry lookup( DN dn, Control[] controls, String... attributes ) throws LdapException
+ public Entry lookup( Dn dn, Control[] controls, String... attributes ) throws LdapException
{
return _lookup( dn, controls, attributes );
}
@@ -471,7 +471,7 @@ public class LdapCoreSessionConnection i
*/
public Entry lookup( String dn, String... attributes ) throws LdapException
{
- return _lookup( new DN( dn ), null, attributes );
+ return _lookup( new Dn( dn ), null, attributes );
}
@@ -480,15 +480,15 @@ public class LdapCoreSessionConnection i
*/
public Entry lookup( String dn, Control[] controls, String... attributes ) throws LdapException
{
- return _lookup( new DN( dn ), controls, attributes );
+ return _lookup( new Dn( dn ), controls, attributes );
}
/*
* this method exists solely for the purpose of calling from
- * lookup(DN dn) avoiding the varargs,
+ * lookup(Dn dn) avoiding the varargs,
*/
- private Entry _lookup( DN dn, Control[] controls, String... attributes )
+ private Entry _lookup( Dn dn, Control[] controls, String... attributes )
{
messageId.incrementAndGet();
@@ -512,14 +512,14 @@ public class LdapCoreSessionConnection i
*/
public boolean exists( String dn ) throws LdapException
{
- return exists( new DN( dn ) );
+ return exists( new Dn( dn ) );
}
/**
* {@inheritDoc}
*/
- public boolean exists( DN dn ) throws LdapException
+ public boolean exists( Dn dn ) throws LdapException
{
try
{
@@ -542,7 +542,7 @@ public class LdapCoreSessionConnection i
/**
* {@inheritDoc}
*/
- public Entry lookup( DN dn ) throws LdapException
+ public Entry lookup( Dn dn ) throws LdapException
{
return _lookup( dn, null );
}
@@ -553,19 +553,19 @@ public class LdapCoreSessionConnection i
*/
public Entry lookup( String dn ) throws LdapException
{
- return _lookup( new DN( dn ), null );
+ return _lookup( new Dn( dn ), null );
}
/**
* {@inheritDoc}
*/
- public ModifyResponse modify( DN dn, Modification... modifications ) throws LdapException
+ public ModifyResponse modify( Dn dn, Modification... modifications ) throws LdapException
{
if ( dn == null )
{
LOG.debug( "received a null dn for modification" );
- throw new IllegalArgumentException( "The DN to be modified cannot be null" );
+ throw new IllegalArgumentException( "The Dn to be modified cannot be null" );
}
if ( ( modifications == null ) || ( modifications.length == 0 ) )
@@ -611,7 +611,7 @@ public class LdapCoreSessionConnection i
*/
public ModifyResponse modify( String dn, Modification... modifications ) throws LdapException
{
- return modify( new DN( dn ), modifications );
+ return modify( new Dn( dn ), modifications );
}
@@ -713,7 +713,7 @@ public class LdapCoreSessionConnection i
if ( modDnRequest.getName().isEmpty() )
{
// it is not allowed to modify the name of the Root DSE
- String msg = "Modify DN is not allowed on Root DSE.";
+ String msg = "Modify Dn is not allowed on Root DSE.";
result.setResultCode( ResultCodeEnum.PROTOCOL_ERROR );
result.setErrorMessage( msg );
return resp;
@@ -721,14 +721,14 @@ public class LdapCoreSessionConnection i
try
{
- DN newRdn = null;
+ Dn newRdn = null;
if ( modDnRequest.getNewRdn() != null )
{
- newRdn = new DN( modDnRequest.getNewRdn().getName(), schemaManager );
+ newRdn = new Dn( modDnRequest.getNewRdn().getName(), schemaManager );
}
- DN oldRdn = new DN( modDnRequest.getName().getRdn().getName(), schemaManager );
+ Dn oldRdn = new Dn( modDnRequest.getName().getRdn().getName(), schemaManager );
boolean rdnChanged = modDnRequest.getNewRdn() != null
&& !newRdn.getNormName().equals( oldRdn.getNormName() );
@@ -773,18 +773,18 @@ public class LdapCoreSessionConnection i
/**
* {@inheritDoc}
*/
- public ModifyDnResponse move( DN entryDn, DN newSuperiorDn ) throws LdapException
+ public ModifyDnResponse move( Dn entryDn, Dn newSuperiorDn ) throws LdapException
{
if ( entryDn == null )
{
- String msg = "Cannot process a move of a null DN";
+ String msg = "Cannot process a move of a null Dn";
LOG.debug( msg );
throw new IllegalArgumentException( msg );
}
if ( newSuperiorDn == null )
{
- String msg = "Cannot process a move to a null DN";
+ String msg = "Cannot process a move to a null Dn";
LOG.debug( msg );
throw new IllegalArgumentException( msg );
}
@@ -804,37 +804,37 @@ public class LdapCoreSessionConnection i
{
if ( entryDn == null )
{
- String msg = "Cannot process a move of a null DN";
+ String msg = "Cannot process a move of a null Dn";
LOG.debug( msg );
throw new IllegalArgumentException( msg );
}
if ( newSuperiorDn == null )
{
- String msg = "Cannot process a move to a null DN";
+ String msg = "Cannot process a move to a null Dn";
LOG.debug( msg );
throw new IllegalArgumentException( msg );
}
- return move( new DN( entryDn ), new DN( newSuperiorDn ) );
+ return move( new Dn( entryDn ), new Dn( newSuperiorDn ) );
}
/**
* {@inheritDoc}
*/
- public ModifyDnResponse rename( DN entryDn, RDN newRdn, boolean deleteOldRdn ) throws LdapException
+ public ModifyDnResponse rename( Dn entryDn, Rdn newRdn, boolean deleteOldRdn ) throws LdapException
{
if ( entryDn == null )
{
- String msg = "Cannot process a rename of a null DN";
+ String msg = "Cannot process a rename of a null Dn";
LOG.debug( msg );
throw new IllegalArgumentException( msg );
}
if ( newRdn == null )
{
- String msg = "Cannot process a rename with a null RDN";
+ String msg = "Cannot process a rename with a null Rdn";
LOG.debug( msg );
throw new IllegalArgumentException( msg );
}
@@ -851,7 +851,7 @@ public class LdapCoreSessionConnection i
/**
* {@inheritDoc}
*/
- public ModifyDnResponse rename( DN entryDn, RDN newRdn ) throws LdapException
+ public ModifyDnResponse rename( Dn entryDn, Rdn newRdn ) throws LdapException
{
return rename( entryDn, newRdn, false );
}
@@ -862,7 +862,7 @@ public class LdapCoreSessionConnection i
*/
public ModifyDnResponse rename( String entryDn, String newRdn, boolean deleteOldRdn ) throws LdapException
{
- return rename( new DN( entryDn ), new RDN( newRdn ), deleteOldRdn );
+ return rename( new Dn( entryDn ), new Rdn( newRdn ), deleteOldRdn );
}
@@ -873,57 +873,57 @@ public class LdapCoreSessionConnection i
{
if ( entryDn == null )
{
- String msg = "Cannot process a rename of a null DN";
+ String msg = "Cannot process a rename of a null Dn";
LOG.debug( msg );
throw new IllegalArgumentException( msg );
}
if ( newRdn == null )
{
- String msg = "Cannot process a rename with a null RDN";
+ String msg = "Cannot process a rename with a null Rdn";
LOG.debug( msg );
throw new IllegalArgumentException( msg );
}
- return rename( new DN( entryDn ), new RDN( newRdn ) );
+ return rename( new Dn( entryDn ), new Rdn( newRdn ) );
}
/**
- * Moves and renames the given entryDn.The old RDN will be deleted
+ * Moves and renames the given entryDn.The old Rdn will be deleted
*
- * @see #moveAndRename(DN, DN, boolean)
+ * @see #moveAndRename(org.apache.directory.shared.ldap.name.Dn, org.apache.directory.shared.ldap.name.Dn, boolean)
*/
- public ModifyDnResponse moveAndRename( DN entryDn, DN newDn ) throws LdapException
+ public ModifyDnResponse moveAndRename( Dn entryDn, Dn newDn ) throws LdapException
{
return moveAndRename( entryDn, newDn, true );
}
/**
- * Moves and renames the given entryDn.The old RDN will be deleted
+ * Moves and renames the given entryDn.The old Rdn will be deleted
*
- * @see #moveAndRename(DN, DN, boolean)
+ * @see #moveAndRename(org.apache.directory.shared.ldap.name.Dn, org.apache.directory.shared.ldap.name.Dn, boolean)
*/
public ModifyDnResponse moveAndRename( String entryDn, String newDn ) throws LdapException
{
- return moveAndRename( new DN( entryDn ), new DN( newDn ), true );
+ return moveAndRename( new Dn( entryDn ), new Dn( newDn ), true );
}
/**
- * Moves and renames the given entryDn.The old RDN will be deleted if requested
+ * Moves and renames the given entryDn.The old Rdn will be deleted if requested
*
- * @param entryDn The original entry DN
- * @param newDn The new Entry DN
- * @param deleteOldRdn Tells if the old RDN must be removed
+ * @param entryDn The original entry Dn
+ * @param newDn The new Entry Dn
+ * @param deleteOldRdn Tells if the old Rdn must be removed
*/
- public ModifyDnResponse moveAndRename( DN entryDn, DN newDn, boolean deleteOldRdn ) throws LdapException
+ public ModifyDnResponse moveAndRename( Dn entryDn, Dn newDn, boolean deleteOldRdn ) throws LdapException
{
// Check the parameters first
if ( entryDn == null )
{
- throw new IllegalArgumentException( "The entry DN must not be null" );
+ throw new IllegalArgumentException( "The entry Dn must not be null" );
}
if ( entryDn.isRootDSE() )
@@ -933,7 +933,7 @@ public class LdapCoreSessionConnection i
if ( newDn == null )
{
- throw new IllegalArgumentException( "The new DN must not be null" );
+ throw new IllegalArgumentException( "The new Dn must not be null" );
}
if ( newDn.isRootDSE() )
@@ -956,15 +956,15 @@ public class LdapCoreSessionConnection i
/**
- * Moves and renames the given entryDn.The old RDN will be deleted if requested
+ * Moves and renames the given entryDn.The old Rdn will be deleted if requested
*
- * @param entryDn The original entry DN
- * @param newDn The new Entry DN
- * @param deleteOldRdn Tells if the old RDN must be removed
+ * @param entryDn The original entry Dn
+ * @param newDn The new Entry Dn
+ * @param deleteOldRdn Tells if the old Rdn must be removed
*/
public ModifyDnResponse moveAndRename( String entryDn, String newDn, boolean deleteOldRdn ) throws LdapException
{
- return moveAndRename( new DN( entryDn ), new DN( newDn ), deleteOldRdn );
+ return moveAndRename( new Dn( entryDn ), new Dn( newDn ), deleteOldRdn );
}
@@ -1004,13 +1004,13 @@ public class LdapCoreSessionConnection i
/**
* {@inheritDoc}
*/
- public SearchCursor search( DN baseDn, String filter, SearchScope scope, String... attributes )
+ public SearchCursor search( Dn baseDn, String filter, SearchScope scope, String... attributes )
throws LdapException
{
if ( baseDn == null )
{
LOG.debug( "received a null dn for a search" );
- throw new IllegalArgumentException( "The base DN cannot be null" );
+ throw new IllegalArgumentException( "The base Dn cannot be null" );
}
// generate some random operation number
@@ -1032,7 +1032,7 @@ public class LdapCoreSessionConnection i
public SearchCursor search( String baseDn, String filter, SearchScope scope, String... attributes )
throws LdapException
{
- return search( new DN( baseDn ), filter, scope, attributes );
+ return search( new Dn( baseDn ), filter, scope, attributes );
}
@@ -1138,7 +1138,7 @@ public class LdapCoreSessionConnection i
public BindResponse bind() throws LdapException, IOException
{
BindRequest bindReq = new BindRequestImpl();
- bindReq.setName( DN.EMPTY_DN );
+ bindReq.setName( Dn.EMPTY_DN );
bindReq.setCredentials( ( byte[] ) null );
return bind( bindReq );
@@ -1161,7 +1161,7 @@ public class LdapCoreSessionConnection i
BindOperationContext bindContext = new BindOperationContext( null );
bindContext.setCredentials( bindRequest.getCredentials() );
- bindContext.setDn( new DN( bindRequest.getName() ) );
+ bindContext.setDn( new Dn( bindRequest.getName() ) );
OperationManager operationManager = directoryService.getOperationManager();
@@ -1195,7 +1195,7 @@ public class LdapCoreSessionConnection i
/**
* {@inheritDoc}
*/
- public BindResponse bind( DN name, String credentials ) throws LdapException, IOException
+ public BindResponse bind( Dn name, String credentials ) throws LdapException, IOException
{
byte[] credBytes = ( credentials == null ? StringConstants.EMPTY_BYTES : Strings.getBytesUtf8(credentials) );
@@ -1212,7 +1212,7 @@ public class LdapCoreSessionConnection i
*/
public BindResponse bind( String name, String credentials ) throws LdapException, IOException
{
- return bind( new DN( name ), credentials );
+ return bind( new Dn( name ), credentials );
}
Modified: directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/LdapPrincipal.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/LdapPrincipal.java?rev=1062306&r1=1062305&r2=1062306&view=diff
==============================================================================
--- directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/LdapPrincipal.java (original)
+++ directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/LdapPrincipal.java Sun Jan 23 01:17:06 2011
@@ -28,7 +28,7 @@ import java.security.Principal;
import org.apache.directory.server.i18n.I18n;
import org.apache.directory.shared.ldap.constants.AuthenticationLevel;
-import org.apache.directory.shared.ldap.name.DN;
+import org.apache.directory.shared.ldap.name.Dn;
import org.apache.directory.shared.util.Strings;
@@ -43,9 +43,9 @@ public final class LdapPrincipal impleme
private static final long serialVersionUID = 3906650782395676720L;
/** the normalized distinguished name of the principal */
- private DN dn;
+ private Dn dn;
- /** the no name anonymous user whose DN is the empty String */
+ /** the no name anonymous user whose Dn is the empty String */
public static final LdapPrincipal ANONYMOUS = new LdapPrincipal();
/** the authentication level for this principal */
@@ -66,7 +66,7 @@ public final class LdapPrincipal impleme
* @param dn the normalized distinguished name of the principal
* @param authenticationLevel the authentication level for this principal
*/
- public LdapPrincipal( DN dn, AuthenticationLevel authenticationLevel )
+ public LdapPrincipal( Dn dn, AuthenticationLevel authenticationLevel )
{
this.dn = dn;
@@ -88,7 +88,7 @@ public final class LdapPrincipal impleme
* @param authenticationLevel the authentication level for this principal
* @param userPassword The user password
*/
- public LdapPrincipal( DN dn, AuthenticationLevel authenticationLevel, byte[] userPassword )
+ public LdapPrincipal( Dn dn, AuthenticationLevel authenticationLevel, byte[] userPassword )
{
this.dn = dn;
this.authenticationLevel = authenticationLevel;
@@ -98,12 +98,12 @@ public final class LdapPrincipal impleme
/**
- * Creates a principal for the no name anonymous user whose DN is the empty
+ * Creates a principal for the no name anonymous user whose Dn is the empty
* String.
*/
public LdapPrincipal()
{
- dn = new DN();
+ dn = new Dn();
authenticationLevel = AuthenticationLevel.NONE;
userPassword = null;
}
@@ -111,11 +111,11 @@ public final class LdapPrincipal impleme
/**
* Gets a reference to the distinguished name of this
- * principal as a {@link DN}.
+ * principal as a {@link org.apache.directory.shared.ldap.name.Dn}.
*
- * @return the distinguished name of the principal as a {@link DN}
+ * @return the distinguished name of the principal as a {@link org.apache.directory.shared.ldap.name.Dn}
*/
- public DN getDNRef()
+ public Dn getDNRef()
{
return dn;
}
@@ -123,11 +123,11 @@ public final class LdapPrincipal impleme
/**
* Gets a cloned copy of the normalized distinguished name of this
- * principal as a {@link DN}.
+ * principal as a {@link org.apache.directory.shared.ldap.name.Dn}.
*
- * @return the cloned distinguished name of the principal as a {@link DN}
+ * @return the cloned distinguished name of the principal as a {@link org.apache.directory.shared.ldap.name.Dn}
*/
- public DN getDN()
+ public Dn getDN()
{
return dn;
}
@@ -203,7 +203,7 @@ public final class LdapPrincipal impleme
public void readExternal( ObjectInput in ) throws IOException , ClassNotFoundException
{
// Read the name
- dn = (DN)in.readObject();
+ dn = (Dn)in.readObject();
// read the authentication level
int level = in.readInt();
@@ -226,7 +226,7 @@ public final class LdapPrincipal impleme
// Write the name
if ( dn == null )
{
- out.writeObject( DN.EMPTY_DN );
+ out.writeObject( Dn.EMPTY_DN );
}
else
{
Modified: directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/PpolicyConfigContainer.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/PpolicyConfigContainer.java?rev=1062306&r1=1062305&r2=1062306&view=diff
==============================================================================
--- directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/PpolicyConfigContainer.java (original)
+++ directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/PpolicyConfigContainer.java Sun Jan 23 01:17:06 2011
@@ -24,7 +24,7 @@ package org.apache.directory.server.core
import java.util.HashMap;
import java.util.Map;
-import org.apache.directory.shared.ldap.name.DN;
+import org.apache.directory.shared.ldap.name.Dn;
/**
@@ -36,7 +36,7 @@ public class PpolicyConfigContainer
{
/** a map holding the entry specific password policies */
- private Map<DN, PasswordPolicyConfiguration> ppolicyConfigMap = new HashMap<DN, PasswordPolicyConfiguration>();
+ private Map<Dn, PasswordPolicyConfiguration> ppolicyConfigMap = new HashMap<Dn, PasswordPolicyConfiguration>();
/** the default password policy */
private PasswordPolicyConfiguration defaultPolicy;
@@ -45,14 +45,14 @@ public class PpolicyConfigContainer
/**
* add a entry specific policy
*
- * @param configDn the DN where this entry's password policy is defined
+ * @param configDn the Dn where this entry's password policy is defined
* @param policyConfig the password policy configuration
*/
- public void addPolicy( DN configDn, PasswordPolicyConfiguration policyConfig )
+ public void addPolicy( Dn configDn, PasswordPolicyConfiguration policyConfig )
{
if ( configDn == null )
{
- throw new IllegalArgumentException( "password policy config's DN cannot be null" );
+ throw new IllegalArgumentException( "password policy config's Dn cannot be null" );
}
ppolicyConfigMap.put( configDn, policyConfig );
@@ -69,12 +69,12 @@ public class PpolicyConfigContainer
/**
- * Get the password policy configuration defined at a given DN
+ * Get the password policy configuration defined at a given Dn
*
- * @param configDn the DN where password policy was configured
+ * @param configDn the Dn where password policy was configured
* @return
*/
- public PasswordPolicyConfiguration getPolicyConfig( DN configDn )
+ public PasswordPolicyConfiguration getPolicyConfig( Dn configDn )
{
return ppolicyConfigMap.get( configDn );
}
Modified: directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/ReferralManager.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/ReferralManager.java?rev=1062306&r1=1062305&r2=1062306&view=diff
==============================================================================
--- directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/ReferralManager.java (original)
+++ directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/ReferralManager.java Sun Jan 23 01:17:06 2011
@@ -21,7 +21,7 @@ package org.apache.directory.server.core
import org.apache.directory.shared.ldap.entry.Entry;
import org.apache.directory.shared.ldap.exception.LdapException;
-import org.apache.directory.shared.ldap.name.DN;
+import org.apache.directory.shared.ldap.name.Dn;
/**
* An interface for managing referrals in the server
@@ -55,35 +55,35 @@ public interface ReferralManager
/**
- * Tells if a DN is a referral (its associated entry contains the Referral ObjectClass).
+ * Tells if a Dn is a referral (its associated entry contains the Referral ObjectClass).
*
* It does not check that the associated entry inherits from a referral.
*
- * @param dn The entry's DN we want to check
- * @return <code>true</code> if the DN is associated with a referral
+ * @param dn The entry's Dn we want to check
+ * @return <code>true</code> if the Dn is associated with a referral
*/
- boolean isReferral( DN dn );
+ boolean isReferral( Dn dn );
/**
- * Tells if this DN has a parent which is a referral.
+ * Tells if this Dn has a parent which is a referral.
* <br>
- * For instance, if cn=example, dc=acme, dc=org is the DN to check,
+ * For instance, if cn=example, dc=acme, dc=org is the Dn to check,
* and if dc=acme, dc=org is a referral, this this method will return true.
*
- * @param dn The DN we want to check for a referral in its partents
+ * @param dn The Dn we want to check for a referral in its partents
* @return <code>true</code> if there is a parent referral
*/
- boolean hasParentReferral( DN dn );
+ boolean hasParentReferral( Dn dn );
/**
- * Get the DN of the parent referral for a specific DN
+ * Get the Dn of the parent referral for a specific Dn
*
- * @param dn The DN from which we want to get the parent referral
+ * @param dn The Dn from which we want to get the parent referral
* @return The parent referral of null if none is found
*/
- Entry getParentReferral( DN dn );
+ Entry getParentReferral( Dn dn );
/**
@@ -119,8 +119,8 @@ public interface ReferralManager
* will remove them from the referrals table.
*
* @param directoryService The associated LDAP service
- * @param suffixes The partition DN to remove
+ * @param suffixes The partition Dn to remove
* @exception If the removal failed
*/
- void remove( DirectoryService directoryService, DN suffix ) throws Exception;
+ void remove( DirectoryService directoryService, Dn suffix ) throws Exception;
}
Modified: directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/administrative/AbstractAdministrativePoint.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/administrative/AbstractAdministrativePoint.java?rev=1062306&r1=1062305&r2=1062306&view=diff
==============================================================================
--- directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/administrative/AbstractAdministrativePoint.java (original)
+++ directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/administrative/AbstractAdministrativePoint.java Sun Jan 23 01:17:06 2011
@@ -23,7 +23,7 @@ package org.apache.directory.server.core
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
-import org.apache.directory.shared.ldap.name.DN;
+import org.apache.directory.shared.ldap.name.Dn;
import org.apache.directory.shared.ldap.subtree.AdministrativeRole;
@@ -34,8 +34,8 @@ import org.apache.directory.shared.ldap.
*/
public abstract class AbstractAdministrativePoint implements AdministrativePoint
{
- /** The AA's DN */
- protected DN dn;
+ /** The AA's Dn */
+ protected Dn dn;
/** The AA's UUID */
protected String uuid;
@@ -53,7 +53,7 @@ public abstract class AbstractAdministra
/**
* Creates a new instance of AbstractAdministrativePoint.
*/
- protected AbstractAdministrativePoint( DN dn, String uuid, AdministrativeRole role )
+ protected AbstractAdministrativePoint( Dn dn, String uuid, AdministrativeRole role )
{
this.dn = dn;
this.uuid = uuid;
@@ -74,7 +74,7 @@ public abstract class AbstractAdministra
/**
* {@inheritDoc}
*/
- public DN getDn()
+ public Dn getDn()
{
return dn;
}
@@ -137,7 +137,7 @@ public abstract class AbstractAdministra
StringBuilder sb = new StringBuilder();
sb.append( "Role: '" ).append( role ).append( "', " );
- sb.append( "DN: '" ).append( dn ).append( "', " );
+ sb.append( "Dn: '" ).append( dn ).append( "', " );
sb.append( "UUID: " ).append( uuid ).append( '\n' );
return sb.toString();
Modified: directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/administrative/AccessControlAAP.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/administrative/AccessControlAAP.java?rev=1062306&r1=1062305&r2=1062306&view=diff
==============================================================================
--- directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/administrative/AccessControlAAP.java (original)
+++ directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/administrative/AccessControlAAP.java Sun Jan 23 01:17:06 2011
@@ -20,7 +20,7 @@
package org.apache.directory.server.core.administrative;
-import org.apache.directory.shared.ldap.name.DN;
+import org.apache.directory.shared.ldap.name.Dn;
import org.apache.directory.shared.ldap.subtree.AdministrativeRole;
@@ -34,10 +34,10 @@ public class AccessControlAAP extends Ac
/**
* Create an instance of AccessControl AdministrativePoint
*
- * @param dn The AdministrativePoint DN
+ * @param dn The AdministrativePoint Dn
* @param uuid The AdministrativePoint UUID
*/
- public AccessControlAAP( DN dn, String uuid )
+ public AccessControlAAP( Dn dn, String uuid )
{
super( dn, uuid, AdministrativeRole.AccessControlSpecificArea );
}
Modified: directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/administrative/AccessControlAdministrativePoint.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/administrative/AccessControlAdministrativePoint.java?rev=1062306&r1=1062305&r2=1062306&view=diff
==============================================================================
--- directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/administrative/AccessControlAdministrativePoint.java (original)
+++ directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/administrative/AccessControlAdministrativePoint.java Sun Jan 23 01:17:06 2011
@@ -20,7 +20,7 @@
package org.apache.directory.server.core.administrative;
-import org.apache.directory.shared.ldap.name.DN;
+import org.apache.directory.shared.ldap.name.Dn;
import org.apache.directory.shared.ldap.subtree.AdministrativeRole;
@@ -35,11 +35,11 @@ public abstract class AccessControlAdmin
/**
* Create an instance of AccessControlAdministrativePoint
*
- * @param dn The AdministrativePoint DN
+ * @param dn The AdministrativePoint Dn
* @param uuid The AdministrativePoint UUID
* @param role The AdministrativePoint role
*/
- protected AccessControlAdministrativePoint( DN dn, String uuid, AdministrativeRole role )
+ protected AccessControlAdministrativePoint( Dn dn, String uuid, AdministrativeRole role )
{
super( dn, uuid, role );
}
Modified: directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/administrative/AccessControlIAP.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/administrative/AccessControlIAP.java?rev=1062306&r1=1062305&r2=1062306&view=diff
==============================================================================
--- directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/administrative/AccessControlIAP.java (original)
+++ directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/administrative/AccessControlIAP.java Sun Jan 23 01:17:06 2011
@@ -20,7 +20,7 @@
package org.apache.directory.server.core.administrative;
-import org.apache.directory.shared.ldap.name.DN;
+import org.apache.directory.shared.ldap.name.Dn;
import org.apache.directory.shared.ldap.subtree.AdministrativeRole;
@@ -34,10 +34,10 @@ public class AccessControlIAP extends Ac
/**
* Create an instance of AccessControl IAP
*
- * @param dn The AdministrativePoint DN
+ * @param dn The AdministrativePoint Dn
* @param uuid The AdministrativePoint UUID
*/
- public AccessControlIAP( DN dn, String uuid )
+ public AccessControlIAP( Dn dn, String uuid )
{
super( dn, uuid, AdministrativeRole.AccessControlInnerArea );
}
Modified: directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/administrative/AccessControlSAP.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/administrative/AccessControlSAP.java?rev=1062306&r1=1062305&r2=1062306&view=diff
==============================================================================
--- directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/administrative/AccessControlSAP.java (original)
+++ directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/administrative/AccessControlSAP.java Sun Jan 23 01:17:06 2011
@@ -20,7 +20,7 @@
package org.apache.directory.server.core.administrative;
-import org.apache.directory.shared.ldap.name.DN;
+import org.apache.directory.shared.ldap.name.Dn;
import org.apache.directory.shared.ldap.subtree.AdministrativeRole;
@@ -35,10 +35,10 @@ public class AccessControlSAP extends Ac
/**
* Create an instance of AccessControl AdministrativePoint
*
- * @param dn The AdministrativePoint DN
+ * @param dn The AdministrativePoint Dn
* @param uuid The AdministrativePoint UUID
*/
- public AccessControlSAP( DN dn, String uuid )
+ public AccessControlSAP( Dn dn, String uuid )
{
super( dn, uuid, AdministrativeRole.AccessControlSpecificArea );
}
Modified: directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/administrative/AdministrativePoint.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/administrative/AdministrativePoint.java?rev=1062306&r1=1062305&r2=1062306&view=diff
==============================================================================
--- directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/administrative/AdministrativePoint.java (original)
+++ directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/administrative/AdministrativePoint.java Sun Jan 23 01:17:06 2011
@@ -19,7 +19,7 @@
*/
package org.apache.directory.server.core.administrative;
-import org.apache.directory.shared.ldap.name.DN;
+import org.apache.directory.shared.ldap.name.Dn;
import org.apache.directory.shared.ldap.subtree.AdministrativeRole;
@@ -27,7 +27,7 @@ import org.apache.directory.shared.ldap.
* An interface used to describe an AdministrativePoint. An AdministratuvePoint
* holds some elements useful to navigate through the administrative model :
* <li>
- * <ul>The DN : the AP position in the DIT</ul>
+ * <ul>The Dn : the AP position in the DIT</ul>
* <ul>The UUID : The AP unique identifier used when an entry point to the AP it depends on</ul>
* <ul>The role : the AP role</ul>
* <ul>The parent : the AP this AP is the direct descendant of</ul>
@@ -37,9 +37,9 @@ import org.apache.directory.shared.ldap.
public interface AdministrativePoint
{
/**
- * @return The AdministrativePoint DN
+ * @return The AdministrativePoint Dn
*/
- DN getDn();
+ Dn getDn();
/**
Modified: directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/administrative/AutonomousAdministrativePoint.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/administrative/AutonomousAdministrativePoint.java?rev=1062306&r1=1062305&r2=1062306&view=diff
==============================================================================
--- directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/administrative/AutonomousAdministrativePoint.java (original)
+++ directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/administrative/AutonomousAdministrativePoint.java Sun Jan 23 01:17:06 2011
@@ -20,7 +20,7 @@
package org.apache.directory.server.core.administrative;
-import org.apache.directory.shared.ldap.name.DN;
+import org.apache.directory.shared.ldap.name.Dn;
import org.apache.directory.shared.ldap.subtree.AdministrativeRole;
@@ -45,10 +45,10 @@ public class AutonomousAdministrativePoi
/**
* Create an instance of AutonomousAdministrativePoint
*
- * @param dn The AdministrativePoint DN
+ * @param dn The AdministrativePoint Dn
* @param uuid The AdministrativePoint UUID
*/
- public AutonomousAdministrativePoint( DN dn, String uuid )
+ public AutonomousAdministrativePoint( Dn dn, String uuid )
{
super( dn, uuid, AdministrativeRole.AutonomousArea );
}
Modified: directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/administrative/CollectiveAttributeAAP.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/administrative/CollectiveAttributeAAP.java?rev=1062306&r1=1062305&r2=1062306&view=diff
==============================================================================
--- directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/administrative/CollectiveAttributeAAP.java (original)
+++ directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/administrative/CollectiveAttributeAAP.java Sun Jan 23 01:17:06 2011
@@ -20,7 +20,7 @@
package org.apache.directory.server.core.administrative;
-import org.apache.directory.shared.ldap.name.DN;
+import org.apache.directory.shared.ldap.name.Dn;
import org.apache.directory.shared.ldap.subtree.AdministrativeRole;
@@ -34,10 +34,10 @@ public class CollectiveAttributeAAP exte
/**
* Create an instance of CollectiveAttribute AAP
*
- * @param dn The AdministrativePoint DN
+ * @param dn The AdministrativePoint Dn
* @param uuid The AdministrativePoint UUID
*/
- public CollectiveAttributeAAP( DN dn, String uuid )
+ public CollectiveAttributeAAP( Dn dn, String uuid )
{
super( dn, uuid, AdministrativeRole.CollectiveAttributeSpecificArea );
}
Modified: directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/administrative/CollectiveAttributeAdministrativePoint.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/administrative/CollectiveAttributeAdministrativePoint.java?rev=1062306&r1=1062305&r2=1062306&view=diff
==============================================================================
--- directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/administrative/CollectiveAttributeAdministrativePoint.java (original)
+++ directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/administrative/CollectiveAttributeAdministrativePoint.java Sun Jan 23 01:17:06 2011
@@ -20,7 +20,7 @@
package org.apache.directory.server.core.administrative;
-import org.apache.directory.shared.ldap.name.DN;
+import org.apache.directory.shared.ldap.name.Dn;
import org.apache.directory.shared.ldap.subtree.AdministrativeRole;
@@ -35,11 +35,11 @@ public abstract class CollectiveAttribut
/**
* Create an instance of CollectiveAttributeAdministrativePoint
*
- * @param dn The AdministrativePoint DN
+ * @param dn The AdministrativePoint Dn
* @param uuid The AdministrativePoint UUID
* @param role The AdministrativePoint role
*/
- protected CollectiveAttributeAdministrativePoint( DN dn, String uuid, AdministrativeRole role )
+ protected CollectiveAttributeAdministrativePoint( Dn dn, String uuid, AdministrativeRole role )
{
super( dn, uuid, role );
}
Modified: directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/administrative/CollectiveAttributeIAP.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/administrative/CollectiveAttributeIAP.java?rev=1062306&r1=1062305&r2=1062306&view=diff
==============================================================================
--- directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/administrative/CollectiveAttributeIAP.java (original)
+++ directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/administrative/CollectiveAttributeIAP.java Sun Jan 23 01:17:06 2011
@@ -20,7 +20,7 @@
package org.apache.directory.server.core.administrative;
-import org.apache.directory.shared.ldap.name.DN;
+import org.apache.directory.shared.ldap.name.Dn;
import org.apache.directory.shared.ldap.subtree.AdministrativeRole;
@@ -34,10 +34,10 @@ public class CollectiveAttributeIAP exte
/**
* Create an instance of CollectiveAttribute IAP
*
- * @param dn The AdministrativePoint DN
+ * @param dn The AdministrativePoint Dn
* @param uuid The AdministrativePoint UUID
*/
- public CollectiveAttributeIAP( DN dn, String uuid )
+ public CollectiveAttributeIAP( Dn dn, String uuid )
{
super( dn, uuid, AdministrativeRole.CollectiveAttributeInnerArea );
}
Modified: directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/administrative/CollectiveAttributeSAP.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/administrative/CollectiveAttributeSAP.java?rev=1062306&r1=1062305&r2=1062306&view=diff
==============================================================================
--- directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/administrative/CollectiveAttributeSAP.java (original)
+++ directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/administrative/CollectiveAttributeSAP.java Sun Jan 23 01:17:06 2011
@@ -20,7 +20,7 @@
package org.apache.directory.server.core.administrative;
-import org.apache.directory.shared.ldap.name.DN;
+import org.apache.directory.shared.ldap.name.Dn;
import org.apache.directory.shared.ldap.subtree.AdministrativeRole;
@@ -34,10 +34,10 @@ public class CollectiveAttributeSAP exte
/**
* Create an instance of CollectiveAttribute SAP
*
- * @param dn The AdministrativePoint DN
+ * @param dn The AdministrativePoint Dn
* @param uuid The AdministrativePoint UUID
*/
- public CollectiveAttributeSAP( DN dn, String uuid )
+ public CollectiveAttributeSAP( Dn dn, String uuid )
{
super( dn, uuid, AdministrativeRole.CollectiveAttributeSpecificArea );
}
Modified: directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/administrative/SubschemaAAP.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/administrative/SubschemaAAP.java?rev=1062306&r1=1062305&r2=1062306&view=diff
==============================================================================
--- directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/administrative/SubschemaAAP.java (original)
+++ directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/administrative/SubschemaAAP.java Sun Jan 23 01:17:06 2011
@@ -20,7 +20,7 @@
package org.apache.directory.server.core.administrative;
-import org.apache.directory.shared.ldap.name.DN;
+import org.apache.directory.shared.ldap.name.Dn;
import org.apache.directory.shared.ldap.subtree.AdministrativeRole;
@@ -34,10 +34,10 @@ public class SubschemaAAP extends Subsch
/**
* Create an instance of Subschema AAP
*
- * @param dn The AdministrativePoint DN
+ * @param dn The AdministrativePoint Dn
* @param uuid The AdministrativePoint UUID
*/
- public SubschemaAAP( DN dn, String uuid )
+ public SubschemaAAP( Dn dn, String uuid )
{
super( dn, uuid, AdministrativeRole.SubSchemaSpecificArea );
}
Modified: directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/administrative/SubschemaAdministrativePoint.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/administrative/SubschemaAdministrativePoint.java?rev=1062306&r1=1062305&r2=1062306&view=diff
==============================================================================
--- directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/administrative/SubschemaAdministrativePoint.java (original)
+++ directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/administrative/SubschemaAdministrativePoint.java Sun Jan 23 01:17:06 2011
@@ -20,7 +20,7 @@
package org.apache.directory.server.core.administrative;
-import org.apache.directory.shared.ldap.name.DN;
+import org.apache.directory.shared.ldap.name.Dn;
import org.apache.directory.shared.ldap.subtree.AdministrativeRole;
@@ -35,11 +35,11 @@ public abstract class SubschemaAdministr
/**
* Create an instance of Subschema AdministrativePoint
*
- * @param dn The AdministrativePoint DN
+ * @param dn The AdministrativePoint Dn
* @param uuid The AdministrativePoint UUID
* @param role The AdministrativePoint role
*/
- protected SubschemaAdministrativePoint( DN dn, String uuid, AdministrativeRole role )
+ protected SubschemaAdministrativePoint( Dn dn, String uuid, AdministrativeRole role )
{
super( dn, uuid, role );
}
Modified: directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/administrative/SubschemaSAP.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/administrative/SubschemaSAP.java?rev=1062306&r1=1062305&r2=1062306&view=diff
==============================================================================
--- directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/administrative/SubschemaSAP.java (original)
+++ directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/administrative/SubschemaSAP.java Sun Jan 23 01:17:06 2011
@@ -20,7 +20,7 @@
package org.apache.directory.server.core.administrative;
-import org.apache.directory.shared.ldap.name.DN;
+import org.apache.directory.shared.ldap.name.Dn;
import org.apache.directory.shared.ldap.subtree.AdministrativeRole;
@@ -34,10 +34,10 @@ public class SubschemaSAP extends Subsch
/**
* Create an instance of Subschema SAP
*
- * @param dn The AdministrativePoint DN
+ * @param dn The AdministrativePoint Dn
* @param uuid The AdministrativePoint UUID
*/
- public SubschemaSAP( DN dn, String uuid )
+ public SubschemaSAP( Dn dn, String uuid )
{
super( dn, uuid, AdministrativeRole.SubSchemaSpecificArea );
}
Modified: directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/administrative/TriggerExecutionAAP.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/administrative/TriggerExecutionAAP.java?rev=1062306&r1=1062305&r2=1062306&view=diff
==============================================================================
--- directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/administrative/TriggerExecutionAAP.java (original)
+++ directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/administrative/TriggerExecutionAAP.java Sun Jan 23 01:17:06 2011
@@ -20,7 +20,7 @@
package org.apache.directory.server.core.administrative;
-import org.apache.directory.shared.ldap.name.DN;
+import org.apache.directory.shared.ldap.name.Dn;
import org.apache.directory.shared.ldap.subtree.AdministrativeRole;
@@ -34,10 +34,10 @@ public class TriggerExecutionAAP extends
/**
* Create an instance of TriggerExecution AAP
*
- * @param dn The AdministrativePoint DN
+ * @param dn The AdministrativePoint Dn
* @param uuid The AdministrativePoint UUID
*/
- public TriggerExecutionAAP( DN dn, String uuid )
+ public TriggerExecutionAAP( Dn dn, String uuid )
{
super( dn, uuid, AdministrativeRole.TriggerExecutionSpecificArea );
}
Modified: directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/administrative/TriggerExecutionAdministrativePoint.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/administrative/TriggerExecutionAdministrativePoint.java?rev=1062306&r1=1062305&r2=1062306&view=diff
==============================================================================
--- directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/administrative/TriggerExecutionAdministrativePoint.java (original)
+++ directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/administrative/TriggerExecutionAdministrativePoint.java Sun Jan 23 01:17:06 2011
@@ -20,7 +20,7 @@
package org.apache.directory.server.core.administrative;
-import org.apache.directory.shared.ldap.name.DN;
+import org.apache.directory.shared.ldap.name.Dn;
import org.apache.directory.shared.ldap.subtree.AdministrativeRole;
@@ -35,11 +35,11 @@ public abstract class TriggerExecutionAd
/**
* Create an instance of TriggerExecutionAdministrativePoint
*
- * @param dn The AdministrativePoint DN
+ * @param dn The AdministrativePoint Dn
* @param uuid The AdministrativePoint UUID
* @param role The AdministrativePoint role
*/
- protected TriggerExecutionAdministrativePoint( DN dn, String uuid, AdministrativeRole role )
+ protected TriggerExecutionAdministrativePoint( Dn dn, String uuid, AdministrativeRole role )
{
super( dn, uuid, role );
}
Modified: directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/administrative/TriggerExecutionIAP.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/administrative/TriggerExecutionIAP.java?rev=1062306&r1=1062305&r2=1062306&view=diff
==============================================================================
--- directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/administrative/TriggerExecutionIAP.java (original)
+++ directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/administrative/TriggerExecutionIAP.java Sun Jan 23 01:17:06 2011
@@ -20,7 +20,7 @@
package org.apache.directory.server.core.administrative;
-import org.apache.directory.shared.ldap.name.DN;
+import org.apache.directory.shared.ldap.name.Dn;
import org.apache.directory.shared.ldap.subtree.AdministrativeRole;
@@ -34,10 +34,10 @@ public class TriggerExecutionIAP extends
/**
* Create an instance of TriggerExecution IAP
*
- * @param dn The AdministrativePoint DN
+ * @param dn The AdministrativePoint Dn
* @param uuid The AdministrativePoint UUID
*/
- public TriggerExecutionIAP( DN dn, String uuid )
+ public TriggerExecutionIAP( Dn dn, String uuid )
{
super( dn, uuid, AdministrativeRole.TriggerExecutionInnerArea );
}
Modified: directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/administrative/TriggerExecutionSAP.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/administrative/TriggerExecutionSAP.java?rev=1062306&r1=1062305&r2=1062306&view=diff
==============================================================================
--- directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/administrative/TriggerExecutionSAP.java (original)
+++ directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/administrative/TriggerExecutionSAP.java Sun Jan 23 01:17:06 2011
@@ -20,7 +20,7 @@
package org.apache.directory.server.core.administrative;
-import org.apache.directory.shared.ldap.name.DN;
+import org.apache.directory.shared.ldap.name.Dn;
import org.apache.directory.shared.ldap.subtree.AdministrativeRole;
@@ -34,10 +34,10 @@ public class TriggerExecutionSAP extends
/**
* Create an instance of TriggerExecution SAP
*
- * @param dn The AdministrativePoint DN
+ * @param dn The AdministrativePoint Dn
* @param uuid The AdministrativePoint UUID
*/
- public TriggerExecutionSAP( DN dn, String uuid )
+ public TriggerExecutionSAP( Dn dn, String uuid )
{
super( dn, uuid, AdministrativeRole.TriggerExecutionSpecificArea );
}
Modified: directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/changelog/ChangeLogSearchEngine.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/changelog/ChangeLogSearchEngine.java?rev=1062306&r1=1062305&r2=1062306&view=diff
==============================================================================
--- directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/changelog/ChangeLogSearchEngine.java (original)
+++ directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/changelog/ChangeLogSearchEngine.java Sun Jan 23 01:17:06 2011
@@ -24,7 +24,7 @@ import org.apache.directory.server.core.
import org.apache.directory.shared.ldap.cursor.Cursor;
import org.apache.directory.shared.ldap.filter.ExprNode;
import org.apache.directory.shared.ldap.ldif.ChangeType;
-import org.apache.directory.shared.ldap.name.DN;
+import org.apache.directory.shared.ldap.name.Dn;
import org.apache.directory.shared.ldap.schema.AttributeType;
import org.apache.directory.shared.ldap.schema.ObjectClass;
@@ -40,8 +40,8 @@ import org.apache.directory.shared.ldap.
* <li>find all changes</li>
* <li>find all changes before or after a revision</li>
* <li>find all changes in a revision range</li>
- * <li>find changes by LDAP namespace scope on DN</li>
- * <li>find changes by DN</li>
+ * <li>find changes by LDAP namespace scope on Dn</li>
+ * <li>find changes by Dn</li>
* <li>find changes by principal</li>
* <li>find changes by change type</li>
* <li>find changes by attribute</li>
@@ -141,24 +141,24 @@ public interface ChangeLogSearchEngine
/**
* Finds all the ChangeLogEvents on an entry.
*
- * @param dn the normalized DN of the entry to get ChangeLogEvents for
+ * @param dn the normalized Dn of the entry to get ChangeLogEvents for
* @param order the order in which to return ChangeLogEvents (ordered by revision number)
* @return the set of changes that occurred on an entry
* @throws Exception if there are failures accessing the store
*/
- Cursor<ChangeLogEvent> find( DN dn, RevisionOrder order ) throws Exception;
+ Cursor<ChangeLogEvent> find( Dn dn, RevisionOrder order ) throws Exception;
/**
* Finds all the ChangeLogEvents on an entry base and/or it's children/descendants.
*
- * @param base the normalized DN of the entry base to get ChangeLogEvents for
+ * @param base the normalized Dn of the entry base to get ChangeLogEvents for
* @param scope the scope of the search under the base similar to LDAP search scope
* @param order the order in which to return ChangeLogEvents (ordered by revision number)
* @return the set of changes that occurred on an entry and/or it's descendants depending on the scope
* @throws Exception if there are failures accessing the store
*/
- Cursor<ChangeLogEvent> find( DN base, Scope scope, RevisionOrder order ) throws Exception;
+ Cursor<ChangeLogEvent> find( Dn base, Scope scope, RevisionOrder order ) throws Exception;
/**
@@ -222,7 +222,7 @@ public interface ChangeLogSearchEngine
* <li>principal: normalized distinguishedName syntax (defaults to matching a string)</li>
* </ul>
*
- * The following are the only kinds of AVA node types allowed:
+ * The following are the only kinds of Ava node types allowed:
*
* <ul>
* <li>equality (=) </li>