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:36:33 UTC
svn commit: r918775 - in /directory/apacheds/trunk:
protocol-changepw/src/main/java/org/apache/directory/server/changepw/
protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/
protocol-ldap/src/main/java/org/apache/directory/server/...
Author: elecharny
Date: Wed Mar 3 23:36:32 2010
New Revision: 918775
URL: http://svn.apache.org/viewvc?rev=918775&view=rev
Log:
Renamed LdapDN, applied to apachedDS
Modified:
directory/apacheds/trunk/protocol-changepw/src/main/java/org/apache/directory/server/changepw/ChangePasswordServer.java
directory/apacheds/trunk/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/KdcServer.java
directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/BindHandler.java
directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/CompareHandler.java
directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/LdapRequestHandler.java
directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/ModifyDnHandler.java
directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/ReferralAwareRequestHandler.java
directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/SearchHandler.java
directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/bind/AbstractSaslCallbackHandler.java
directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/bind/SimpleMechanismHandler.java
directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/bind/cramMD5/CramMd5CallbackHandler.java
directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/bind/digestMD5/DigestMd5CallbackHandler.java
directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/bind/gssapi/GssapiCallbackHandler.java
directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/bind/gssapi/GssapiMechanismHandler.java
directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/bind/ntlm/NtlmSaslServer.java
directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/bind/plain/PlainSaslServer.java
directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/extended/CertGenerationRequestHandler.java
directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/extended/LaunchDiagnosticUiHandler.java
directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/extended/StoredProcedureExtendedOperationHandler.java
directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/ReplicaPeerConfiguration.java
directory/apacheds/trunk/server-annotations/src/test/java/org/apache/directory/server/factory/DirectoryServiceAnnotationTest.java
directory/apacheds/trunk/server-jndi/src/main/java/org/apache/directory/server/configuration/ApacheDS.java
directory/apacheds/trunk/server-jndi/src/test/java/org/apache/directory/server/configuration/ApacheDSTest.java
directory/apacheds/trunk/server-replication/src/main/java/org/apache/directory/server/replication/configuration/ReplicationAgreement.java
directory/apacheds/trunk/server-tools/src/main/java/org/apache/directory/server/tools/ImportCommand.java
directory/apacheds/trunk/xdbm-base/src/main/java/org/apache/directory/server/core/partition/impl/btree/BTreePartition.java
directory/apacheds/trunk/xdbm-base/src/main/java/org/apache/directory/server/xdbm/AbstractXdbmPartition.java
directory/apacheds/trunk/xdbm-base/src/main/java/org/apache/directory/server/xdbm/Store.java
directory/apacheds/trunk/xdbm-base/src/main/java/org/apache/directory/server/xdbm/search/SearchEngine.java
Modified: directory/apacheds/trunk/protocol-changepw/src/main/java/org/apache/directory/server/changepw/ChangePasswordServer.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/protocol-changepw/src/main/java/org/apache/directory/server/changepw/ChangePasswordServer.java?rev=918775&r1=918774&r2=918775&view=diff
==============================================================================
--- directory/apacheds/trunk/protocol-changepw/src/main/java/org/apache/directory/server/changepw/ChangePasswordServer.java (original)
+++ directory/apacheds/trunk/protocol-changepw/src/main/java/org/apache/directory/server/changepw/ChangePasswordServer.java Wed Mar 3 23:36:32 2010
@@ -36,7 +36,7 @@
import org.apache.directory.server.protocol.shared.transport.TcpTransport;
import org.apache.directory.server.protocol.shared.transport.Transport;
import org.apache.directory.server.protocol.shared.transport.UdpTransport;
-import org.apache.directory.shared.ldap.name.LdapDN;
+import org.apache.directory.shared.ldap.name.DN;
import org.apache.mina.core.service.IoAcceptor;
import org.apache.mina.transport.socket.DatagramAcceptor;
import org.apache.mina.transport.socket.DatagramSessionConfig;
@@ -271,7 +271,7 @@
*/
public void start() throws IOException, InvalidNameException
{
- PrincipalStore store = new DirectoryPrincipalStore( getDirectoryService(), new LdapDN(this.getSearchBaseDn()) );
+ PrincipalStore store = new DirectoryPrincipalStore( getDirectoryService(), new DN(this.getSearchBaseDn()) );
if ( ( transports == null ) || ( transports.size() == 0 ) )
{
Modified: directory/apacheds/trunk/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/KdcServer.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/KdcServer.java?rev=918775&r1=918774&r2=918775&view=diff
==============================================================================
--- directory/apacheds/trunk/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/KdcServer.java (original)
+++ directory/apacheds/trunk/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/KdcServer.java Wed Mar 3 23:36:32 2010
@@ -38,7 +38,7 @@
import org.apache.directory.server.protocol.shared.transport.TcpTransport;
import org.apache.directory.server.protocol.shared.transport.Transport;
import org.apache.directory.server.protocol.shared.transport.UdpTransport;
-import org.apache.directory.shared.ldap.name.LdapDN;
+import org.apache.directory.shared.ldap.name.DN;
import org.apache.mina.core.filterchain.DefaultIoFilterChainBuilder;
import org.apache.mina.core.filterchain.IoFilterChainBuilder;
import org.apache.mina.core.service.IoAcceptor;
@@ -440,7 +440,7 @@
PrincipalStore store;
// TODO - for now ignoring this catalog crap
- store = new DirectoryPrincipalStore( getDirectoryService(), new LdapDN(this.getSearchBaseDn()) );
+ store = new DirectoryPrincipalStore( getDirectoryService(), new DN(this.getSearchBaseDn()) );
if ( ( transports == null ) || ( transports.size() == 0 ) )
{
Modified: directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/BindHandler.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/BindHandler.java?rev=918775&r1=918774&r2=918775&view=diff
==============================================================================
--- directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/BindHandler.java (original)
+++ directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/BindHandler.java Wed Mar 3 23:36:32 2010
@@ -45,7 +45,7 @@
import org.apache.directory.shared.ldap.message.internal.InternalBindRequest;
import org.apache.directory.shared.ldap.message.internal.InternalBindResponse;
import org.apache.directory.shared.ldap.message.internal.InternalLdapResult;
-import org.apache.directory.shared.ldap.name.LdapDN;
+import org.apache.directory.shared.ldap.name.DN;
import org.apache.directory.shared.ldap.util.ExceptionUtils;
import org.apache.directory.shared.ldap.util.StringTools;
import org.slf4j.Logger;
@@ -232,7 +232,7 @@
&& ( ( code == ResultCodeEnum.NO_SUCH_OBJECT ) || ( code == ResultCodeEnum.ALIAS_PROBLEM )
|| ( code == ResultCodeEnum.INVALID_DN_SYNTAX ) || ( code == ResultCodeEnum.ALIAS_DEREFERENCING_PROBLEM ) ) )
{
- result.setMatchedDn( new LdapDN( name ) );
+ result.setMatchedDn( new DN( name ) );
}
result.setErrorMessage( msg );
Modified: directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/CompareHandler.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/CompareHandler.java?rev=918775&r1=918774&r2=918775&view=diff
==============================================================================
--- directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/CompareHandler.java (original)
+++ directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/CompareHandler.java Wed Mar 3 23:36:32 2010
@@ -24,7 +24,7 @@
import org.apache.directory.shared.ldap.message.ResultCodeEnum;
import org.apache.directory.shared.ldap.message.internal.InternalCompareRequest;
import org.apache.directory.shared.ldap.message.internal.InternalLdapResult;
-import org.apache.directory.shared.ldap.name.LdapDN;
+import org.apache.directory.shared.ldap.name.DN;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -42,7 +42,7 @@
/**
- * @see ReferralAwareRequestHandler#handleIgnoringReferrals(LdapSession, LdapDN,
+ * @see ReferralAwareRequestHandler#handleIgnoringReferrals(LdapSession, DN,
* org.apache.directory.server.core.entry.ClonedServerEntry,
* org.apache.directory.shared.ldap.message.SingleReplyRequest)
*/
Modified: directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/LdapRequestHandler.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/LdapRequestHandler.java?rev=918775&r1=918774&r2=918775&view=diff
==============================================================================
--- directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/LdapRequestHandler.java (original)
+++ directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/LdapRequestHandler.java Wed Mar 3 23:36:32 2010
@@ -42,7 +42,7 @@
import org.apache.directory.shared.ldap.message.internal.InternalRequest;
import org.apache.directory.shared.ldap.message.internal.InternalResultResponse;
import org.apache.directory.shared.ldap.message.internal.InternalResultResponseRequest;
-import org.apache.directory.shared.ldap.name.LdapDN;
+import org.apache.directory.shared.ldap.name.DN;
import org.apache.directory.shared.ldap.util.ExceptionUtils;
import org.apache.mina.core.filterchain.IoFilterChain;
import org.apache.mina.core.session.IoSession;
@@ -277,7 +277,7 @@
if ( ( ne.getResolvedName() != null ) && setMatchedDn )
{
- result.setMatchedDn( ( LdapDN ) ne.getResolvedName() );
+ result.setMatchedDn( ( DN ) ne.getResolvedName() );
}
// Add the referrals if necessary
Modified: directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/ModifyDnHandler.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/ModifyDnHandler.java?rev=918775&r1=918774&r2=918775&view=diff
==============================================================================
--- directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/ModifyDnHandler.java (original)
+++ directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/ModifyDnHandler.java Wed Mar 3 23:36:32 2010
@@ -25,7 +25,7 @@
import org.apache.directory.shared.ldap.message.ResultCodeEnum;
import org.apache.directory.shared.ldap.message.internal.InternalLdapResult;
import org.apache.directory.shared.ldap.message.internal.InternalModifyDnRequest;
-import org.apache.directory.shared.ldap.name.LdapDN;
+import org.apache.directory.shared.ldap.name.DN;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -74,11 +74,11 @@
try
{
- LdapDN newRdn = new LdapDN( req.getNewRdn().toString() );
+ DN newRdn = new DN( req.getNewRdn().toString() );
newRdn.normalize( session.getCoreSession().getDirectoryService()
.getSchemaManager().getNormalizerMapping() );
- LdapDN oldRdn = new LdapDN( req.getName().getRdn().toString() );
+ DN oldRdn = new DN( req.getName().getRdn().toString() );
oldRdn.normalize( session.getCoreSession().getDirectoryService()
.getSchemaManager().getNormalizerMapping() );
Modified: directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/ReferralAwareRequestHandler.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/ReferralAwareRequestHandler.java?rev=918775&r1=918774&r2=918775&view=diff
==============================================================================
--- directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/ReferralAwareRequestHandler.java (original)
+++ directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/ReferralAwareRequestHandler.java Wed Mar 3 23:36:32 2010
@@ -39,7 +39,7 @@
import org.apache.directory.shared.ldap.message.internal.InternalReferral;
import org.apache.directory.shared.ldap.message.internal.InternalResultResponseRequest;
import org.apache.directory.shared.ldap.message.internal.InternalSearchRequest;
-import org.apache.directory.shared.ldap.name.LdapDN;
+import org.apache.directory.shared.ldap.name.DN;
import org.apache.directory.shared.ldap.util.ExceptionUtils;
import org.apache.directory.shared.ldap.util.LdapURL;
import org.slf4j.Logger;
@@ -125,12 +125,12 @@
* @return the farthest referral ancestor or null
* @throws Exception if there are problems during this search
*/
- public static final ClonedServerEntry getFarthestReferralAncestor( LdapSession session, LdapDN target )
+ public static final ClonedServerEntry getFarthestReferralAncestor( LdapSession session, DN target )
throws Exception
{
ClonedServerEntry entry;
ClonedServerEntry farthestReferralAncestor = null;
- LdapDN dn = ( LdapDN ) target.clone();
+ DN dn = ( DN ) target.clone();
try
{
@@ -184,7 +184,7 @@
* @param referralAncestor the farthest referral ancestor of the missing
* entry
*/
- public InternalReferral getReferralOnAncestor( LdapSession session, LdapDN reqTargetDn, T req,
+ public InternalReferral getReferralOnAncestor( LdapSession session, DN reqTargetDn, T req,
ClonedServerEntry referralAncestor ) throws Exception
{
LOG.debug( "Inside getReferralOnAncestor()" );
@@ -217,7 +217,7 @@
LOG.error( I18n.err( I18n.ERR_165, ref, referralAncestor ) );
}
- LdapDN urlDn = new LdapDN( ldapUrl.getDn().getName() );
+ DN urlDn = new DN( ldapUrl.getDn().getName() );
urlDn.normalize( session.getCoreSession().getDirectoryService().getSchemaManager()
.getNormalizerMapping() );
@@ -244,11 +244,11 @@
* name past the farthest referral DN which the target name extends.
*/
int diff = reqTargetDn.size() - referralAncestor.getDn().size();
- LdapDN extra = new LdapDN();
+ DN extra = new DN();
// TODO - fix this by access unormalized RDN values
// seems we have to do this because get returns normalized rdns
- LdapDN reqUnnormalizedDn = new LdapDN( reqTargetDn.getName() );
+ DN reqUnnormalizedDn = new DN( reqTargetDn.getName() );
for ( int jj = 0; jj < diff; jj++ )
{
extra.add( reqUnnormalizedDn.get( referralAncestor.getDn().size() + jj ) );
@@ -317,7 +317,7 @@
}
// Normalize the DN to check for same dn
- LdapDN urlDn = new LdapDN( ldapUrl.getDn().getName() );
+ DN urlDn = new DN( ldapUrl.getDn().getName() );
urlDn.normalize( session.getCoreSession().getDirectoryService().getSchemaManager()
.getNormalizerMapping() );
@@ -336,11 +336,11 @@
* name past the farthest referral DN which the target name extends.
*/
int diff = req.getBase().size() - referralAncestor.getDn().size();
- LdapDN extra = new LdapDN();
+ DN extra = new DN();
// TODO - fix this by access unormalized RDN values
// seems we have to do this because get returns normalized rdns
- LdapDN reqUnnormalizedDn = new LdapDN( req.getBase().getName() );
+ DN reqUnnormalizedDn = new DN( req.getBase().getName() );
for ( int jj = 0; jj < diff; jj++ )
{
extra.add( reqUnnormalizedDn.get( referralAncestor.getDn().size() + jj ) );
@@ -408,7 +408,7 @@
if ( ( ne.getResolvedName() != null ) && setMatchedDn )
{
- result.setMatchedDn( ( LdapDN ) ne.getResolvedName() );
+ result.setMatchedDn( ( DN ) ne.getResolvedName() );
}
}
@@ -438,5 +438,5 @@
/**
* Handles processing with referrals without ManageDsaIT control.
*/
- public abstract void handleWithReferrals( LdapSession session, LdapDN reqTargetDn, T req ) throws NamingException;
+ public abstract void handleWithReferrals( LdapSession session, DN reqTargetDn, T req ) throws NamingException;
}
Modified: directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/SearchHandler.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/SearchHandler.java?rev=918775&r1=918774&r2=918775&view=diff
==============================================================================
--- directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/SearchHandler.java (original)
+++ directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/SearchHandler.java Wed Mar 3 23:36:32 2010
@@ -63,7 +63,7 @@
import org.apache.directory.shared.ldap.message.internal.InternalSearchResponseDone;
import org.apache.directory.shared.ldap.message.internal.InternalSearchResponseEntry;
import org.apache.directory.shared.ldap.message.internal.InternalSearchResponseReference;
-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.LdapURL;
import org.apache.directory.shared.ldap.util.StringTools;
@@ -1024,7 +1024,7 @@
/**
* Handles processing with referrals without ManageDsaIT control.
*/
- public void handleWithReferrals( LdapSession session, LdapDN reqTargetDn, InternalSearchRequest req ) throws NamingException
+ public void handleWithReferrals( LdapSession session, DN reqTargetDn, InternalSearchRequest req ) throws NamingException
{
InternalLdapResult result = req.getResultResponse().getLdapResult();
ClonedServerEntry entry = null;
@@ -1262,13 +1262,13 @@
*/
private static boolean isSubSchemaSubEntrySearch( LdapSession session, InternalSearchRequest req ) throws Exception
{
- LdapDN base = req.getBase();
+ DN base = req.getBase();
String baseNormForm = ( base.isNormalized() ? base.getNormName() : base.toNormName() );
DirectoryService ds = session.getCoreSession().getDirectoryService();
PartitionNexus nexus = ds.getPartitionNexus();
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( ds.getSchemaManager().getNormalizerMapping() );
String subschemaSubentryDnNorm = subschemaSubentryDn.getNormName();
Modified: directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/bind/AbstractSaslCallbackHandler.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/bind/AbstractSaslCallbackHandler.java?rev=918775&r1=918774&r2=918775&view=diff
==============================================================================
--- directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/bind/AbstractSaslCallbackHandler.java (original)
+++ directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/bind/AbstractSaslCallbackHandler.java Wed Mar 3 23:36:32 2010
@@ -46,7 +46,7 @@
import org.apache.directory.shared.ldap.message.control.Control;
import org.apache.directory.shared.ldap.message.internal.InternalBindRequest;
import org.apache.directory.shared.ldap.message.internal.InternalLdapResult;
-import org.apache.directory.shared.ldap.name.LdapDN;
+import org.apache.directory.shared.ldap.name.DN;
import org.apache.directory.shared.ldap.util.ExceptionUtils;
import org.apache.directory.shared.ldap.util.StringTools;
import org.apache.mina.core.session.IoSession;
@@ -271,7 +271,7 @@
&& ( ( code == ResultCodeEnum.NO_SUCH_OBJECT ) || ( code == ResultCodeEnum.ALIAS_PROBLEM )
|| ( code == ResultCodeEnum.INVALID_DN_SYNTAX ) || ( code == ResultCodeEnum.ALIAS_DEREFERENCING_PROBLEM ) ) )
{
- result.setMatchedDn( ( LdapDN ) e.getResolvedName() );
+ result.setMatchedDn( ( DN ) e.getResolvedName() );
}
result.setErrorMessage( msg );
Modified: directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/bind/SimpleMechanismHandler.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/bind/SimpleMechanismHandler.java?rev=918775&r1=918774&r2=918775&view=diff
==============================================================================
--- directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/bind/SimpleMechanismHandler.java (original)
+++ directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/bind/SimpleMechanismHandler.java Wed Mar 3 23:36:32 2010
@@ -30,7 +30,7 @@
import org.apache.directory.shared.ldap.message.internal.InternalBindRequest;
import org.apache.directory.shared.ldap.message.internal.InternalBindResponse;
import org.apache.directory.shared.ldap.message.internal.InternalLdapResult;
-import org.apache.directory.shared.ldap.name.LdapDN;
+import org.apache.directory.shared.ldap.name.DN;
import org.apache.directory.shared.ldap.util.ExceptionUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -121,7 +121,7 @@
&& ( ( code == ResultCodeEnum.NO_SUCH_OBJECT ) || ( code == ResultCodeEnum.ALIAS_PROBLEM )
|| ( code == ResultCodeEnum.INVALID_DN_SYNTAX ) || ( code == ResultCodeEnum.ALIAS_DEREFERENCING_PROBLEM ) ) )
{
- result.setMatchedDn( new LdapDN( name ) );
+ result.setMatchedDn( new DN( name ) );
}
result.setErrorMessage( msg );
Modified: directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/bind/cramMD5/CramMd5CallbackHandler.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/bind/cramMD5/CramMd5CallbackHandler.java?rev=918775&r1=918774&r2=918775&view=diff
==============================================================================
--- directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/bind/cramMD5/CramMd5CallbackHandler.java (original)
+++ directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/bind/cramMD5/CramMd5CallbackHandler.java Wed Mar 3 23:36:32 2010
@@ -41,7 +41,7 @@
import org.apache.directory.shared.ldap.filter.SearchScope;
import org.apache.directory.shared.ldap.message.AliasDerefMode;
import org.apache.directory.shared.ldap.message.internal.InternalBindRequest;
-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;
import org.slf4j.Logger;
@@ -86,7 +86,7 @@
returningAttributes.add( new AttributeTypeOptions( passwordAT) );
bindDn = (String)ldapSession.getSaslProperty( SaslConstants.SASL_USER_BASE_DN );
- LdapDN baseDn = new LdapDN( bindDn );
+ DN baseDn = new DN( bindDn );
EntryFilteringCursor cursor = adminSession.search(
baseDn,
Modified: directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/bind/digestMD5/DigestMd5CallbackHandler.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/bind/digestMD5/DigestMd5CallbackHandler.java?rev=918775&r1=918774&r2=918775&view=diff
==============================================================================
--- directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/bind/digestMD5/DigestMd5CallbackHandler.java (original)
+++ directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/bind/digestMD5/DigestMd5CallbackHandler.java Wed Mar 3 23:36:32 2010
@@ -41,7 +41,7 @@
import org.apache.directory.shared.ldap.filter.SearchScope;
import org.apache.directory.shared.ldap.message.AliasDerefMode;
import org.apache.directory.shared.ldap.message.internal.InternalBindRequest;
-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;
import org.slf4j.Logger;
@@ -87,7 +87,7 @@
returningAttributes.add( new AttributeTypeOptions( passwordAT) );
bindDn = (String)ldapSession.getSaslProperty( SaslConstants.SASL_USER_BASE_DN );
- LdapDN baseDn = new LdapDN( bindDn );
+ DN baseDn = new DN( bindDn );
EntryFilteringCursor cursor = adminSession.search(
baseDn,
Modified: directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/bind/gssapi/GssapiCallbackHandler.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/bind/gssapi/GssapiCallbackHandler.java?rev=918775&r1=918774&r2=918775&view=diff
==============================================================================
--- directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/bind/gssapi/GssapiCallbackHandler.java (original)
+++ directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/bind/gssapi/GssapiCallbackHandler.java Wed Mar 3 23:36:32 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.message.internal.InternalBindRequest;
-import org.apache.directory.shared.ldap.name.LdapDN;
+import org.apache.directory.shared.ldap.name.DN;
import org.apache.directory.shared.ldap.util.StringTools;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -79,13 +79,13 @@
// find the user's entry
GetPrincipal getPrincipal = new GetPrincipal( new KerberosPrincipal( username ) );
- PrincipalStoreEntry entry = ( PrincipalStoreEntry ) getPrincipal.execute( adminSession, new LdapDN( ldapSession
+ PrincipalStoreEntry entry = ( PrincipalStoreEntry ) getPrincipal.execute( adminSession, new DN( ldapSession
.getLdapServer().getSearchBaseDn() ) );
String bindDn = entry.getDistinguishedName();
LOG.debug( "Converted username {} to DN {}.", username, bindDn );
- LdapPrincipal ldapPrincipal = new LdapPrincipal( new LdapDN( entry.getDistinguishedName() ),
+ LdapPrincipal ldapPrincipal = new LdapPrincipal( new DN( entry.getDistinguishedName() ),
AuthenticationLevel.STRONG, StringTools.EMPTY_BYTES );
ldapSession.putSaslProperty( SaslConstants.SASL_AUTHENT_USER, ldapPrincipal );
ldapSession.putSaslProperty( Context.SECURITY_PRINCIPAL, bindDn );
Modified: directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/bind/gssapi/GssapiMechanismHandler.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/bind/gssapi/GssapiMechanismHandler.java?rev=918775&r1=918774&r2=918775&view=diff
==============================================================================
--- directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/bind/gssapi/GssapiMechanismHandler.java (original)
+++ directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/bind/gssapi/GssapiMechanismHandler.java Wed Mar 3 23:36:32 2010
@@ -44,7 +44,7 @@
import org.apache.directory.server.protocol.shared.ServiceConfigurationException;
import org.apache.directory.shared.ldap.constants.SupportedSaslMechanisms;
import org.apache.directory.shared.ldap.message.internal.InternalBindRequest;
-import org.apache.directory.shared.ldap.name.LdapDN;
+import org.apache.directory.shared.ldap.name.DN;
/**
@@ -170,6 +170,6 @@
private PrincipalStoreEntry findPrincipal( LdapServer ldapServer, GetPrincipal getPrincipal ) throws Exception
{
CoreSession adminSession = ldapServer.getDirectoryService().getAdminSession();
- return ( PrincipalStoreEntry ) getPrincipal.execute( adminSession, new LdapDN( ldapServer.getSearchBaseDn() ) );
+ return ( PrincipalStoreEntry ) getPrincipal.execute( adminSession, new DN( ldapServer.getSearchBaseDn() ) );
}
}
Modified: directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/bind/ntlm/NtlmSaslServer.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/bind/ntlm/NtlmSaslServer.java?rev=918775&r1=918774&r2=918775&view=diff
==============================================================================
--- directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/bind/ntlm/NtlmSaslServer.java (original)
+++ directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/bind/ntlm/NtlmSaslServer.java Wed Mar 3 23:36:32 2010
@@ -34,7 +34,7 @@
import org.apache.directory.shared.ldap.constants.AuthenticationLevel;
import org.apache.directory.shared.ldap.constants.SupportedSaslMechanisms;
import org.apache.directory.shared.ldap.message.internal.InternalBindRequest;
-import org.apache.directory.shared.ldap.name.LdapDN;
+import org.apache.directory.shared.ldap.name.DN;
import org.apache.directory.shared.ldap.util.StringTools;
@@ -157,7 +157,7 @@
try
{
result = provider.authenticate( getLdapSession().getIoSession(), response );
- LdapDN dn = getBindRequest().getName();
+ DN dn = getBindRequest().getName();
dn.normalize( getLdapSession().getLdapServer().getDirectoryService().getSchemaManager().getNormalizerMapping() );
LdapPrincipal ldapPrincipal = new LdapPrincipal( dn, AuthenticationLevel.STRONG );
getLdapSession().putSaslProperty( SaslConstants.SASL_AUTHENT_USER, ldapPrincipal );
@@ -187,7 +187,7 @@
private CoreSession authenticate( String user, String password ) throws InvalidNameException, Exception
{
BindOperationContext bindContext = new BindOperationContext( getLdapSession().getCoreSession() );
- bindContext.setDn( new LdapDN( user ) );
+ bindContext.setDn( new DN( user ) );
bindContext.setCredentials( StringTools.getBytesUtf8( password ) );
getAdminSession().getDirectoryService().getOperationManager().bind( bindContext );
Modified: directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/bind/plain/PlainSaslServer.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/bind/plain/PlainSaslServer.java?rev=918775&r1=918774&r2=918775&view=diff
==============================================================================
--- directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/bind/plain/PlainSaslServer.java (original)
+++ directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/bind/plain/PlainSaslServer.java Wed Mar 3 23:36:32 2010
@@ -29,7 +29,7 @@
import org.apache.directory.server.ldap.handlers.bind.AbstractSaslServer;
import org.apache.directory.shared.ldap.constants.SupportedSaslMechanisms;
import org.apache.directory.shared.ldap.message.internal.InternalBindRequest;
-import org.apache.directory.shared.ldap.name.LdapDN;
+import org.apache.directory.shared.ldap.name.DN;
import org.apache.directory.shared.ldap.schema.PrepareString;
import org.apache.directory.shared.ldap.util.StringTools;
@@ -242,7 +242,7 @@
private CoreSession authenticate( String user, String password ) throws InvalidNameException, Exception
{
BindOperationContext bindContext = new BindOperationContext( getLdapSession().getCoreSession() );
- bindContext.setDn( new LdapDN( user ) );
+ bindContext.setDn( new DN( user ) );
bindContext.setCredentials( StringTools.getBytesUtf8( password ) );
getAdminSession().getDirectoryService().getOperationManager().bind( bindContext );
Modified: directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/extended/CertGenerationRequestHandler.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/extended/CertGenerationRequestHandler.java?rev=918775&r1=918774&r2=918775&view=diff
==============================================================================
--- directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/extended/CertGenerationRequestHandler.java (original)
+++ directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/extended/CertGenerationRequestHandler.java Wed Mar 3 23:36:32 2010
@@ -38,7 +38,7 @@
import org.apache.directory.shared.ldap.message.extended.CertGenerationRequest;
import org.apache.directory.shared.ldap.message.extended.CertGenerationResponse;
import org.apache.directory.shared.ldap.message.internal.InternalExtendedRequest;
-import org.apache.directory.shared.ldap.name.LdapDN;
+import org.apache.directory.shared.ldap.name.DN;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -95,7 +95,7 @@
CertGenerationObject certGenObj = container.getCertGenerationObject();
- ClonedServerEntry entry = session.getCoreSession().lookup( new LdapDN( certGenObj.getTargetDN() ) );
+ ClonedServerEntry entry = session.getCoreSession().lookup( new DN( certGenObj.getTargetDN() ) );
if( entry != null )
{
TlsKeyGenerator.addKeyPair( entry.getOriginalEntry(), certGenObj.getIssuerDN(), certGenObj.getSubjectDN(), certGenObj.getKeyAlgorithm() );
Modified: directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/extended/LaunchDiagnosticUiHandler.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/extended/LaunchDiagnosticUiHandler.java?rev=918775&r1=918774&r2=918775&view=diff
==============================================================================
--- directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/extended/LaunchDiagnosticUiHandler.java (original)
+++ directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/extended/LaunchDiagnosticUiHandler.java Wed Mar 3 23:36:32 2010
@@ -47,7 +47,7 @@
import org.apache.directory.shared.ldap.message.extended.LaunchDiagnosticUiRequest;
import org.apache.directory.shared.ldap.message.extended.LaunchDiagnosticUiResponse;
import org.apache.directory.shared.ldap.message.internal.InternalExtendedRequest;
-import org.apache.directory.shared.ldap.name.LdapDN;
+import org.apache.directory.shared.ldap.name.DN;
/**
@@ -90,7 +90,7 @@
requestor.getIoSession().write( new LaunchDiagnosticUiResponse( req.getMessageId() ) );
PartitionNexus nexus = service.getPartitionNexus();
- LdapDN adminDn = new LdapDN( ServerDNConstants.ADMIN_SYSTEM_DN_NORMALIZED );
+ DN adminDn = new DN( ServerDNConstants.ADMIN_SYSTEM_DN_NORMALIZED );
adminDn.normalize( service.getSchemaManager().getNormalizerMapping() );
LdapPrincipal principal = new LdapPrincipal( adminDn, AuthenticationLevel.STRONG );
CoreSession session = service.getSession( principal );
@@ -99,7 +99,7 @@
for ( String suffix:suffixes )
{
- LdapDN dn = new LdapDN( suffix );
+ DN dn = new DN( suffix );
Partition partition = nexus.getPartition( dn );
if ( partition instanceof BTreePartition )
Modified: directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/extended/StoredProcedureExtendedOperationHandler.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/extended/StoredProcedureExtendedOperationHandler.java?rev=918775&r1=918774&r2=918775&view=diff
==============================================================================
--- directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/extended/StoredProcedureExtendedOperationHandler.java (original)
+++ directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/extended/StoredProcedureExtendedOperationHandler.java Wed Mar 3 23:36:32 2010
@@ -47,7 +47,7 @@
import org.apache.directory.shared.ldap.message.extended.StoredProcedureResponse;
import org.apache.directory.shared.ldap.message.internal.InternalExtendedRequest;
import org.apache.directory.shared.ldap.message.internal.InternalExtendedResponse;
-import org.apache.directory.shared.ldap.name.LdapDN;
+import org.apache.directory.shared.ldap.name.DN;
import org.apache.directory.shared.ldap.sp.LdapContextParameter;
import org.apache.directory.shared.ldap.util.StringTools;
@@ -95,7 +95,7 @@
if ( value.getClass().equals( LdapContextParameter.class ) )
{
String paramCtx = ( ( LdapContextParameter ) value ).getValue();
- value = session.getCoreSession().lookup( new LdapDN( paramCtx ) );
+ value = session.getCoreSession().lookup( new DN( paramCtx ) );
}
valueList.add( value );
Modified: directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/ReplicaPeerConfiguration.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/ReplicaPeerConfiguration.java?rev=918775&r1=918774&r2=918775&view=diff
==============================================================================
--- directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/ReplicaPeerConfiguration.java (original)
+++ directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/ReplicaPeerConfiguration.java Wed Mar 3 23:36:32 2010
@@ -24,7 +24,7 @@
import javax.naming.InvalidNameException;
import org.apache.directory.shared.ldap.codec.util.LdapURLEncodingException;
-import org.apache.directory.shared.ldap.name.LdapDN;
+import org.apache.directory.shared.ldap.name.DN;
import org.apache.directory.shared.ldap.util.LdapURL;
import org.apache.directory.shared.ldap.util.StringTools;
@@ -60,7 +60,7 @@
private LdapURL producer;
/** The principal to use to connect to the producer */
- private LdapDN principalDN;
+ private DN principalDN;
/** The principal's password */
private String password;
@@ -72,7 +72,7 @@
private int port;
/** The base DN used for replication */
- private LdapDN baseDN;
+ private DN baseDN;
/** A flag to tell the server to use an SSL connection */
private boolean useSSL;
@@ -127,7 +127,7 @@
/**
* @return the baseDN
*/
- public LdapDN getBaseDN()
+ public DN getBaseDN()
{
return baseDN;
}
@@ -137,14 +137,14 @@
*/
public void setPrincipalDN( String principalDN ) throws InvalidNameException
{
- this.principalDN = new LdapDN( principalDN );
+ this.principalDN = new DN( principalDN );
}
/**
* @return the principalDN
*/
- public LdapDN getPrincipalDN()
+ public DN getPrincipalDN()
{
return principalDN;
}
Modified: directory/apacheds/trunk/server-annotations/src/test/java/org/apache/directory/server/factory/DirectoryServiceAnnotationTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/server-annotations/src/test/java/org/apache/directory/server/factory/DirectoryServiceAnnotationTest.java?rev=918775&r1=918774&r2=918775&view=diff
==============================================================================
--- directory/apacheds/trunk/server-annotations/src/test/java/org/apache/directory/server/factory/DirectoryServiceAnnotationTest.java (original)
+++ directory/apacheds/trunk/server-annotations/src/test/java/org/apache/directory/server/factory/DirectoryServiceAnnotationTest.java Wed Mar 3 23:36:32 2010
@@ -48,7 +48,7 @@
import org.apache.directory.server.ldap.LdapServer;
import org.apache.directory.shared.ldap.jndi.JndiUtils;
import org.apache.directory.shared.ldap.message.control.Control;
-import org.apache.directory.shared.ldap.name.LdapDN;
+import org.apache.directory.shared.ldap.name.DN;
import org.junit.Test;
@@ -160,7 +160,7 @@
}
}
- assertTrue( service.getAdminSession().exists( new LdapDN( "dc=example,dc=com" ) ) );
+ assertTrue( service.getAdminSession().exists( new DN( "dc=example,dc=com" ) ) );
service.shutdown();
FileUtils.deleteDirectory( service.getWorkingDirectory() );
@@ -227,7 +227,7 @@
}
}
- assertTrue( service.getAdminSession().exists( new LdapDN( "dc=example,dc=com" ) ) );
+ assertTrue( service.getAdminSession().exists( new DN( "dc=example,dc=com" ) ) );
// Now, get the server
LdapServer ldapServer = ServerAnnotationProcessor.getLdapServer( service, 1024 );
Modified: directory/apacheds/trunk/server-jndi/src/main/java/org/apache/directory/server/configuration/ApacheDS.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/server-jndi/src/main/java/org/apache/directory/server/configuration/ApacheDS.java?rev=918775&r1=918774&r2=918775&view=diff
==============================================================================
--- directory/apacheds/trunk/server-jndi/src/main/java/org/apache/directory/server/configuration/ApacheDS.java (original)
+++ directory/apacheds/trunk/server-jndi/src/main/java/org/apache/directory/server/configuration/ApacheDS.java Wed Mar 3 23:36:32 2010
@@ -45,7 +45,7 @@
import org.apache.directory.server.protocol.shared.store.LdifFileLoader;
import org.apache.directory.server.protocol.shared.store.LdifLoadFilter;
import org.apache.directory.shared.ldap.constants.SchemaConstants;
-import org.apache.directory.shared.ldap.name.LdapDN;
+import org.apache.directory.shared.ldap.name.DN;
import org.apache.directory.shared.ldap.schema.SchemaManager;
import org.apache.directory.shared.ldap.schema.ldif.extractor.SchemaLdifExtractor;
import org.apache.directory.shared.ldap.schema.ldif.extractor.impl.DefaultSchemaLdifExtractor;
@@ -258,7 +258,7 @@
*/
private void ensureLdifFileBase() throws Exception
{
- LdapDN dn = new LdapDN( ServerDNConstants.LDIF_FILES_DN );
+ DN dn = new DN( ServerDNConstants.LDIF_FILES_DN );
ServerEntry entry = null;
try
@@ -272,7 +272,7 @@
if ( entry == null )
{
- entry = directoryService.newEntry( new LdapDN( ServerDNConstants.LDIF_FILES_DN ) );
+ entry = directoryService.newEntry( new DN( ServerDNConstants.LDIF_FILES_DN ) );
entry.add( SchemaConstants.OU_AT, "loadedLdifFiles" );
entry.add( SchemaConstants.OBJECT_CLASS_AT, SchemaConstants.TOP_OC, SchemaConstants.ORGANIZATIONAL_UNIT_OC );
@@ -286,13 +286,13 @@
*
* It is associated with the attributeType wrt to the underlying system.
*/
- private LdapDN buildProtectedFileEntryDn( File ldif ) throws Exception
+ private DN buildProtectedFileEntryDn( File ldif ) throws Exception
{
String fileSep = File.separatorChar == '\\' ?
ApacheSchemaConstants.WINDOWS_FILE_AT :
ApacheSchemaConstants.UNIX_FILE_AT;
- return new LdapDN( fileSep +
+ return new DN( fileSep +
"=" +
StringTools.dumpHexPairs( StringTools.getBytesUtf8( getCanonical( ldif ) ) ) +
"," +
@@ -388,7 +388,7 @@
}
- LdapDN dn = new LdapDN( ServerDNConstants.ADMIN_SYSTEM_DN );
+ DN dn = new DN( ServerDNConstants.ADMIN_SYSTEM_DN );
// Must normalize the dn or - IllegalStateException!
dn.normalize( directoryService.getSchemaManager().getNormalizerMapping() );
Modified: directory/apacheds/trunk/server-jndi/src/test/java/org/apache/directory/server/configuration/ApacheDSTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/server-jndi/src/test/java/org/apache/directory/server/configuration/ApacheDSTest.java?rev=918775&r1=918774&r2=918775&view=diff
==============================================================================
--- directory/apacheds/trunk/server-jndi/src/test/java/org/apache/directory/server/configuration/ApacheDSTest.java (original)
+++ directory/apacheds/trunk/server-jndi/src/test/java/org/apache/directory/server/configuration/ApacheDSTest.java Wed Mar 3 23:36:32 2010
@@ -54,7 +54,7 @@
JdbmPartition example = new JdbmPartition();
example.setId( "example" );
example.setSuffix( "dc=example,dc=com" );
- LdapDN contextDn = new LdapDN( "dc=example,dc=com" );
+ DN contextDn = new DN( "dc=example,dc=com" );
contextDn.normalize( directoryService.getRegistries().getAttributeTypeRegistry().getNormalizerMapping() );
ServerEntry contextEntry = new DefaultServerEntry( directoryService.getRegistries(), contextDn );
contextEntry.add( "objectClass", "top", "domain" );
@@ -83,7 +83,7 @@
LOG.error( "Failed to start up ApacheDS!", t );
}
- LdapDN dn = new LdapDN( "uid=aeinstein,ou=Users,dc=example,dc=com" );
+ DN dn = new DN( "uid=aeinstein,ou=Users,dc=example,dc=com" );
assertNotNull( directoryService.getAdminSession().lookup( dn ) );
}
*/
Modified: directory/apacheds/trunk/server-replication/src/main/java/org/apache/directory/server/replication/configuration/ReplicationAgreement.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/server-replication/src/main/java/org/apache/directory/server/replication/configuration/ReplicationAgreement.java?rev=918775&r1=918774&r2=918775&view=diff
==============================================================================
--- directory/apacheds/trunk/server-replication/src/main/java/org/apache/directory/server/replication/configuration/ReplicationAgreement.java (original)
+++ directory/apacheds/trunk/server-replication/src/main/java/org/apache/directory/server/replication/configuration/ReplicationAgreement.java Wed Mar 3 23:36:32 2010
@@ -23,7 +23,7 @@
import java.util.List;
import java.util.Set;
-import org.apache.directory.shared.ldap.name.LdapDN;
+import org.apache.directory.shared.ldap.name.DN;
import org.apache.directory.shared.ldap.subtree.SubtreeSpecification;
@@ -80,7 +80,7 @@
/**
* The administrative point for the replication specific autonomous area.
*/
- LdapDN replicationBase;
+ DN replicationBase;
/**
* The schedule to use for initiating replication cycles. You can have more than
Modified: directory/apacheds/trunk/server-tools/src/main/java/org/apache/directory/server/tools/ImportCommand.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/server-tools/src/main/java/org/apache/directory/server/tools/ImportCommand.java?rev=918775&r1=918774&r2=918775&view=diff
==============================================================================
--- directory/apacheds/trunk/server-tools/src/main/java/org/apache/directory/server/tools/ImportCommand.java (original)
+++ directory/apacheds/trunk/server-tools/src/main/java/org/apache/directory/server/tools/ImportCommand.java Wed Mar 3 23:36:32 2010
@@ -63,7 +63,7 @@
import org.apache.directory.shared.ldap.ldif.LdifEntry;
import org.apache.directory.shared.ldap.ldif.LdifReader;
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.name.RDN;
import org.apache.directory.shared.ldap.util.StringTools;
@@ -227,7 +227,7 @@
Entry entry = ldifEntry.getEntry();
- addRequest.setEntryDn( new LdapDN( dn ) );
+ addRequest.setEntryDn( new DN( dn ) );
// Copy the attributes
for ( EntryAttribute attribute:entry )
@@ -294,7 +294,7 @@
System.out.println( "Deleting entry " + dn );
}
- delRequest.setEntry( new LdapDN( dn ) );
+ delRequest.setEntry( new DN( dn ) );
delRequest.setMessageId( messageId );
@@ -349,13 +349,13 @@
System.out.println( "Modify DN of entry " + dn );
}
- modifyDNRequest.setEntry( new LdapDN( dn ) );
+ modifyDNRequest.setEntry( new DN( dn ) );
modifyDNRequest.setDeleteOldRDN( entry.isDeleteOldRdn() );
modifyDNRequest.setNewRDN( new RDN( entry.getNewRdn() ) );
if ( StringTools.isEmpty( entry.getNewSuperior() ) == false )
{
- modifyDNRequest.setNewSuperior( new LdapDN( entry.getNewSuperior() ) );
+ modifyDNRequest.setNewSuperior( new DN( entry.getNewSuperior() ) );
}
modifyDNRequest.setMessageId( messageId );
@@ -409,7 +409,7 @@
System.out.println( "Modify of entry " + dn );
}
- modifyRequest.setObject( new LdapDN( dn ) );
+ modifyRequest.setObject( new DN( dn ) );
modifyRequest.initModifications();
for ( Modification modification: entry.getModificationItems() )
@@ -506,7 +506,7 @@
}
bindRequest.setAuthentication( authentication );
- bindRequest.setName( new LdapDN( user ) );
+ bindRequest.setName( new DN( user ) );
bindRequest.setVersion( 3 );
bindRequest.setMessageId( messageId );
Modified: directory/apacheds/trunk/xdbm-base/src/main/java/org/apache/directory/server/core/partition/impl/btree/BTreePartition.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-base/src/main/java/org/apache/directory/server/core/partition/impl/btree/BTreePartition.java?rev=918775&r1=918774&r2=918775&view=diff
==============================================================================
--- directory/apacheds/trunk/xdbm-base/src/main/java/org/apache/directory/server/core/partition/impl/btree/BTreePartition.java (original)
+++ directory/apacheds/trunk/xdbm-base/src/main/java/org/apache/directory/server/core/partition/impl/btree/BTreePartition.java Wed Mar 3 23:36:32 2010
@@ -52,7 +52,7 @@
import org.apache.directory.server.xdbm.search.SearchEngine;
import org.apache.directory.shared.ldap.exception.LdapContextNotEmptyException;
import org.apache.directory.shared.ldap.exception.LdapNameNotFoundException;
-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;
@@ -91,7 +91,7 @@
protected String id;
protected int cacheSize = -1;
- protected LdapDN suffix;
+ protected DN suffix;
private File partitionDir;
/** The rootDSE context */
@@ -252,7 +252,7 @@
*/
public void delete( DeleteOperationContext opContext ) throws Exception
{
- LdapDN dn = opContext.getDn();
+ DN dn = opContext.getDn();
ID id = getEntryId( dn.getNormName() );
@@ -516,7 +516,7 @@
*/
public void setSuffix( String suffix ) throws InvalidNameException
{
- this.suffix = new LdapDN( suffix );
+ this.suffix = new DN( suffix );
}
@@ -532,7 +532,7 @@
/**
* {@inheritDoc}
*/
- public LdapDN getSuffixDn()
+ public DN getSuffixDn()
{
return suffix;
}
Modified: directory/apacheds/trunk/xdbm-base/src/main/java/org/apache/directory/server/xdbm/AbstractXdbmPartition.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-base/src/main/java/org/apache/directory/server/xdbm/AbstractXdbmPartition.java?rev=918775&r1=918774&r2=918775&view=diff
==============================================================================
--- directory/apacheds/trunk/xdbm-base/src/main/java/org/apache/directory/server/xdbm/AbstractXdbmPartition.java (original)
+++ directory/apacheds/trunk/xdbm-base/src/main/java/org/apache/directory/server/xdbm/AbstractXdbmPartition.java Wed Mar 3 23:36:32 2010
@@ -37,7 +37,7 @@
import org.apache.directory.shared.ldap.exception.LdapAuthenticationNotSupportedException;
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.name.RDN;
@@ -393,11 +393,11 @@
* @param newParentDn new parent entry's DN
* @throws Exception
*/
- private void checkIsValidMove( LdapDN oldChildDn, LdapDN newParentDn ) throws Exception
+ private void checkIsValidMove( DN oldChildDn, DN newParentDn ) throws Exception
{
boolean invalid = false;
- LdapDN newParentDNClone = ( LdapDN ) newParentDn.clone();
+ DN newParentDNClone = ( DN ) newParentDn.clone();
newParentDNClone.remove( newParentDNClone.size() - 1 );
if ( newParentDn.size() >= oldChildDn.size() )
@@ -428,7 +428,7 @@
}
- public final void bind( LdapDN bindDn, byte[] credentials, List<String> mechanisms, String saslAuthId )
+ public final void bind( DN bindDn, byte[] credentials, List<String> mechanisms, String saslAuthId )
throws Exception
{
if ( bindDn == null || credentials == null || mechanisms == null || saslAuthId == null )
Modified: directory/apacheds/trunk/xdbm-base/src/main/java/org/apache/directory/server/xdbm/Store.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-base/src/main/java/org/apache/directory/server/xdbm/Store.java?rev=918775&r1=918774&r2=918775&view=diff
==============================================================================
--- directory/apacheds/trunk/xdbm-base/src/main/java/org/apache/directory/server/xdbm/Store.java (original)
+++ directory/apacheds/trunk/xdbm-base/src/main/java/org/apache/directory/server/xdbm/Store.java Wed Mar 3 23:36:32 2010
@@ -28,7 +28,7 @@
import org.apache.directory.server.core.entry.ServerEntry;
import org.apache.directory.shared.ldap.entry.Modification;
import org.apache.directory.shared.ldap.entry.ModificationOperation;
-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.SchemaManager;
@@ -479,10 +479,10 @@
int getChildCount( ID id ) throws Exception;
- LdapDN getSuffix();
+ DN getSuffix();
- LdapDN getUpSuffix();
+ DN getUpSuffix();
void setProperty( String propertyName, String propertyValue ) throws Exception;
@@ -491,10 +491,10 @@
String getProperty( String propertyName ) throws Exception;
- void modify( LdapDN dn, ModificationOperation modOp, ServerEntry mods ) throws Exception;
+ void modify( DN dn, ModificationOperation modOp, ServerEntry mods ) throws Exception;
- void modify( LdapDN dn, List<Modification> mods ) throws Exception;
+ void modify( DN dn, List<Modification> mods ) throws Exception;
/**
@@ -513,13 +513,13 @@
* @param deleteOldRdn whether or not to remove the old RDN attr/val
* @throws Exception if there are any errors propagating the name changes
*/
- void rename( LdapDN dn, RDN newRdn, boolean deleteOldRdn ) throws Exception;
+ void rename( DN dn, RDN newRdn, boolean deleteOldRdn ) throws Exception;
- void move( LdapDN oldChildDn, LdapDN newParentDn, RDN newRdn, boolean deleteOldRdn ) throws Exception;
+ void move( DN oldChildDn, DN newParentDn, RDN newRdn, boolean deleteOldRdn ) throws Exception;
- void move( LdapDN oldChildDn, LdapDN newParentDn ) throws Exception;
+ void move( DN oldChildDn, DN newParentDn ) throws Exception;
/**
Modified: directory/apacheds/trunk/xdbm-base/src/main/java/org/apache/directory/server/xdbm/search/SearchEngine.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-base/src/main/java/org/apache/directory/server/xdbm/search/SearchEngine.java?rev=918775&r1=918774&r2=918775&view=diff
==============================================================================
--- directory/apacheds/trunk/xdbm-base/src/main/java/org/apache/directory/server/xdbm/search/SearchEngine.java (original)
+++ directory/apacheds/trunk/xdbm-base/src/main/java/org/apache/directory/server/xdbm/search/SearchEngine.java Wed Mar 3 23:36:32 2010
@@ -23,7 +23,7 @@
import org.apache.directory.shared.ldap.constants.JndiPropertyConstants;
import org.apache.directory.shared.ldap.filter.ExprNode;
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.server.xdbm.IndexCursor;
import org.apache.directory.server.core.entry.ServerEntry;
@@ -84,7 +84,7 @@
* @return enumeration over SearchResults
* @throws Exception if the search fails
*/
- IndexCursor<ID, E, ID> cursor( LdapDN base, AliasDerefMode aliasDerefMode, ExprNode filter,
+ IndexCursor<ID, E, ID> cursor( DN base, AliasDerefMode aliasDerefMode, ExprNode filter,
SearchControls searchCtls ) throws Exception;