You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by el...@apache.org on 2010/03/04 00:25:15 UTC
svn commit: r918766 [4/6] - in /directory/apacheds/trunk:
avl-partition/src/main/java/org/apache/directory/server/core/partition/avl/
avl-partition/src/test/java/org/apache/directory/server/core/partition/avl/
core-api/src/main/java/org/apache/director...
Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/support/HighestPrecedenceFilter.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/support/HighestPrecedenceFilter.java?rev=918766&r1=918765&r2=918766&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/support/HighestPrecedenceFilter.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/support/HighestPrecedenceFilter.java Wed Mar 3 23:25:11 2010
@@ -31,7 +31,7 @@
import org.apache.directory.shared.ldap.aci.MicroOperation;
import org.apache.directory.shared.ldap.constants.AuthenticationLevel;
import org.apache.directory.shared.ldap.entry.Value;
-import org.apache.directory.shared.ldap.name.LdapDN;
+import org.apache.directory.shared.ldap.name.DN;
import org.apache.directory.shared.ldap.schema.SchemaManager;
@@ -49,11 +49,11 @@
Collection<ACITuple> tuples,
OperationScope scope,
OperationContext opContext,
- Collection<LdapDN> userGroupNames,
- LdapDN userName,
+ Collection<DN> userGroupNames,
+ DN userName,
ServerEntry userEntry,
AuthenticationLevel authenticationLevel,
- LdapDN entryName,
+ DN entryName,
String attrId,
Value<?> attrValue,
ServerEntry entry,
Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/support/MaxImmSubFilter.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/support/MaxImmSubFilter.java?rev=918766&r1=918765&r2=918766&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/support/MaxImmSubFilter.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/support/MaxImmSubFilter.java Wed Mar 3 23:25:11 2010
@@ -48,7 +48,7 @@
import org.apache.directory.shared.ldap.filter.ExprNode;
import org.apache.directory.shared.ldap.filter.PresenceNode;
import org.apache.directory.shared.ldap.message.AliasDerefMode;
-import org.apache.directory.shared.ldap.name.LdapDN;
+import org.apache.directory.shared.ldap.name.DN;
import org.apache.directory.shared.ldap.schema.SchemaManager;
@@ -79,11 +79,11 @@
Collection<ACITuple> tuples,
OperationScope scope,
OperationContext opContext,
- Collection<LdapDN> userGroupNames,
- LdapDN userName,
+ Collection<DN> userGroupNames,
+ DN userName,
ServerEntry userEntry,
AuthenticationLevel authenticationLevel,
- LdapDN entryName,
+ DN entryName,
String attrId,
Value<?> attrValue,
ServerEntry entry,
@@ -154,7 +154,7 @@
}
- private int getImmSubCount( SchemaManager schemaManager, OperationContext opContext, LdapDN entryName ) throws Exception
+ private int getImmSubCount( SchemaManager schemaManager, OperationContext opContext, DN entryName ) throws Exception
{
int cnt = 0;
EntryFilteringCursor results = null;
@@ -162,7 +162,7 @@
try
{
SearchOperationContext searchContext = new SearchOperationContext( opContext.getSession(),
- ( LdapDN ) entryName.getPrefix( 1 ), AliasDerefMode.DEREF_ALWAYS,
+ ( DN ) entryName.getPrefix( 1 ), AliasDerefMode.DEREF_ALWAYS,
childrenFilter, childrenSearchControls );
searchContext.setByPassed( SEARCH_BYPASS );
results = opContext.getSession().getDirectoryService().getOperationManager().search( searchContext );
Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/support/MaxValueCountFilter.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/support/MaxValueCountFilter.java?rev=918766&r1=918765&r2=918766&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/support/MaxValueCountFilter.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/support/MaxValueCountFilter.java Wed Mar 3 23:25:11 2010
@@ -34,7 +34,7 @@
import org.apache.directory.shared.ldap.constants.AuthenticationLevel;
import org.apache.directory.shared.ldap.entry.EntryAttribute;
import org.apache.directory.shared.ldap.entry.Value;
-import org.apache.directory.shared.ldap.name.LdapDN;
+import org.apache.directory.shared.ldap.name.DN;
import org.apache.directory.shared.ldap.schema.SchemaManager;
@@ -52,11 +52,11 @@
Collection<ACITuple> tuples,
OperationScope scope,
OperationContext opContext,
- Collection<LdapDN> userGroupNames,
- LdapDN userName,
+ Collection<DN> userGroupNames,
+ DN userName,
ServerEntry userEntry,
AuthenticationLevel authenticationLevel,
- LdapDN entryName,
+ DN entryName,
String attrId,
Value<?> attrValue,
ServerEntry entry,
Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/support/MicroOperationFilter.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/support/MicroOperationFilter.java?rev=918766&r1=918765&r2=918766&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/support/MicroOperationFilter.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/support/MicroOperationFilter.java Wed Mar 3 23:25:11 2010
@@ -31,7 +31,7 @@
import org.apache.directory.shared.ldap.aci.MicroOperation;
import org.apache.directory.shared.ldap.constants.AuthenticationLevel;
import org.apache.directory.shared.ldap.entry.Value;
-import org.apache.directory.shared.ldap.name.LdapDN;
+import org.apache.directory.shared.ldap.name.DN;
import org.apache.directory.shared.ldap.schema.SchemaManager;
@@ -50,11 +50,11 @@
Collection<ACITuple> tuples,
OperationScope scope,
OperationContext opContext,
- Collection<LdapDN> userGroupNames,
- LdapDN userName,
+ Collection<DN> userGroupNames,
+ DN userName,
ServerEntry userEntry,
AuthenticationLevel authenticationLevel,
- LdapDN entryName,
+ DN entryName,
String attrId,
Value<?> attrValue,
ServerEntry entry,
Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/support/MostSpecificProtectedItemFilter.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/support/MostSpecificProtectedItemFilter.java?rev=918766&r1=918765&r2=918766&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/support/MostSpecificProtectedItemFilter.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/support/MostSpecificProtectedItemFilter.java Wed Mar 3 23:25:11 2010
@@ -32,7 +32,7 @@
import org.apache.directory.shared.ldap.aci.ProtectedItem;
import org.apache.directory.shared.ldap.constants.AuthenticationLevel;
import org.apache.directory.shared.ldap.entry.Value;
-import org.apache.directory.shared.ldap.name.LdapDN;
+import org.apache.directory.shared.ldap.name.DN;
import org.apache.directory.shared.ldap.schema.SchemaManager;
@@ -58,11 +58,11 @@
Collection<ACITuple> tuples,
OperationScope scope,
OperationContext opContext,
- Collection<LdapDN> userGroupNames,
- LdapDN userName,
+ Collection<DN> userGroupNames,
+ DN userName,
ServerEntry userEntry,
AuthenticationLevel authenticationLevel,
- LdapDN entryName,
+ DN entryName,
String attrId,
Value<?> attrValue,
ServerEntry entry,
Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/support/MostSpecificUserClassFilter.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/support/MostSpecificUserClassFilter.java?rev=918766&r1=918765&r2=918766&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/support/MostSpecificUserClassFilter.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/support/MostSpecificUserClassFilter.java Wed Mar 3 23:25:11 2010
@@ -32,7 +32,7 @@
import org.apache.directory.shared.ldap.aci.UserClass;
import org.apache.directory.shared.ldap.constants.AuthenticationLevel;
import org.apache.directory.shared.ldap.entry.Value;
-import org.apache.directory.shared.ldap.name.LdapDN;
+import org.apache.directory.shared.ldap.name.DN;
import org.apache.directory.shared.ldap.schema.SchemaManager;
@@ -56,11 +56,11 @@
Collection<ACITuple> tuples,
OperationScope scope,
OperationContext opContext,
- Collection<LdapDN> userGroupNames,
- LdapDN userName,
+ Collection<DN> userGroupNames,
+ DN userName,
ServerEntry userEntry,
AuthenticationLevel authenticationLevel,
- LdapDN entryName,
+ DN entryName,
String attrId,
Value<?> attrValue,
ServerEntry entry,
Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/support/RelatedProtectedItemFilter.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/support/RelatedProtectedItemFilter.java?rev=918766&r1=918765&r2=918766&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/support/RelatedProtectedItemFilter.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/support/RelatedProtectedItemFilter.java Wed Mar 3 23:25:11 2010
@@ -40,7 +40,7 @@
import org.apache.directory.shared.ldap.constants.SchemaConstants;
import org.apache.directory.shared.ldap.entry.EntryAttribute;
import org.apache.directory.shared.ldap.entry.Value;
-import org.apache.directory.shared.ldap.name.LdapDN;
+import org.apache.directory.shared.ldap.name.DN;
import org.apache.directory.shared.ldap.schema.AttributeType;
import org.apache.directory.shared.ldap.schema.SchemaManager;
import org.apache.directory.shared.ldap.schema.registries.OidRegistry;
@@ -75,11 +75,11 @@
Collection<ACITuple> tuples,
OperationScope scope,
OperationContext opContext,
- Collection<LdapDN> userGroupNames,
- LdapDN userName,
+ Collection<DN> userGroupNames,
+ DN userName,
ServerEntry userEntry,
AuthenticationLevel authenticationLevel,
- LdapDN entryName,
+ DN entryName,
String attrId,
Value<?> attrValue,
ServerEntry entry,
@@ -106,7 +106,7 @@
}
- private boolean isRelated( ACITuple tuple, OperationScope scope, LdapDN userName, LdapDN entryName, String attrId,
+ private boolean isRelated( ACITuple tuple, OperationScope scope, DN userName, DN entryName, String attrId,
Value<?> attrValue, ServerEntry entry ) throws NamingException, InternalError
{
String oid = null;
Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/support/RelatedUserClassFilter.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/support/RelatedUserClassFilter.java?rev=918766&r1=918765&r2=918766&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/support/RelatedUserClassFilter.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/support/RelatedUserClassFilter.java Wed Mar 3 23:25:11 2010
@@ -34,7 +34,7 @@
import org.apache.directory.shared.ldap.aci.UserClass;
import org.apache.directory.shared.ldap.constants.AuthenticationLevel;
import org.apache.directory.shared.ldap.entry.Value;
-import org.apache.directory.shared.ldap.name.LdapDN;
+import org.apache.directory.shared.ldap.name.DN;
import org.apache.directory.shared.ldap.schema.SchemaManager;
import org.apache.directory.shared.ldap.subtree.SubtreeSpecification;
@@ -48,7 +48,7 @@
*/
public class RelatedUserClassFilter implements ACITupleFilter
{
- private static final LdapDN ROOTDSE_NAME = LdapDN.EMPTY_LDAPDN;
+ private static final DN ROOTDSE_NAME = DN.EMPTY_DN;
private final SubtreeEvaluator subtreeEvaluator;
@@ -64,11 +64,11 @@
Collection<ACITuple> tuples,
OperationScope scope,
OperationContext opContext,
- Collection<LdapDN> userGroupNames,
- LdapDN userName,
+ Collection<DN> userGroupNames,
+ DN userName,
ServerEntry userEntry,
AuthenticationLevel authenticationLevel,
- LdapDN entryName,
+ DN entryName,
String attrId,
Value<?> attrValue,
ServerEntry entry,
@@ -116,8 +116,8 @@
}
- private boolean isRelated( Collection<LdapDN> userGroupNames, LdapDN userName, ServerEntry userEntry,
- LdapDN entryName, Collection<UserClass> userClasses ) throws NamingException
+ private boolean isRelated( Collection<DN> userGroupNames, DN userName, ServerEntry userEntry,
+ DN entryName, Collection<UserClass> userClasses ) throws NamingException
{
for ( UserClass userClass : userClasses )
{
@@ -151,7 +151,7 @@
{
UserClass.UserGroup userGroupUserClass = ( UserClass.UserGroup ) userClass;
- for ( LdapDN userGroupName : userGroupNames )
+ for ( DN userGroupName : userGroupNames )
{
if ( userGroupName != null && userGroupUserClass.getNames().contains( userGroupName ) )
{
@@ -177,7 +177,7 @@
}
- private boolean matchUserClassSubtree( LdapDN userName, ServerEntry userEntry, UserClass.Subtree subtree )
+ private boolean matchUserClassSubtree( DN userName, ServerEntry userEntry, UserClass.Subtree subtree )
throws NamingException
{
for ( SubtreeSpecification subtreeSpec : subtree.getSubtreeSpecifications() )
Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/support/RestrictedByFilter.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/support/RestrictedByFilter.java?rev=918766&r1=918765&r2=918766&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/support/RestrictedByFilter.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/support/RestrictedByFilter.java Wed Mar 3 23:25:11 2010
@@ -34,7 +34,7 @@
import org.apache.directory.shared.ldap.constants.AuthenticationLevel;
import org.apache.directory.shared.ldap.entry.EntryAttribute;
import org.apache.directory.shared.ldap.entry.Value;
-import org.apache.directory.shared.ldap.name.LdapDN;
+import org.apache.directory.shared.ldap.name.DN;
import org.apache.directory.shared.ldap.schema.SchemaManager;
@@ -52,11 +52,11 @@
Collection<ACITuple> tuples,
OperationScope scope,
OperationContext opContext,
- Collection<LdapDN> userGroupNames,
- LdapDN userName,
+ Collection<DN> userGroupNames,
+ DN userName,
ServerEntry userEntry,
AuthenticationLevel authenticationLevel,
- LdapDN entryName,
+ DN entryName,
String attrId,
Value<?> attrValue,
ServerEntry entry,
Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/changelog/ChangeLogInterceptor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/changelog/ChangeLogInterceptor.java?rev=918766&r1=918765&r2=918766&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/changelog/ChangeLogInterceptor.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/changelog/ChangeLogInterceptor.java Wed Mar 3 23:25:11 2010
@@ -48,7 +48,7 @@
import org.apache.directory.shared.ldap.ldif.ChangeType;
import org.apache.directory.shared.ldap.ldif.LdifEntry;
import org.apache.directory.shared.ldap.ldif.LdifRevertor;
-import org.apache.directory.shared.ldap.name.LdapDN;
+import org.apache.directory.shared.ldap.name.DN;
import org.apache.directory.shared.ldap.name.RDN;
import org.apache.directory.shared.ldap.schema.AttributeType;
import org.slf4j.Logger;
@@ -195,7 +195,7 @@
*/
private ServerEntry getAttributes( OperationContext opContext ) throws Exception
{
- LdapDN dn = opContext.getDn();
+ DN dn = opContext.getDn();
ClonedServerEntry serverEntry;
// @todo make sure we're not putting in operational attributes that cannot be user modified
Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/collective/CollectiveAttributeInterceptor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/collective/CollectiveAttributeInterceptor.java?rev=918766&r1=918765&r2=918766&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/collective/CollectiveAttributeInterceptor.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/collective/CollectiveAttributeInterceptor.java Wed Mar 3 23:25:11 2010
@@ -45,7 +45,7 @@
import org.apache.directory.shared.ldap.constants.SchemaConstants;
import org.apache.directory.shared.ldap.entry.EntryAttribute;
import org.apache.directory.shared.ldap.entry.Value;
-import org.apache.directory.shared.ldap.name.LdapDN;
+import org.apache.directory.shared.ldap.name.DN;
import org.apache.directory.shared.ldap.schema.AttributeType;
import org.apache.directory.shared.ldap.schema.SchemaManager;
@@ -80,11 +80,11 @@
public boolean accept( SearchingOperationContext operation, ClonedServerEntry result )
throws Exception
{
- LdapDN name = result.getDn();
+ DN name = result.getDn();
if ( name.isNormalized() == false )
{
- name = LdapDN.normalize( name, schemaManager.getNormalizerMapping() );
+ name = DN.normalize( name, schemaManager.getNormalizerMapping() );
}
String[] retAttrs = operation.getSearchControls().getReturningAttributes();
@@ -197,7 +197,7 @@
for ( Value<?> value:collectiveAttributeSubentries )
{
String subentryDnStr = value.getString();
- LdapDN subentryDn = new LdapDN( subentryDnStr );
+ DN subentryDn = new DN( subentryDnStr );
/*
* TODO - Instead of hitting disk here can't we leverage the
Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/collective/CollectiveAttributesSchemaChecker.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/collective/CollectiveAttributesSchemaChecker.java?rev=918766&r1=918765&r2=918766&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/collective/CollectiveAttributesSchemaChecker.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/collective/CollectiveAttributesSchemaChecker.java Wed Mar 3 23:25:11 2010
@@ -38,7 +38,7 @@
import org.apache.directory.shared.ldap.exception.LdapInvalidAttributeIdentifierException;
import org.apache.directory.shared.ldap.exception.LdapSchemaViolationException;
import org.apache.directory.shared.ldap.message.ResultCodeEnum;
-import org.apache.directory.shared.ldap.name.LdapDN;
+import org.apache.directory.shared.ldap.name.DN;
import org.apache.directory.shared.ldap.schema.AttributeType;
import org.apache.directory.shared.ldap.schema.SchemaManager;
import org.apache.directory.shared.ldap.schema.SchemaUtils;
@@ -61,7 +61,7 @@
this.schemaManager = schemaManager;
}
- /* package scope*/ void checkAdd( LdapDN normName, ServerEntry entry ) throws Exception
+ /* package scope*/ void checkAdd( DN normName, ServerEntry entry ) throws Exception
{
if ( entry.hasObjectClass( SchemaConstants.COLLECTIVE_ATTRIBUTE_SUBENTRY_OC ) )
{
@@ -78,7 +78,7 @@
}
- public void checkModify( OperationContext opContext, LdapDN normName, List<Modification> mods ) throws Exception
+ public void checkModify( OperationContext opContext, DN normName, List<Modification> mods ) throws Exception
{
ServerEntry originalEntry = opContext.lookup( normName, ByPassConstants.LOOKUP_BYPASS );
ServerEntry targetEntry = (ServerEntry)SchemaUtils.getTargetEntry( mods, originalEntry );
Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/event/EventInterceptor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/event/EventInterceptor.java?rev=918766&r1=918765&r2=918766&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/event/EventInterceptor.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/event/EventInterceptor.java Wed Mar 3 23:25:11 2010
@@ -44,7 +44,7 @@
import org.apache.directory.server.core.normalization.FilterNormalizingVisitor;
import org.apache.directory.server.core.partition.ByPassConstants;
import org.apache.directory.shared.ldap.filter.ExprNode;
-import org.apache.directory.shared.ldap.name.LdapDN;
+import org.apache.directory.shared.ldap.name.DN;
import org.apache.directory.shared.ldap.name.NameComponentNormalizer;
import org.apache.directory.shared.ldap.schema.SchemaManager;
import org.apache.directory.shared.ldap.schema.normalizers.ConcreteNameComponentNormalizer;
@@ -290,7 +290,7 @@
}
- List<RegistrationEntry> getSelectingRegistrations( LdapDN name, ServerEntry entry ) throws Exception
+ List<RegistrationEntry> getSelectingRegistrations( DN name, ServerEntry entry ) throws Exception
{
if ( registrations.isEmpty() )
{
Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/event/ScopeEvaluator.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/event/ScopeEvaluator.java?rev=918766&r1=918765&r2=918766&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/event/ScopeEvaluator.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/event/ScopeEvaluator.java Wed Mar 3 23:25:11 2010
@@ -26,7 +26,7 @@
import org.apache.directory.server.i18n.I18n;
import org.apache.directory.shared.ldap.filter.ExprNode;
import org.apache.directory.shared.ldap.filter.ScopeNode;
-import org.apache.directory.shared.ldap.name.LdapDN;
+import org.apache.directory.shared.ldap.name.DN;
/**
@@ -57,8 +57,8 @@
case ONELEVEL:
if ( dn.endsWith( snode.getBaseDn() ) )
{
- LdapDN candidateDn = new LdapDN( dn );
- LdapDN scopeDn = new LdapDN( snode.getBaseDn() );
+ DN candidateDn = new DN( dn );
+ DN scopeDn = new DN( snode.getBaseDn() );
return ( scopeDn.size() + 1 ) == candidateDn.size();
}
Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/exception/ExceptionInterceptor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/exception/ExceptionInterceptor.java?rev=918766&r1=918765&r2=918766&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/exception/ExceptionInterceptor.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/exception/ExceptionInterceptor.java Wed Mar 3 23:25:11 2010
@@ -61,7 +61,7 @@
import org.apache.directory.shared.ldap.exception.LdapNamingException;
import org.apache.directory.shared.ldap.exception.LdapOperationNotSupportedException;
import org.apache.directory.shared.ldap.message.ResultCodeEnum;
-import org.apache.directory.shared.ldap.name.LdapDN;
+import org.apache.directory.shared.ldap.name.DN;
/**
@@ -79,7 +79,7 @@
{
private PartitionNexus nexus;
private DirectoryService directoryService;
- private LdapDN subschemSubentryDn;
+ private DN subschemSubentryDn;
/**
@@ -119,7 +119,7 @@
this.directoryService = directoryService;
nexus = directoryService.getPartitionNexus();
Value<?> attr = nexus.getRootDSE( null ).get( SchemaConstants.SUBSCHEMA_SUBENTRY_AT ).get();
- subschemSubentryDn = new LdapDN( attr.getString() );
+ subschemSubentryDn = new DN( attr.getString() );
subschemSubentryDn.normalize( directoryService.getSchemaManager().getNormalizerMapping() );
}
@@ -135,7 +135,7 @@
public void add( NextInterceptor nextInterceptor, AddOperationContext opContext )
throws Exception
{
- LdapDN name = opContext.getDn();
+ DN name = opContext.getDn();
if ( subschemSubentryDn.getNormName().equals( name.getNormName() ) )
{
@@ -146,11 +146,11 @@
if ( nextInterceptor.hasEntry( new EntryOperationContext( opContext.getSession(), name ) ) )
{
LdapNameAlreadyBoundException ne = new LdapNameAlreadyBoundException( I18n.err( I18n.ERR_250, name.getName() ) );
- ne.setResolvedName( new LdapDN( name.getName() ) );
+ ne.setResolvedName( new DN( name.getName() ) );
throw ne;
}
- LdapDN suffix = nexus.getSuffix( new GetSuffixOperationContext( this.directoryService.getAdminSession(),
+ DN suffix = nexus.getSuffix( new GetSuffixOperationContext( this.directoryService.getAdminSession(),
name ) );
// we're adding the suffix entry so just ignore stuff to mess with the parent
@@ -160,7 +160,7 @@
return;
}
- LdapDN parentDn = ( LdapDN ) name.clone();
+ DN parentDn = ( DN ) name.clone();
parentDn.remove( name.size() - 1 );
// check if we're trying to add to a parent that is an alias
@@ -185,7 +185,7 @@
{
LdapNameNotFoundException e2 = new LdapNameNotFoundException( I18n.err( I18n.ERR_251,
parentDn.getName() ) );
- e2.setResolvedName( new LdapDN( nexus.getMatchedName(
+ e2.setResolvedName( new DN( nexus.getMatchedName(
new GetMatchedNameOperationContext( opContext.getSession(), parentDn ) ).getName() ) );
throw e2;
}
@@ -197,7 +197,7 @@
String msg = I18n.err( I18n.ERR_252, name.getName() );
ResultCodeEnum rc = ResultCodeEnum.ALIAS_PROBLEM;
LdapNamingException e = new LdapNamingException( msg, rc );
- e.setResolvedName( new LdapDN( parentDn.getName() ) );
+ e.setResolvedName( new DN( parentDn.getName() ) );
throw e;
}
else
@@ -219,7 +219,7 @@
*/
public void delete( NextInterceptor nextInterceptor, DeleteOperationContext opContext ) throws Exception
{
- LdapDN name = opContext.getDn();
+ DN name = opContext.getDn();
if ( name.getNormName().equalsIgnoreCase( subschemSubentryDn.getNormName() ) )
{
@@ -245,7 +245,7 @@
if ( hasChildren )
{
LdapContextNotEmptyException e = new LdapContextNotEmptyException();
- e.setResolvedName( new LdapDN( name.getName() ) );
+ e.setResolvedName( new DN( name.getName() ) );
throw e;
}
@@ -363,7 +363,7 @@
public void rename( NextInterceptor nextInterceptor, RenameOperationContext opContext )
throws Exception
{
- LdapDN dn = opContext.getDn();
+ DN dn = opContext.getDn();
if ( dn.equals( subschemSubentryDn ) )
{
@@ -378,18 +378,18 @@
// on the server
LdapNameNotFoundException ldnfe;
ldnfe = new LdapNameNotFoundException( I18n.err( I18n.ERR_256, dn.getName() ) );
- ldnfe.setResolvedName( new LdapDN( dn.getName() ) );
+ ldnfe.setResolvedName( new DN( dn.getName() ) );
throw ldnfe;
}
// check to see if target entry exists
- LdapDN newDn = opContext.getNewDn();
+ DN newDn = opContext.getNewDn();
if ( nextInterceptor.hasEntry( new EntryOperationContext( opContext.getSession(), newDn ) ) )
{
LdapNameAlreadyBoundException e;
e = new LdapNameAlreadyBoundException( I18n.err( I18n.ERR_257, newDn.getName() ) );
- e.setResolvedName( new LdapDN( newDn.getName() ) );
+ e.setResolvedName( new DN( newDn.getName() ) );
throw e;
}
@@ -412,8 +412,8 @@
*/
public void move( NextInterceptor nextInterceptor, MoveOperationContext opContext ) throws Exception
{
- LdapDN oriChildName = opContext.getDn();
- LdapDN newParentName = opContext.getParent();
+ DN oriChildName = opContext.getDn();
+ DN newParentName = opContext.getParent();
if ( oriChildName.getNormName().equalsIgnoreCase( subschemSubentryDn.getNormName() ) )
{
@@ -431,19 +431,19 @@
// check to see if target entry exists
String rdn = oriChildName.get( oriChildName.size() - 1 );
- LdapDN target = ( LdapDN ) newParentName.clone();
+ DN target = ( DN ) newParentName.clone();
target.add( rdn );
if ( nextInterceptor.hasEntry( new EntryOperationContext( opContext.getSession(), target ) ) )
{
// we must calculate the resolved name using the user provided Rdn value
- String upRdn = new LdapDN( oriChildName.getName() ).get( oriChildName.size() - 1 );
- LdapDN upTarget = ( LdapDN ) newParentName.clone();
+ String upRdn = new DN( oriChildName.getName() ).get( oriChildName.size() - 1 );
+ DN upTarget = ( DN ) newParentName.clone();
upTarget.add( upRdn );
LdapNameAlreadyBoundException e;
e = new LdapNameAlreadyBoundException( I18n.err( I18n.ERR_257, upTarget.getName() ) );
- e.setResolvedName( new LdapDN( upTarget.getName() ) );
+ e.setResolvedName( new DN( upTarget.getName() ) );
throw e;
}
@@ -466,8 +466,8 @@
*/
public void moveAndRename( NextInterceptor nextInterceptor, MoveAndRenameOperationContext opContext ) throws Exception
{
- LdapDN oriChildName = opContext.getDn();
- LdapDN parent = opContext.getParent();
+ DN oriChildName = opContext.getDn();
+ DN parent = opContext.getParent();
if ( oriChildName.getNormName().equalsIgnoreCase( subschemSubentryDn.getNormName() ) )
{
@@ -484,18 +484,18 @@
assertHasEntry( nextInterceptor, opContext, msg, parent );
// check to see if target entry exists
- LdapDN target = ( LdapDN ) parent.clone();
+ DN target = ( DN ) parent.clone();
target.add( opContext.getNewRdn() );
if ( nextInterceptor.hasEntry( new EntryOperationContext( opContext.getSession(), target ) ) )
{
// we must calculate the resolved name using the user provided Rdn value
- LdapDN upTarget = ( LdapDN ) parent.clone();
+ DN upTarget = ( DN ) parent.clone();
upTarget.add( opContext.getNewRdn() );
LdapNameAlreadyBoundException e;
e = new LdapNameAlreadyBoundException( I18n.err( I18n.ERR_257, upTarget.getName() ) );
- e.setResolvedName( new LdapDN( upTarget.getName() ) );
+ e.setResolvedName( new DN( upTarget.getName() ) );
throw e;
}
@@ -517,7 +517,7 @@
*/
public EntryFilteringCursor search( NextInterceptor nextInterceptor, SearchOperationContext opContext ) throws Exception
{
- LdapDN base = opContext.getDn();
+ DN base = opContext.getDn();
try
{
@@ -553,7 +553,7 @@
* @param nextInterceptor the next interceptor in the chain
*/
private void assertHasEntry( NextInterceptor nextInterceptor, OperationContext opContext,
- String msg, LdapDN dn ) throws Exception
+ String msg, DN dn ) throws Exception
{
if ( subschemSubentryDn.getNormName().equals( dn.getNormName() ) )
{
@@ -574,7 +574,7 @@
}
e.setResolvedName(
- new LdapDN(
+ new DN(
opContext.getSession().getDirectoryService().getOperationManager().getMatchedName(
new GetMatchedNameOperationContext( opContext.getSession(), dn ) ).getName() ) );
throw e;
Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/normalization/NormalizationInterceptor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/normalization/NormalizationInterceptor.java?rev=918766&r1=918765&r2=918766&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/normalization/NormalizationInterceptor.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/normalization/NormalizationInterceptor.java Wed Mar 3 23:25:11 2010
@@ -49,7 +49,7 @@
import org.apache.directory.shared.ldap.entry.client.ClientStringValue;
import org.apache.directory.shared.ldap.filter.ExprNode;
import org.apache.directory.shared.ldap.name.AVA;
-import org.apache.directory.shared.ldap.name.LdapDN;
+import org.apache.directory.shared.ldap.name.DN;
import org.apache.directory.shared.ldap.name.NameComponentNormalizer;
import org.apache.directory.shared.ldap.name.RDN;
import org.apache.directory.shared.ldap.schema.AttributeType;
@@ -171,7 +171,7 @@
public void moveAndRename( NextInterceptor nextInterceptor, MoveAndRenameOperationContext opContext )
throws Exception
{
- LdapDN rdn = new LdapDN();
+ DN rdn = new DN();
rdn.add( opContext.getNewRdn() );
rdn.normalize( schemaManager.getNormalizerMapping() );
opContext.setNewRdn( rdn.getRdn() );
@@ -275,7 +275,7 @@
/**
* {@inheritDoc}
*/
- public LdapDN getMatchedName ( NextInterceptor nextInterceptor, GetMatchedNameOperationContext opContext ) throws Exception
+ public DN getMatchedName ( NextInterceptor nextInterceptor, GetMatchedNameOperationContext opContext ) throws Exception
{
opContext.getDn().normalize( schemaManager.getNormalizerMapping() );
return nextInterceptor.getMatchedName( opContext );
@@ -285,7 +285,7 @@
/**
* {@inheritDoc}
*/
- public LdapDN getSuffix ( NextInterceptor nextInterceptor, GetSuffixOperationContext opContext ) throws Exception
+ public DN getSuffix ( NextInterceptor nextInterceptor, GetSuffixOperationContext opContext ) throws Exception
{
opContext.getDn().normalize( schemaManager.getNormalizerMapping() );
return nextInterceptor.getSuffix( opContext );
@@ -347,7 +347,7 @@
* @param dn the DN
* @param entry the entry
*/
- private void addRdnAttributesToEntry( LdapDN dn, ServerEntry entry ) throws Exception
+ private void addRdnAttributesToEntry( DN dn, ServerEntry entry ) throws Exception
{
if ( dn == null || entry == null )
{
Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/operational/OperationalAttributeInterceptor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/operational/OperationalAttributeInterceptor.java?rev=918766&r1=918765&r2=918766&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/operational/OperationalAttributeInterceptor.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/operational/OperationalAttributeInterceptor.java Wed Mar 3 23:25:11 2010
@@ -58,7 +58,7 @@
import org.apache.directory.shared.ldap.exception.LdapSchemaViolationException;
import org.apache.directory.shared.ldap.message.ResultCodeEnum;
import org.apache.directory.shared.ldap.name.AVA;
-import org.apache.directory.shared.ldap.name.LdapDN;
+import org.apache.directory.shared.ldap.name.DN;
import org.apache.directory.shared.ldap.name.RDN;
import org.apache.directory.shared.ldap.schema.AttributeType;
import org.apache.directory.shared.ldap.schema.SchemaManager;
@@ -114,7 +114,7 @@
private DirectoryService service;
- private LdapDN subschemaSubentryDn;
+ private DN subschemaSubentryDn;
/** The schemaManager */
private SchemaManager schemaManager;
@@ -140,7 +140,7 @@
// stuff for dealing with subentries (garbage for now)
Value<?> subschemaSubentry = service.getPartitionNexus()
.getRootDSE( null ).get( SchemaConstants.SUBSCHEMA_SUBENTRY_AT ).get();
- subschemaSubentryDn = new LdapDN( subschemaSubentry.getString() );
+ subschemaSubentryDn = new DN( subschemaSubentry.getString() );
subschemaSubentryDn.normalize( schemaManager.getNormalizerMapping() );
CREATE_TIMESTAMP_ATTRIBUTE_TYPE = schemaManager.lookupAttributeTypeRegistry( SchemaConstants.CREATE_TIMESTAMP_AT );
@@ -337,7 +337,7 @@
{
nextInterceptor.rename( opContext );
- LdapDN newDn = opContext.getNewDn();
+ DN newDn = opContext.getNewDn();
// add operational attributes after call in case the operation fails
ServerEntry serverEntry = new DefaultServerEntry( schemaManager, newDn );
@@ -475,7 +475,7 @@
private void filter( LookupOperationContext lookupContext, ServerEntry entry ) throws Exception
{
- LdapDN dn = lookupContext.getDn();
+ DN dn = lookupContext.getDn();
List<String> ids = lookupContext.getAttrsId();
// still need to protect against returning op attrs when ids is null
@@ -514,7 +514,7 @@
if ( attr != null )
{
- LdapDN creatorsName = new LdapDN( attr.getString() );
+ DN creatorsName = new DN( attr.getString() );
attr.clear();
attr.add( denormalizeTypes( creatorsName ).getName() );
@@ -524,7 +524,7 @@
if ( attr != null )
{
- LdapDN modifiersName = new LdapDN( attr.getString() );
+ DN modifiersName = new DN( attr.getString() );
attr.clear();
attr.add( denormalizeTypes( modifiersName ).getName() );
@@ -534,7 +534,7 @@
if ( attr != null )
{
- LdapDN modifiersName = new LdapDN( attr.getString() );
+ DN modifiersName = new DN( attr.getString() );
attr.clear();
attr.add( denormalizeTypes( modifiersName ).getName() );
@@ -551,9 +551,9 @@
* @return the distinuished name denormalized
* @throws Exception if there are problems denormalizing
*/
- public LdapDN denormalizeTypes( LdapDN dn ) throws Exception
+ public DN denormalizeTypes( DN dn ) throws Exception
{
- LdapDN newDn = new LdapDN();
+ DN newDn = new DN();
for ( int ii = 0; ii < dn.size(); ii++ )
{
Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/partition/DefaultPartitionNexus.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/partition/DefaultPartitionNexus.java?rev=918766&r1=918765&r2=918766&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/partition/DefaultPartitionNexus.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/partition/DefaultPartitionNexus.java Wed Mar 3 23:25:11 2010
@@ -93,7 +93,7 @@
import org.apache.directory.shared.ldap.filter.PresenceNode;
import org.apache.directory.shared.ldap.filter.SearchScope;
import org.apache.directory.shared.ldap.message.extended.NoticeOfDisconnect;
-import org.apache.directory.shared.ldap.name.LdapDN;
+import org.apache.directory.shared.ldap.name.DN;
import org.apache.directory.shared.ldap.schema.AttributeType;
import org.apache.directory.shared.ldap.schema.Normalizer;
import org.apache.directory.shared.ldap.schema.SchemaManager;
@@ -223,7 +223,7 @@
schemaManager = directoryService.getSchemaManager();
// Initialize and normalize the localy used DNs
- LdapDN adminDn = new LdapDN( ServerDNConstants.ADMIN_SYSTEM_DN );
+ DN adminDn = new DN( ServerDNConstants.ADMIN_SYSTEM_DN );
adminDn.normalize( schemaManager.getNormalizerMapping() );
initializeSystemPartition( directoryService );
@@ -303,7 +303,7 @@
// Add root context entry for system partition
- LdapDN systemSuffixDn = new LdapDN( ServerDNConstants.SYSTEM_DN );
+ DN systemSuffixDn = new DN( ServerDNConstants.SYSTEM_DN );
systemSuffixDn.normalize( schemaManager.getNormalizerMapping() );
ServerEntry systemEntry = new DefaultServerEntry( schemaManager, systemSuffixDn );
@@ -321,7 +321,7 @@
systemEntry.add( SchemaConstants.ENTRY_UUID_AT, UUID.randomUUID().toString() );
systemEntry.put( NamespaceTools.getRdnAttribute( ServerDNConstants.SYSTEM_DN ),
NamespaceTools.getRdnValue( ServerDNConstants.SYSTEM_DN ) );
- LdapDN adminDn = new LdapDN( ServerDNConstants.ADMIN_SYSTEM_DN_NORMALIZED );
+ DN adminDn = new DN( ServerDNConstants.ADMIN_SYSTEM_DN_NORMALIZED );
adminDn.normalize( schemaManager.getNormalizerMapping() );
CoreSession adminSession = new DefaultCoreSession(
new LdapPrincipal( adminDn, AuthenticationLevel.STRONG ), directoryService );
@@ -378,12 +378,12 @@
{
try
{
- LdapDN adminDn = new LdapDN( ServerDNConstants.ADMIN_SYSTEM_DN_NORMALIZED );
+ DN adminDn = new DN( ServerDNConstants.ADMIN_SYSTEM_DN_NORMALIZED );
adminDn.normalize( schemaManager.getNormalizerMapping() );
CoreSession adminSession = new DefaultCoreSession(
new LdapPrincipal( adminDn, AuthenticationLevel.STRONG ), directoryService );
removeContextPartition( new RemoveContextPartitionOperationContext(
- adminSession, new LdapDN( suffix ) ) );
+ adminSession, new DN( suffix ) ) );
}
catch ( Exception e )
{
@@ -434,9 +434,9 @@
/* (non-Javadoc)
* @see org.apache.directory.server.core.partition.PartitionNexus#getSuffixDn()
*/
- public LdapDN getSuffixDn()
+ public DN getSuffixDn()
{
- return LdapDN.EMPTY_LDAPDN;
+ return DN.EMPTY_DN;
}
@@ -593,7 +593,7 @@
*/
public boolean hasEntry( EntryOperationContext opContext ) throws Exception
{
- LdapDN dn = opContext.getDn();
+ DN dn = opContext.getDn();
if ( IS_DEBUG )
{
@@ -625,7 +625,7 @@
*/
public ClonedServerEntry lookup( LookupOperationContext opContext ) throws Exception
{
- LdapDN dn = opContext.getDn();
+ DN dn = opContext.getDn();
if ( dn.size() == 0 )
{
@@ -756,7 +756,7 @@
// return nothing
if ( noAttribute )
{
- ServerEntry serverEntry = new DefaultServerEntry( schemaManager, LdapDN.EMPTY_LDAPDN );
+ ServerEntry serverEntry = new DefaultServerEntry( schemaManager, DN.EMPTY_DN );
return new BaseEntryFilteringCursor( new SingletonCursor<ServerEntry>( serverEntry ), searchOperationContext );
}
@@ -767,7 +767,7 @@
return new BaseEntryFilteringCursor( new SingletonCursor<ServerEntry>( rootDSE ), searchOperationContext );
}
- ServerEntry serverEntry = new DefaultServerEntry( schemaManager, LdapDN.EMPTY_LDAPDN );
+ ServerEntry serverEntry = new DefaultServerEntry( schemaManager, DN.EMPTY_DN );
ServerEntry rootDSE = getRootDSE( new GetRootDSEOperationContext( searchOperationContext.getSession() ) );
@@ -798,7 +798,7 @@
*/
public EntryFilteringCursor search( SearchOperationContext opContext ) throws Exception
{
- LdapDN base = opContext.getDn();
+ DN base = opContext.getDn();
SearchControls searchCtls = opContext.getSearchControls();
ExprNode filter = opContext.getFilter();
@@ -918,7 +918,7 @@
synchronized ( partitionLookupTree )
{
- LdapDN partitionSuffix = partition.getSuffixDn();
+ DN partitionSuffix = partition.getSuffixDn();
if ( partitionSuffix == null )
{
@@ -999,9 +999,9 @@
/* (non-Javadoc)
- * @see org.apache.directory.server.core.partition.PartitionNexus#getPartition(org.apache.directory.shared.ldap.name.LdapDN)
+ * @see org.apache.directory.server.core.partition.PartitionNexus#getPartition(org.apache.directory.shared.ldap.name.DN)
*/
- public Partition getPartition( LdapDN dn ) throws Exception
+ public Partition getPartition( DN dn ) throws Exception
{
Partition parent = partitionLookupTree.getParentElement( dn );
@@ -1019,9 +1019,9 @@
/* (non-Javadoc)
* @see org.apache.directory.server.core.partition.PartitionNexus#getMatchedName(org.apache.directory.server.core.interceptor.context.GetMatchedNameOperationContext)
*/
- public LdapDN getMatchedName( GetMatchedNameOperationContext matchedNameContext ) throws Exception
+ public DN getMatchedName( GetMatchedNameOperationContext matchedNameContext ) throws Exception
{
- LdapDN dn = ( LdapDN ) matchedNameContext.getDn().clone();
+ DN dn = ( DN ) matchedNameContext.getDn().clone();
while ( dn.size() > 0 )
{
@@ -1040,7 +1040,7 @@
/* (non-Javadoc)
* @see org.apache.directory.server.core.partition.PartitionNexus#getSuffix(org.apache.directory.server.core.interceptor.context.GetSuffixOperationContext)
*/
- public LdapDN getSuffix( GetSuffixOperationContext getSuffixContext ) throws Exception
+ public DN getSuffix( GetSuffixOperationContext getSuffixContext ) throws Exception
{
Partition backend = getPartition( getSuffixContext.getDn() );
return backend.getSuffixDn();
Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/prefs/PreferencesUtils.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/prefs/PreferencesUtils.java?rev=918766&r1=918765&r2=918766&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/prefs/PreferencesUtils.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/prefs/PreferencesUtils.java Wed Mar 3 23:25:11 2010
@@ -24,7 +24,7 @@
import javax.naming.NamingException;
import org.apache.directory.server.constants.ServerDNConstants;
-import org.apache.directory.shared.ldap.name.LdapDN;
+import org.apache.directory.shared.ldap.name.DN;
/**
@@ -45,7 +45,7 @@
*/
public static Name toSysDn( String absPrefPath ) throws NamingException
{
- LdapDN dn = new LdapDN( ServerDNConstants.SYSPREFROOT_SYSTEM_DN );
+ DN dn = new DN( ServerDNConstants.SYSPREFROOT_SYSTEM_DN );
String[] comps = absPrefPath.split( "/" );
Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/prefs/ServerSystemPreferences.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/prefs/ServerSystemPreferences.java?rev=918766&r1=918765&r2=918766&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/prefs/ServerSystemPreferences.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/prefs/ServerSystemPreferences.java Wed Mar 3 23:25:11 2010
@@ -45,7 +45,7 @@
import org.apache.directory.shared.ldap.entry.Modification;
import org.apache.directory.shared.ldap.entry.ModificationOperation;
import org.apache.directory.shared.ldap.message.AliasDerefMode;
-import org.apache.directory.shared.ldap.name.LdapDN;
+import org.apache.directory.shared.ldap.name.DN;
import org.apache.directory.shared.ldap.schema.AttributeType;
import org.apache.directory.shared.ldap.util.PreferencesDictionary;
@@ -69,7 +69,7 @@
/** maps changes based on key: key->list of mods (on same key) */
private HashMap<String, List<Modification>> keyToChange = new HashMap<String, List<Modification>>( 3 );
- private LdapDN dn;
+ private DN dn;
private DirectoryService directoryService;
@@ -86,7 +86,7 @@
try
{
- dn = new LdapDN( "prefNodeName=sysPrefRoot,ou=system" );
+ dn = new DN( "prefNodeName=sysPrefRoot,ou=system" );
}
catch ( InvalidNameException e )
{
@@ -113,10 +113,10 @@
super( parent, name );
this.directoryService = parent.directoryService;
- LdapDN parentDn = ( ( ServerSystemPreferences ) parent() ).dn;
+ DN parentDn = ( ( ServerSystemPreferences ) parent() ).dn;
try
{
- dn = new LdapDN( "prefNodeName=" + name + "," + parentDn.getName() );
+ dn = new DN( "prefNodeName=" + name + "," + parentDn.getName() );
dn.normalize( directoryService.getSchemaManager().getNormalizerMapping() );
if ( ! directoryService.getAdminSession().exists( dn ) )
Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/referral/ReferralInterceptor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/referral/ReferralInterceptor.java?rev=918766&r1=918765&r2=918766&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/referral/ReferralInterceptor.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/referral/ReferralInterceptor.java Wed Mar 3 23:25:11 2010
@@ -45,7 +45,7 @@
import org.apache.directory.shared.ldap.entry.EntryAttribute;
import org.apache.directory.shared.ldap.entry.Value;
import org.apache.directory.shared.ldap.filter.SearchScope;
-import org.apache.directory.shared.ldap.name.LdapDN;
+import org.apache.directory.shared.ldap.name.DN;
import org.apache.directory.shared.ldap.schema.SchemaManager;
import org.apache.directory.shared.ldap.util.LdapURL;
import org.apache.directory.shared.ldap.util.StringTools;
@@ -132,7 +132,7 @@
throw new NamingException( message );
}
- LdapDN dn = ldapUrl.getDn();
+ DN dn = ldapUrl.getDn();
if ( ( dn == null ) || dn.isEmpty() )
{
@@ -209,7 +209,7 @@
directoryService.setReferralManager( referralManager );
Value<?> subschemaSubentry = nexus.getRootDSE( null ).get( SchemaConstants.SUBSCHEMA_SUBENTRY_AT ).get();
- LdapDN subschemaSubentryDn = new LdapDN( subschemaSubentry.getString() );
+ DN subschemaSubentryDn = new DN( subschemaSubentry.getString() );
subschemaSubentryDn.normalize( schemaManager.getNormalizerMapping() );
subschemaSubentryDnNorm = subschemaSubentryDn.getNormName();
}
@@ -295,9 +295,9 @@
**/
public void move( NextInterceptor next, MoveOperationContext opContext ) throws Exception
{
- LdapDN oldName = opContext.getDn();
+ DN oldName = opContext.getDn();
- LdapDN newName = ( LdapDN ) opContext.getParent().clone();
+ DN newName = ( DN ) opContext.getParent().clone();
newName.add( oldName.get( oldName.size() - 1 ) );
// Check if the entry is a referral itself
@@ -328,7 +328,7 @@
**/
public void moveAndRename( NextInterceptor next, MoveAndRenameOperationContext opContext ) throws Exception
{
- LdapDN newName = ( LdapDN ) opContext.getParent().clone();
+ DN newName = ( DN ) opContext.getParent().clone();
newName.add( opContext.getNewRdn() );
// Check if the entry is a referral itself
@@ -382,14 +382,14 @@
*/
public void modify( NextInterceptor next, ModifyOperationContext opContext ) throws Exception
{
- LdapDN name = opContext.getDn();
+ DN name = opContext.getDn();
// handle a normal modify without following referrals
next.modify( opContext );
// Check if we are trying to modify the schema or the rootDSE,
// if so, we don't modify the referralManager
- if ( ( name == LdapDN.EMPTY_LDAPDN ) || ( subschemaSubentryDnNorm.equals( name.getNormName() ) ) )
+ if ( ( name == DN.EMPTY_DN ) || ( subschemaSubentryDnNorm.equals( name.getNormName() ) ) )
{
// Do nothing
return;
@@ -432,7 +432,7 @@
next.addContextPartition( opContext );
Partition partition = opContext.getPartition();
- LdapDN suffix = partition.getSuffixDn();
+ DN suffix = partition.getSuffixDn();
// add referrals immediately after adding the new partition
referralManager.init( directoryService, new String[]{ suffix.getNormName() } );
@@ -448,7 +448,7 @@
throws Exception
{
// get the partition suffix
- LdapDN suffix = opContext.getDn();
+ DN suffix = opContext.getDn();
// remove referrals immediately before removing the partition
referralManager.remove( directoryService, suffix );
Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/replication/SimpleReplicaConnection.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/replication/SimpleReplicaConnection.java?rev=918766&r1=918765&r2=918766&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/replication/SimpleReplicaConnection.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/replication/SimpleReplicaConnection.java Wed Mar 3 23:25:11 2010
@@ -19,7 +19,7 @@
*/
package org.apache.directory.server.core.replication;
-import org.apache.directory.shared.ldap.name.LdapDN;
+import org.apache.directory.shared.ldap.name.DN;
/**
@@ -33,7 +33,7 @@
public abstract class SimpleReplicaConnection extends ReplicaConnection
{
/** The DN to use to bind to the remote server */
- private LdapDN principal;
+ private DN principal;
/** The password */
private String credentials;
@@ -41,7 +41,7 @@
/**
* @return the principal
*/
- public LdapDN getPrincipal()
+ public DN getPrincipal()
{
return principal;
}
@@ -49,7 +49,7 @@
/**
* @param principal the principal to set
*/
- public void setPrincipal( LdapDN principal )
+ public void setPrincipal( DN principal )
{
this.principal = principal;
}
Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/DefaultSchemaService.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/DefaultSchemaService.java?rev=918766&r1=918765&r2=918766&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/DefaultSchemaService.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/DefaultSchemaService.java Wed Mar 3 23:25:11 2010
@@ -33,7 +33,7 @@
import org.apache.directory.server.core.interceptor.context.LookupOperationContext;
import org.apache.directory.shared.ldap.constants.SchemaConstants;
import org.apache.directory.shared.ldap.entry.EntryAttribute;
-import org.apache.directory.shared.ldap.name.LdapDN;
+import org.apache.directory.shared.ldap.name.DN;
import org.apache.directory.shared.ldap.schema.AttributeType;
import org.apache.directory.shared.ldap.schema.DITContentRule;
import org.apache.directory.shared.ldap.schema.DITStructureRule;
@@ -68,7 +68,7 @@
private SchemaPartition schemaPartition;
/** the normalized name for the schema modification attributes */
- private LdapDN schemaModificationAttributesDN;
+ private DN schemaModificationAttributesDN;
/** A lock to avid concurrent generation of the SubschemaSubentry */
private Object schemaSubentrLock = new Object();
@@ -92,7 +92,7 @@
return true;
}
- LdapDN dn = new LdapDN( dnString ).normalize( schemaPartition.getSchemaManager().getNormalizerMapping() );
+ DN dn = new DN( dnString ).normalize( schemaPartition.getSchemaManager().getNormalizerMapping() );
return dn.getNormName().equals( ServerDNConstants.CN_SCHEMA_DN_NORMALIZED );
}
@@ -378,7 +378,7 @@
{
try
{
- schemaModificationAttributesDN = new LdapDN( ServerDNConstants.SCHEMA_MODIFICATIONS_DN );
+ schemaModificationAttributesDN = new DN( ServerDNConstants.SCHEMA_MODIFICATIONS_DN );
schemaModificationAttributesDN.normalize(
getSchemaManager().getNormalizerMapping() );
}
@@ -415,7 +415,7 @@
}
Set<String> setOids = new HashSet<String>();
- ServerEntry attrs = new DefaultServerEntry( getSchemaManager(), LdapDN.EMPTY_LDAPDN );
+ ServerEntry attrs = new DefaultServerEntry( getSchemaManager(), DN.EMPTY_DN );
boolean returnAllOperationalAttributes = false;
synchronized( lock )
Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/SchemaChecker.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/SchemaChecker.java?rev=918766&r1=918765&r2=918766&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/SchemaChecker.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/SchemaChecker.java Wed Mar 3 23:25:11 2010
@@ -36,7 +36,7 @@
import org.apache.directory.shared.ldap.entry.Value;
import org.apache.directory.shared.ldap.exception.LdapSchemaViolationException;
import org.apache.directory.shared.ldap.message.ResultCodeEnum;
-import org.apache.directory.shared.ldap.name.LdapDN;
+import org.apache.directory.shared.ldap.name.DN;
import org.apache.directory.shared.ldap.schema.AttributeType;
import org.apache.directory.shared.ldap.schema.ObjectClass;
import org.apache.directory.shared.ldap.schema.ObjectClassTypeEnum;
@@ -73,7 +73,7 @@
* @throws NamingException if modify operations leave the entry inconsistent
* without a STRUCTURAL objectClass
*/
- public static void preventStructuralClassRemovalOnModifyReplace( SchemaManager schemaManager, LdapDN name, ModificationOperation mod,
+ public static void preventStructuralClassRemovalOnModifyReplace( SchemaManager schemaManager, DN name, ModificationOperation mod,
ServerAttribute attribute ) throws NamingException
{
if ( mod != ModificationOperation.REPLACE_ATTRIBUTE )
@@ -136,7 +136,7 @@
* without a STRUCTURAL objectClass
*/
public static void preventStructuralClassRemovalOnModifyReplace(
- ObjectClassRegistry registry, LdapDN name, ModificationOperation mod, ServerEntry entry ) throws NamingException
+ ObjectClassRegistry registry, DN name, ModificationOperation mod, ServerEntry entry ) throws NamingException
{
if ( mod != ModificationOperation.REPLACE_ATTRIBUTE )
{
@@ -198,7 +198,7 @@
* @throws NamingException if modify operations leave the entry inconsistent
* without a STRUCTURAL objectClass
*/
- public static void preventStructuralClassRemovalOnModifyRemove( SchemaManager schemaManager, LdapDN name, ModificationOperation mod,
+ public static void preventStructuralClassRemovalOnModifyRemove( SchemaManager schemaManager, DN name, ModificationOperation mod,
EntryAttribute attribute, EntryAttribute entryObjectClasses ) throws NamingException
{
if ( mod != ModificationOperation.REMOVE_ATTRIBUTE )
@@ -381,7 +381,7 @@
* @param oidRegistry
* @throws NamingException if the modify operation is removing an Rdn attribute
*/
- public static void preventRdnChangeOnModifyReplace( LdapDN name, ModificationOperation mod,
+ public static void preventRdnChangeOnModifyReplace( DN name, ModificationOperation mod,
ServerAttribute attribute, SchemaManager schemaManager )
throws NamingException
{
@@ -456,7 +456,7 @@
* @throws NamingException if the modify operation is removing an Rdn attribute
*/
public static void preventRdnChangeOnModifyReplace(
- LdapDN name, ModificationOperation mod, ServerEntry entry,
+ DN name, ModificationOperation mod, ServerEntry entry,
SchemaManager schemaManager )
throws NamingException
{
@@ -532,7 +532,7 @@
* @param attribute the attribute being modified
* @throws NamingException if the modify operation is removing an Rdn attribute
*/
- public static void preventRdnChangeOnModifyRemove( LdapDN name, ModificationOperation mod, ServerAttribute attribute,
+ public static void preventRdnChangeOnModifyRemove( DN name, ModificationOperation mod, ServerAttribute attribute,
SchemaManager schemaManager ) throws NamingException
{
if ( mod != ModificationOperation.REMOVE_ATTRIBUTE )
@@ -605,7 +605,7 @@
* @param oidRegistry
* @throws NamingException if the modify operation is removing an Rdn attribute
*/
- public static void preventRdnChangeOnModifyRemove( LdapDN name, ModificationOperation mod,
+ public static void preventRdnChangeOnModifyRemove( DN name, ModificationOperation mod,
ServerEntry entry, SchemaManager schemaManager )
throws NamingException
{
@@ -671,7 +671,7 @@
* attribute is not an rdn attribute
* @throws NamingException if the name is malformed in any way
*/
- private static String getRdnValue( String id, LdapDN name, SchemaManager schemaManager ) throws NamingException
+ private static String getRdnValue( String id, DN name, SchemaManager schemaManager ) throws NamingException
{
// Transform the rdnAttrId to it's OID counterPart
String idOid = schemaManager.getAttributeTypeRegistry().getOidByName( id );
@@ -715,7 +715,7 @@
* @return the set of attributes composing the Rdn for the name
* @throws NamingException if the syntax of the Rdn is incorrect
*/
- private static Set<String> getRdnAttributes( LdapDN name ) throws NamingException
+ private static Set<String> getRdnAttributes( DN name ) throws NamingException
{
String[] comps = NamespaceTools.getCompositeComponents( name.get( name.size() - 1 ) );
Set<String> attributes = new HashSet<String>();
Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/SchemaInterceptor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/SchemaInterceptor.java?rev=918766&r1=918765&r2=918766&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/SchemaInterceptor.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/SchemaInterceptor.java Wed Mar 3 23:25:11 2010
@@ -89,7 +89,7 @@
import org.apache.directory.shared.ldap.filter.SubstringNode;
import org.apache.directory.shared.ldap.message.ResultCodeEnum;
import org.apache.directory.shared.ldap.name.AVA;
-import org.apache.directory.shared.ldap.name.LdapDN;
+import org.apache.directory.shared.ldap.name.DN;
import org.apache.directory.shared.ldap.name.RDN;
import org.apache.directory.shared.ldap.schema.AttributeType;
import org.apache.directory.shared.ldap.schema.AttributeTypeOptions;
@@ -154,12 +154,12 @@
private String subschemaSubentryDnNorm;
/** The SubschemaSubentry DN */
- private LdapDN subschemaSubentryDn;
+ private DN subschemaSubentryDn;
/**
* the normalized name for the schema modification attributes
*/
- private LdapDN schemaModificationAttributesDN;
+ private DN schemaModificationAttributesDN;
/** The schema manager */
private SchemaSubentryManager schemaSubEntryManager;
@@ -167,7 +167,7 @@
private SchemaService schemaService;
/** the base DN (normalized) of the schema partition */
- private LdapDN schemaBaseDN;
+ private DN schemaBaseDN;
/** A map used to store all the objectClasses superiors */
private Map<String, List<ObjectClass>> superiors;
@@ -205,17 +205,17 @@
filters.add( binaryAttributeFilter );
filters.add( topFilter );
- schemaBaseDN = new LdapDN( SchemaConstants.OU_SCHEMA );
+ schemaBaseDN = new DN( SchemaConstants.OU_SCHEMA );
schemaBaseDN.normalize( schemaManager.getNormalizerMapping() );
schemaService = directoryService.getSchemaService();
// stuff for dealing with subentries (garbage for now)
Value<?> subschemaSubentry = nexus.getRootDSE( null ).get( SchemaConstants.SUBSCHEMA_SUBENTRY_AT ).get();
- subschemaSubentryDn = new LdapDN( subschemaSubentry.getString() );
+ subschemaSubentryDn = new DN( subschemaSubentry.getString() );
subschemaSubentryDn.normalize( schemaManager.getNormalizerMapping() );
subschemaSubentryDnNorm = subschemaSubentryDn.getNormName();
- schemaModificationAttributesDN = new LdapDN( ServerDNConstants.SCHEMA_MODIFICATIONS_DN );
+ schemaModificationAttributesDN = new DN( ServerDNConstants.SCHEMA_MODIFICATIONS_DN );
schemaModificationAttributesDN.normalize( schemaManager.getNormalizerMapping() );
computeSuperiors();
@@ -678,7 +678,7 @@
public EntryFilteringCursor search( NextInterceptor nextInterceptor, SearchOperationContext opContext )
throws Exception
{
- LdapDN base = opContext.getDn();
+ DN base = opContext.getDn();
SearchControls searchCtls = opContext.getSearchControls();
ExprNode filter = opContext.getFilter();
@@ -1107,7 +1107,7 @@
public void rename( NextInterceptor next, RenameOperationContext opContext ) throws Exception
{
- LdapDN oldDn = opContext.getDn();
+ DN oldDn = opContext.getDn();
RDN newRdn = opContext.getNewRdn();
boolean deleteOldRn = opContext.getDelOldDn();
ServerEntry entry = (ServerEntry)opContext.getEntry().getClonedEntry();
@@ -1185,7 +1185,7 @@
/**
* Modify an entry, applying the given modifications, and check if it's OK
*/
- private void checkModifyEntry( LdapDN dn, ServerEntry currentEntry, List<Modification> mods ) throws Exception
+ private void checkModifyEntry( DN dn, ServerEntry currentEntry, List<Modification> mods ) throws Exception
{
// The first step is to check that the modifications are valid :
// - the ATs are present in the schema
@@ -1381,7 +1381,7 @@
// First, check that the entry is either a subschemaSubentry or a schema element.
// This is the case if it's a child of cn=schema or ou=schema
- LdapDN dn = opContext.getDn();
+ DN dn = opContext.getDn();
// Gets the stored entry on which the modification must be applied
if ( dn.equals( subschemaSubentryDn ) )
@@ -1546,7 +1546,7 @@
*
* We also check the syntaxes
*/
- private void check( LdapDN dn, ServerEntry entry ) throws Exception
+ private void check( DN dn, ServerEntry entry ) throws Exception
{
// ---------------------------------------------------------------
// First, make sure all attributes are valid schema defined attributes
@@ -1678,7 +1678,7 @@
*/
public void add( NextInterceptor next, AddOperationContext addContext ) throws Exception
{
- LdapDN name = addContext.getDn();
+ DN name = addContext.getDn();
ServerEntry entry = addContext.getEntry();
check( name, entry );
@@ -1735,7 +1735,7 @@
}
- private String getSchemaName( LdapDN dn ) throws NamingException
+ private String getSchemaName( DN dn ) throws NamingException
{
if ( dn.size() < 2 )
{
@@ -1754,7 +1754,7 @@
* @return true if the objectClass values require the attribute, false otherwise
* @throws Exception if the attribute is not recognized
*/
- private void assertAllAttributesAllowed( LdapDN dn, ServerEntry entry, Set<String> allowed ) throws Exception
+ private void assertAllAttributesAllowed( DN dn, ServerEntry entry, Set<String> allowed ) throws Exception
{
// Never check the attributes if the extensibleObject objectClass is
// declared for this entry
@@ -1812,7 +1812,7 @@
/**
* Checks to see the presence of all required attributes within an entry.
*/
- private void assertRequiredAttributesPresent( LdapDN dn, Entry entry, Set<String> must ) throws Exception
+ private void assertRequiredAttributesPresent( DN dn, Entry entry, Set<String> must ) throws Exception
{
for ( EntryAttribute attribute : entry )
{
@@ -1833,7 +1833,7 @@
* inheritance tree
* - we must have at least one STRUCTURAL OC
*/
- private void assertObjectClasses( LdapDN dn, List<ObjectClass> ocs ) throws Exception
+ private void assertObjectClasses( DN dn, List<ObjectClass> ocs ) throws Exception
{
Set<ObjectClass> structuralObjectClasses = new HashSet<ObjectClass>();
@@ -1944,7 +1944,7 @@
}
- private void assertRdn( LdapDN dn, ServerEntry entry ) throws Exception
+ private void assertRdn( DN dn, ServerEntry entry ) throws Exception
{
for ( AVA atav : dn.getRdn() )
{
Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/SchemaSubentryManager.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/SchemaSubentryManager.java?rev=918766&r1=918765&r2=918766&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/SchemaSubentryManager.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/SchemaSubentryManager.java Wed Mar 3 23:25:11 2010
@@ -37,7 +37,7 @@
import org.apache.directory.shared.ldap.entry.Modification;
import org.apache.directory.shared.ldap.exception.LdapOperationNotSupportedException;
import org.apache.directory.shared.ldap.message.ResultCodeEnum;
-import org.apache.directory.shared.ldap.name.LdapDN;
+import org.apache.directory.shared.ldap.name.DN;
import org.apache.directory.shared.ldap.schema.AttributeType;
import org.apache.directory.shared.ldap.schema.DITContentRule;
import org.apache.directory.shared.ldap.schema.DITStructureRule;
@@ -187,9 +187,9 @@
/* (non-Javadoc)
- * @see org.apache.directory.server.core.schema.SchemaChangeManager#modifySchemaSubentry(org.apache.directory.server.core.interceptor.context.ModifyOperationContext, org.apache.directory.shared.ldap.name.LdapDN, int, org.apache.directory.server.core.entry.ServerEntry, org.apache.directory.server.core.entry.ServerEntry, org.apache.directory.server.core.entry.ServerEntry, boolean)
+ * @see org.apache.directory.server.core.schema.SchemaChangeManager#modifySchemaSubentry(org.apache.directory.server.core.interceptor.context.ModifyOperationContext, org.apache.directory.shared.ldap.name.DN, int, org.apache.directory.server.core.entry.ServerEntry, org.apache.directory.server.core.entry.ServerEntry, org.apache.directory.server.core.entry.ServerEntry, boolean)
*/
- public void modifySchemaSubentry( ModifyOperationContext opContext, LdapDN name, int modOp, ServerEntry mods,
+ public void modifySchemaSubentry( ModifyOperationContext opContext, DN name, int modOp, ServerEntry mods,
ServerEntry subentry, ServerEntry targetSubentry, boolean doCascadeModify ) throws Exception
{
Set<AttributeType> attributeTypes = mods.getAttributeTypes();
Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/SchemaSubentryModifier.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/SchemaSubentryModifier.java?rev=918766&r1=918765&r2=918766&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/SchemaSubentryModifier.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/SchemaSubentryModifier.java Wed Mar 3 23:25:11 2010
@@ -38,7 +38,7 @@
import org.apache.directory.shared.ldap.constants.MetaSchemaConstants;
import org.apache.directory.shared.ldap.constants.SchemaConstants;
import org.apache.directory.shared.ldap.entry.Entry;
-import org.apache.directory.shared.ldap.name.LdapDN;
+import org.apache.directory.shared.ldap.name.DN;
import org.apache.directory.shared.ldap.schema.AttributeType;
import org.apache.directory.shared.ldap.schema.DITContentRule;
import org.apache.directory.shared.ldap.schema.DITStructureRule;
@@ -97,7 +97,7 @@
}
- private LdapDN getDn( SchemaObject obj ) throws NamingException
+ private DN getDn( SchemaObject obj ) throws NamingException
{
StringBuffer buf = new StringBuffer();
buf.append( "m-oid=" ).append( obj.getOid() ).append( ",ou=" );
@@ -136,14 +136,14 @@
}
buf.append( ",cn=" ).append( obj.getSchemaName() ).append( ",ou=schema" );
- return new LdapDN( buf.toString() );
+ return new DN( buf.toString() );
}
public void add( OperationContext opContext, LdapComparatorDescription comparatorDescription ) throws Exception
{
String schemaName = getSchema( comparatorDescription );
- LdapDN dn = new LdapDN(
+ DN dn = new DN(
"m-oid=" + comparatorDescription.getOid(),
SchemaConstants.COMPARATORS_PATH,
"cn=" + schemaName,
@@ -158,7 +158,7 @@
public void add( OperationContext opContext, NormalizerDescription normalizerDescription ) throws Exception
{
String schemaName = getSchema( normalizerDescription );
- LdapDN dn = new LdapDN(
+ DN dn = new DN(
"m-oid=" + normalizerDescription.getOid(),
SchemaConstants.NORMALIZERS_PATH ,
"cn=" + schemaName,
@@ -173,7 +173,7 @@
public void add( OperationContext opContext, SyntaxCheckerDescription syntaxCheckerDescription ) throws Exception
{
String schemaName = getSchema( syntaxCheckerDescription );
- LdapDN dn = new LdapDN(
+ DN dn = new DN(
"m-oid=" + syntaxCheckerDescription.getOid(),
SchemaConstants.SYNTAX_CHECKERS_PATH,
"cn=" + schemaName,
@@ -187,7 +187,7 @@
public void addSchemaObject( OperationContext opContext, SchemaObject obj ) throws Exception
{
Schema schema = schemaManager.getLoadedSchema( obj.getSchemaName() );
- LdapDN dn = getDn( obj );
+ DN dn = getDn( obj );
ServerEntry entry = factory.getAttributes( obj, schema, schemaManager );
entry.setDn( dn );
@@ -197,7 +197,7 @@
public void deleteSchemaObject( OperationContext opContext, SchemaObject obj ) throws Exception
{
- LdapDN dn = getDn( obj );
+ DN dn = getDn( obj );
opContext.delete( dn, BYPASS );
}
@@ -205,7 +205,7 @@
public void delete( OperationContext opContext, NormalizerDescription normalizerDescription ) throws Exception
{
String schemaName = getSchema( normalizerDescription );
- LdapDN dn = new LdapDN(
+ DN dn = new DN(
"m-oid=" + normalizerDescription.getOid(),
SchemaConstants.NORMALIZERS_PATH,
"cn=" + schemaName,
@@ -218,7 +218,7 @@
public void delete( OperationContext opContext, SyntaxCheckerDescription syntaxCheckerDescription ) throws Exception
{
String schemaName = getSchema( syntaxCheckerDescription );
- LdapDN dn = new LdapDN(
+ DN dn = new DN(
"m-oid=" + syntaxCheckerDescription.getOid(),
SchemaConstants.SYNTAX_CHECKERS_PATH,
"cn=" + schemaName,
@@ -230,7 +230,7 @@
public void delete( OperationContext opContext, LdapComparatorDescription comparatorDescription ) throws Exception
{
String schemaName = getSchema( comparatorDescription );
- LdapDN dn = new LdapDN(
+ DN dn = new DN(
"m-oid=" + comparatorDescription.getOid(),
SchemaConstants.COMPARATORS_PATH,
"cn=" + schemaName,
@@ -240,7 +240,7 @@
}
- private Entry getEntry( LdapDN dn, LdapComparatorDescription comparatorDescription )
+ private Entry getEntry( DN dn, LdapComparatorDescription comparatorDescription )
{
Entry entry = new DefaultServerEntry( schemaManager, dn );
@@ -267,7 +267,7 @@
}
- private Entry getEntry( LdapDN dn, NormalizerDescription normalizerDescription )
+ private Entry getEntry( DN dn, NormalizerDescription normalizerDescription )
{
Entry entry = new DefaultServerEntry( schemaManager, dn );
@@ -305,7 +305,7 @@
}
- private Entry getEntry( LdapDN dn, SyntaxCheckerDescription syntaxCheckerDescription )
+ private Entry getEntry( DN dn, SyntaxCheckerDescription syntaxCheckerDescription )
{
Entry entry = new DefaultServerEntry( schemaManager, dn );
Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/security/CoreKeyStoreSpi.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/security/CoreKeyStoreSpi.java?rev=918766&r1=918765&r2=918766&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/security/CoreKeyStoreSpi.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/security/CoreKeyStoreSpi.java Wed Mar 3 23:25:11 2010
@@ -44,7 +44,7 @@
import org.apache.directory.server.core.entry.ServerEntry;
import org.apache.directory.server.i18n.I18n;
import org.apache.directory.shared.ldap.constants.AuthenticationLevel;
-import org.apache.directory.shared.ldap.name.LdapDN;
+import org.apache.directory.shared.ldap.name.DN;
import org.apache.directory.shared.ldap.util.SingletonEnumeration;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -79,7 +79,7 @@
private ServerEntry getTlsEntry() throws Exception
{
- LdapDN adminDn = new LdapDN( ServerDNConstants.ADMIN_SYSTEM_DN );
+ DN adminDn = new DN( ServerDNConstants.ADMIN_SYSTEM_DN );
adminDn.normalize( directoryService.getSchemaManager().getNormalizerMapping() );
LdapPrincipal principal = new LdapPrincipal( adminDn, AuthenticationLevel.SIMPLE );
CoreSession session = directoryService.getSession( principal );
Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/sp/LdapClassLoader.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/sp/LdapClassLoader.java?rev=918766&r1=918765&r2=918766&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/sp/LdapClassLoader.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/sp/LdapClassLoader.java Wed Mar 3 23:25:11 2010
@@ -41,7 +41,7 @@
import org.apache.directory.shared.ldap.filter.EqualityNode;
import org.apache.directory.shared.ldap.filter.SearchScope;
import org.apache.directory.shared.ldap.message.AliasDerefMode;
-import org.apache.directory.shared.ldap.name.LdapDN;
+import org.apache.directory.shared.ldap.name.DN;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -65,7 +65,7 @@
private static final Logger log = LoggerFactory.getLogger( LdapClassLoader.class );
public static String defaultSearchContextsConfig = "cn=classLoaderDefaultSearchContext,ou=configuration,ou=system";
- private LdapDN defaultSearchDn;
+ private DN defaultSearchDn;
private DirectoryService directoryService;
@@ -73,12 +73,12 @@
{
super( LdapClassLoader.class.getClassLoader() );
this.directoryService = directoryService;
- defaultSearchDn = new LdapDN( defaultSearchContextsConfig );
+ defaultSearchDn = new DN( defaultSearchContextsConfig );
defaultSearchDn.normalize( directoryService.getSchemaManager().getNormalizerMapping() );
}
- private byte[] findClassInDIT( List<LdapDN> searchContexts, String name ) throws ClassNotFoundException
+ private byte[] findClassInDIT( List<DN> searchContexts, String name ) throws ClassNotFoundException
{
// Set up the search filter
BranchNode filter = new AndNode( );
@@ -89,7 +89,7 @@
try
{
- for ( LdapDN base : searchContexts )
+ for ( DN base : searchContexts )
{
EntryFilteringCursor cursor = null;
try
@@ -155,12 +155,12 @@
if ( configEntry != null )
{
- List<LdapDN> searchContexts = new ArrayList<LdapDN>();
+ List<DN> searchContexts = new ArrayList<DN>();
EntryAttribute attr = configEntry.get( "classLoaderDefaultSearchContext" );
for ( Value<?> val : attr )
{
- LdapDN dn = new LdapDN( val.getString() );
+ DN dn = new DN( val.getString() );
dn.normalize( directoryService.getSchemaManager().getNormalizerMapping() );
searchContexts.add( dn );
}
@@ -179,7 +179,7 @@
if ( classBytes == null )
{
- List<LdapDN> namingContexts = new ArrayList<LdapDN>();
+ List<DN> namingContexts = new ArrayList<DN>();
// TODO - why is this an operation???? Why can't we just list these damn things
// who went stupid crazy making everything into a damn operation !!!! grrrr
@@ -189,7 +189,7 @@
for ( String suffix:suffixes )
{
- LdapDN dn = new LdapDN( suffix );
+ DN dn = new DN( suffix );
dn.normalize( directoryService.getSchemaManager().getNormalizerMapping() );
namingContexts.add( dn );
}
Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/sp/StoredProcExecutionManager.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/sp/StoredProcExecutionManager.java?rev=918766&r1=918765&r2=918766&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/sp/StoredProcExecutionManager.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/sp/StoredProcExecutionManager.java Wed Mar 3 23:25:11 2010
@@ -38,7 +38,7 @@
import org.apache.directory.shared.ldap.filter.ExprNode;
import org.apache.directory.shared.ldap.filter.SearchScope;
import org.apache.directory.shared.ldap.message.AliasDerefMode;
-import org.apache.directory.shared.ldap.name.LdapDN;
+import org.apache.directory.shared.ldap.name.DN;
import org.apache.directory.shared.ldap.schema.AttributeType;
import org.apache.directory.shared.ldap.schema.AttributeTypeOptions;
@@ -90,7 +90,7 @@
AttributeType at = session.getDirectoryService()
.getSchemaManager().lookupAttributeTypeRegistry( "storedProcUnitName" );
ExprNode filter = new EqualityNode<String>( "storedProcUnitName", new ServerStringValue( at, spUnitName ) );
- LdapDN dn = new LdapDN( storedProcContainer );
+ DN dn = new DN( storedProcContainer );
EntryFilteringCursor results = session.search( dn, SearchScope.SUBTREE, filter,
AliasDerefMode.DEREF_ALWAYS, EMPTY_ATTRIBS );
if ( results.first() )