You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by el...@apache.org on 2010/03/04 00:05:32 UTC
svn commit: r918756 [1/6] - in /directory/shared/trunk:
dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/engine/
dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/reponse/
dsml-parser/src/main/java/org/apache/directory/shared/dsm...
Author: elecharny
Date: Wed Mar 3 23:05:29 2010
New Revision: 918756
URL: http://svn.apache.org/viewvc?rev=918756&view=rev
Log:
Renaming LdapDN to DN (and all the associated classes)
Added:
directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/name/ComplexDnParser.java
- copied, changed from r918714, directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/name/ComplexLdapDnParser.java
directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/name/DN.java
- copied, changed from r918714, directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/name/LdapDN.java
directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/name/DnParser.java
- copied, changed from r918714, directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/name/LdapDnParser.java
directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/name/DnSerializer.java
- copied, changed from r918714, directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/name/LdapDNSerializer.java
directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/name/FastDnParser.java
- copied, changed from r918714, directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/name/FastLdapDnParser.java
directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/name/DNTest.java
- copied, changed from r918714, directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/name/LdapDNTest.java
directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/name/DnParserTest.java
- copied, changed from r918714, directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/name/LdapDnParserTest.java
directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/name/FastDnParserTest.java
- copied, changed from r918714, directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/name/FastLdapDnParserTest.java
Removed:
directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/name/ComplexLdapDnParser.java
directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/name/FastLdapDnParser.java
directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/name/LdapDN.java
directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/name/LdapDNSerializer.java
directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/name/LdapDnParser.java
directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/name/FastLdapDnParserTest.java
directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/name/LdapDNTest.java
directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/name/LdapDnParserTest.java
Modified:
directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/engine/Dsmlv2Engine.java
directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/reponse/Dsmlv2ResponseGrammar.java
directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/reponse/LdapResultDsml.java
directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/reponse/SearchResultEntryDsml.java
directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/request/AddRequestDsml.java
directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/request/CompareRequestDsml.java
directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/request/DelRequestDsml.java
directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/request/Dsmlv2Grammar.java
directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/request/ModifyDNRequestDsml.java
directory/shared/trunk/ldap-convert/src/main/java/org/apache/directory/shared/converter/schema/AttributeTypeHolder.java
directory/shared/trunk/ldap-convert/src/main/java/org/apache/directory/shared/converter/schema/ObjectClassHolder.java
directory/shared/trunk/ldap-ldif/src/main/java/org/apache/directory/shared/ldap/ldif/LdifEntry.java
directory/shared/trunk/ldap-ldif/src/main/java/org/apache/directory/shared/ldap/ldif/LdifReader.java
directory/shared/trunk/ldap-ldif/src/main/java/org/apache/directory/shared/ldap/ldif/LdifRevertor.java
directory/shared/trunk/ldap-ldif/src/main/java/org/apache/directory/shared/ldap/ldif/LdifUtils.java
directory/shared/trunk/ldap-ldif/src/test/java/org/apache/directory/shared/ldap/ldif/LdifRevertorTest.java
directory/shared/trunk/ldap-ldif/src/test/java/org/apache/directory/shared/ldap/ldif/LdifUtilsTest.java
directory/shared/trunk/ldap-schema-manager/src/main/java/org/apache/directory/shared/ldap/schema/manager/impl/DefaultSchemaManager.java
directory/shared/trunk/ldap/src/main/antlr/ACIItem.g
directory/shared/trunk/ldap/src/main/antlr/SubtreeSpecificationChecker.g
directory/shared/trunk/ldap/src/main/antlr/TriggerSpecification.g
directory/shared/trunk/ldap/src/main/antlr/distinguishedName.g
directory/shared/trunk/ldap/src/main/antlr/subtree-specification.g
directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/aci/UserClass.java
directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/LdapMessageGrammar.java
directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/LdapResultCodec.java
directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/LdapTransformer.java
directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/ResponseCarryingException.java
directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/MatchedDNAction.java
directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/add/AddRequestCodec.java
directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/bind/BindRequestCodec.java
directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/compare/CompareRequestCodec.java
directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/del/DelRequestCodec.java
directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/extended/operations/certGeneration/CertGenerationGrammar.java
directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/modify/ModifyRequestCodec.java
directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/modifyDn/ModifyDNRequestCodec.java
directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/SearchRequestCodec.java
directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/SearchResultEntryCodec.java
directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/entryChange/EntryChangeControl.java
directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/entryChange/EntryChangeControlGrammar.java
directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/entry/AbstractEntry.java
directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/entry/Entry.java
directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/entry/client/DefaultClientEntry.java
directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/AddRequestImpl.java
directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/BindRequestImpl.java
directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/CompareRequestImpl.java
directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/DeleteRequestImpl.java
directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/LdapResultImpl.java
directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/ModifyDnRequestImpl.java
directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/ModifyRequestImpl.java
directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/SearchRequestImpl.java
directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/SearchResponseEntryImpl.java
directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/internal/InternalAddRequest.java
directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/internal/InternalBindRequest.java
directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/internal/InternalCompareRequest.java
directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/internal/InternalDeleteRequest.java
directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/internal/InternalLdapResult.java
directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/internal/InternalModifyDnRequest.java
directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/internal/InternalModifyRequest.java
directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/internal/InternalSearchRequest.java
directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/internal/InternalSearchResponseEntry.java
directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/name/RDN.java
directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/name/RdnParser.java
directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/SchemaDao.java
directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/SchemaManager.java
directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/comparators/DnComparator.java
directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/comparators/UniqueMemberComparator.java
directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/normalizers/DnNormalizer.java
directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/normalizers/UniqueMemberNormalizer.java
directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxCheckers/DNSyntaxChecker.java
directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxCheckers/NameAndOptionalUIDSyntaxChecker.java
directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/subtree/BaseSubtreeSpecification.java
directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/subtree/SubtreeSpecification.java
directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/subtree/SubtreeSpecificationModifier.java
directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/trigger/StoredProcedureParameter.java
directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/util/AttributeUtils.java
directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/util/DNUtils.java
directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/util/LdapURL.java
directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/util/NamespaceTools.java
directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/util/tree/DnBranchNode.java
directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/bind/BindRequestPerfTest.java
directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/bind/BindRequestTest.java
directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/search/controls/EntryChangeControlTest.java
directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/entry/client/DefaultClientEntryTest.java
directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/message/AbstractResultResponseTest.java
directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/message/AddRequestImplTest.java
directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/message/BindRequestImplTest.java
directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/message/BindResponseImplTest.java
directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/message/CompareRequestImplTest.java
directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/message/DeleteRequestImplTest.java
directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/message/ExtendedResponseImplTest.java
directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/message/LdapResultImplTest.java
directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/message/ModifyDnRequestImplTest.java
directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/message/ModifyRequestImplTest.java
directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/message/SearchResponseDoneImplTest.java
directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/message/SearchResponseEntryImplTest.java
directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/name/DnParserDIRSERVER_584_Test.java
directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/subtree/SubtreeSpecificationParserTest.java
directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/trigger/TriggerSpecificationParserTest.java
directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/util/LdapUrlTest.java
directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/util/NamespaceToolsTest.java
directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/util/tree/TestDnNode.java
Modified: directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/engine/Dsmlv2Engine.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/engine/Dsmlv2Engine.java?rev=918756&r1=918755&r2=918756&view=diff
==============================================================================
--- directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/engine/Dsmlv2Engine.java (original)
+++ directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/engine/Dsmlv2Engine.java Wed Mar 3 23:05:29 2010
@@ -76,7 +76,7 @@
import org.apache.directory.shared.ldap.codec.search.SearchResultReferenceCodec;
import org.apache.directory.shared.ldap.message.ResultCodeEnum;
import org.apache.directory.shared.ldap.message.control.Control;
-import org.apache.directory.shared.ldap.name.LdapDN;
+import org.apache.directory.shared.ldap.name.DN;
import org.apache.directory.shared.ldap.util.StringTools;
import org.xmlpull.v1.XmlPullParserException;
@@ -627,7 +627,7 @@
( ( SimpleAuthentication ) authentication ).setSimple( StringTools.getBytesUtf8( password ) );
bindRequest.setAuthentication( authentication );
- bindRequest.setName( new LdapDN( user ) );
+ bindRequest.setName( new DN( user ) );
bindRequest.setVersion( 3 );
bindRequest.setMessageId( messageId );
Modified: directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/reponse/Dsmlv2ResponseGrammar.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/reponse/Dsmlv2ResponseGrammar.java?rev=918756&r1=918755&r2=918756&view=diff
==============================================================================
--- directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/reponse/Dsmlv2ResponseGrammar.java (original)
+++ directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/reponse/Dsmlv2ResponseGrammar.java Wed Mar 3 23:05:29 2010
@@ -58,7 +58,7 @@
import org.apache.directory.shared.ldap.codec.util.LdapURLEncodingException;
import org.apache.directory.shared.ldap.message.ResultCodeEnum;
import org.apache.directory.shared.ldap.message.control.Control;
-import org.apache.directory.shared.ldap.name.LdapDN;
+import org.apache.directory.shared.ldap.name.DN;
import org.apache.directory.shared.ldap.util.Base64;
import org.apache.directory.shared.ldap.util.LdapURL;
import org.xmlpull.v1.XmlPullParser;
@@ -803,7 +803,7 @@
{
try
{
- ldapResult.setMatchedDN( new LdapDN( attributeValue ) );
+ ldapResult.setMatchedDN( new DN( attributeValue ) );
}
catch ( InvalidNameException e )
{
@@ -845,7 +845,7 @@
{
try
{
- ldapResult.setMatchedDN( new LdapDN( attributeValue ) );
+ ldapResult.setMatchedDN( new DN( attributeValue ) );
}
catch ( InvalidNameException e )
{
@@ -886,7 +886,7 @@
{
try
{
- ldapResult.setMatchedDN( new LdapDN( attributeValue ) );
+ ldapResult.setMatchedDN( new DN( attributeValue ) );
}
catch ( InvalidNameException e )
{
@@ -927,7 +927,7 @@
{
try
{
- ldapResult.setMatchedDN( new LdapDN( attributeValue ) );
+ ldapResult.setMatchedDN( new DN( attributeValue ) );
}
catch ( InvalidNameException e )
{
@@ -968,7 +968,7 @@
{
try
{
- ldapResult.setMatchedDN( new LdapDN( attributeValue ) );
+ ldapResult.setMatchedDN( new DN( attributeValue ) );
}
catch ( InvalidNameException e )
{
@@ -1009,7 +1009,7 @@
{
try
{
- ldapResult.setMatchedDN( new LdapDN( attributeValue ) );
+ ldapResult.setMatchedDN( new DN( attributeValue ) );
}
catch ( InvalidNameException e )
{
@@ -1050,7 +1050,7 @@
{
try
{
- ldapResult.setMatchedDN( new LdapDN( attributeValue ) );
+ ldapResult.setMatchedDN( new DN( attributeValue ) );
}
catch ( InvalidNameException e )
{
@@ -1546,7 +1546,7 @@
{
try
{
- searchResultEntry.setObjectName( new LdapDN( attributeValue ) );
+ searchResultEntry.setObjectName( new DN( attributeValue ) );
}
catch ( InvalidNameException e )
{
@@ -1619,7 +1619,7 @@
{
try
{
- searchResultDone.getLdapResult().setMatchedDN( new LdapDN( attributeValue ) );
+ searchResultDone.getLdapResult().setMatchedDN( new DN( attributeValue ) );
}
catch ( InvalidNameException e )
{
Modified: directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/reponse/LdapResultDsml.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/reponse/LdapResultDsml.java?rev=918756&r1=918755&r2=918756&view=diff
==============================================================================
--- directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/reponse/LdapResultDsml.java (original)
+++ directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/reponse/LdapResultDsml.java Wed Mar 3 23:05:29 2010
@@ -29,7 +29,7 @@
import org.apache.directory.shared.ldap.codec.LdapResultCodec;
import org.apache.directory.shared.ldap.util.LdapURL;
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.dom4j.Element;
@@ -161,7 +161,7 @@
*
* @param matchedDN The matchedDN to set.
*/
- public void setMatchedDN( LdapDN matchedDN )
+ public void setMatchedDN( DN matchedDN )
{
result.setMatchedDN( matchedDN );
}
Modified: directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/reponse/SearchResultEntryDsml.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/reponse/SearchResultEntryDsml.java?rev=918756&r1=918755&r2=918756&view=diff
==============================================================================
--- directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/reponse/SearchResultEntryDsml.java (original)
+++ directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/reponse/SearchResultEntryDsml.java Wed Mar 3 23:05:29 2010
@@ -28,7 +28,7 @@
import org.apache.directory.shared.ldap.entry.Entry;
import org.apache.directory.shared.ldap.entry.EntryAttribute;
import org.apache.directory.shared.ldap.entry.Value;
-import org.apache.directory.shared.ldap.name.LdapDN;
+import org.apache.directory.shared.ldap.name.DN;
import org.dom4j.Element;
import org.dom4j.Namespace;
import org.dom4j.QName;
@@ -118,7 +118,7 @@
*
* @return Returns the objectName.
*/
- public LdapDN getObjectName()
+ public DN getObjectName()
{
return ( ( SearchResultEntryCodec ) instance ).getObjectName();
}
@@ -129,7 +129,7 @@
*
* @param objectName The objectName to set.
*/
- public void setObjectName( LdapDN objectName )
+ public void setObjectName( DN objectName )
{
( ( SearchResultEntryCodec ) instance ).setObjectName( objectName );
}
Modified: directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/request/AddRequestDsml.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/request/AddRequestDsml.java?rev=918756&r1=918755&r2=918756&view=diff
==============================================================================
--- directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/request/AddRequestDsml.java (original)
+++ directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/request/AddRequestDsml.java Wed Mar 3 23:05:29 2010
@@ -28,7 +28,7 @@
import org.apache.directory.shared.ldap.entry.Entry;
import org.apache.directory.shared.ldap.entry.EntryAttribute;
import org.apache.directory.shared.ldap.entry.Value;
-import org.apache.directory.shared.ldap.name.LdapDN;
+import org.apache.directory.shared.ldap.name.DN;
import org.dom4j.Element;
import org.dom4j.Namespace;
import org.dom4j.QName;
@@ -181,7 +181,7 @@
*
* @return Returns the entry DN.
*/
- public LdapDN getEntryDn()
+ public DN getEntryDn()
{
return ( ( AddRequestCodec ) instance ).getEntryDn();
}
@@ -192,7 +192,7 @@
*
* @param entry The entry DN to set.
*/
- public void setEntryDn( LdapDN entryDn )
+ public void setEntryDn( DN entryDn )
{
( ( AddRequestCodec ) instance ).setEntryDn( entryDn );
}
Modified: directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/request/CompareRequestDsml.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/request/CompareRequestDsml.java?rev=918756&r1=918755&r2=918756&view=diff
==============================================================================
--- directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/request/CompareRequestDsml.java (original)
+++ directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/request/CompareRequestDsml.java Wed Mar 3 23:05:29 2010
@@ -22,7 +22,7 @@
import org.apache.directory.shared.ldap.codec.MessageTypeEnum;
import org.apache.directory.shared.ldap.codec.compare.CompareRequestCodec;
-import org.apache.directory.shared.ldap.name.LdapDN;
+import org.apache.directory.shared.ldap.name.DN;
import org.dom4j.Element;
@@ -99,7 +99,7 @@
*
* @return Returns the entry.
*/
- public LdapDN getEntry()
+ public DN getEntry()
{
return ( ( CompareRequestCodec ) instance ).getEntry();
}
@@ -110,7 +110,7 @@
*
* @param entry The entry to set.
*/
- public void setEntry( LdapDN entry )
+ public void setEntry( DN entry )
{
( ( CompareRequestCodec ) instance ).setEntry( entry );
}
Modified: directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/request/DelRequestDsml.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/request/DelRequestDsml.java?rev=918756&r1=918755&r2=918756&view=diff
==============================================================================
--- directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/request/DelRequestDsml.java (original)
+++ directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/request/DelRequestDsml.java Wed Mar 3 23:05:29 2010
@@ -22,7 +22,7 @@
import org.apache.directory.shared.ldap.codec.MessageTypeEnum;
import org.apache.directory.shared.ldap.codec.del.DelRequestCodec;
-import org.apache.directory.shared.ldap.name.LdapDN;
+import org.apache.directory.shared.ldap.name.DN;
import org.dom4j.Element;
@@ -88,7 +88,7 @@
*
* @return Returns the entry.
*/
- public LdapDN getEntry()
+ public DN getEntry()
{
return ( ( DelRequestCodec ) instance ).getEntry();
}
@@ -99,7 +99,7 @@
*
* @param entry The entry to set.
*/
- public void setEntry( LdapDN entry )
+ public void setEntry( DN entry )
{
( ( DelRequestCodec ) instance ).setEntry( entry );
}
Modified: directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/request/Dsmlv2Grammar.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/request/Dsmlv2Grammar.java?rev=918756&r1=918755&r2=918756&view=diff
==============================================================================
--- directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/request/Dsmlv2Grammar.java (original)
+++ directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/request/Dsmlv2Grammar.java Wed Mar 3 23:05:29 2010
@@ -69,7 +69,7 @@
import org.apache.directory.shared.ldap.entry.client.ClientStringValue;
import org.apache.directory.shared.ldap.filter.SearchScope;
import org.apache.directory.shared.ldap.message.control.Control;
-import org.apache.directory.shared.ldap.name.LdapDN;
+import org.apache.directory.shared.ldap.name.DN;
import org.apache.directory.shared.ldap.name.RDN;
import org.apache.directory.shared.ldap.util.Base64;
import org.apache.directory.shared.ldap.util.StringTools;
@@ -1207,7 +1207,7 @@
{
try
{
- addRequest.setEntryDn( new LdapDN( attributeValue ) );
+ addRequest.setEntryDn( new DN( attributeValue ) );
}
catch ( InvalidNameException e )
{
@@ -1328,7 +1328,7 @@
{
try
{
- authRequest.setName( new LdapDN( attributeValue ) );
+ authRequest.setName( new DN( attributeValue ) );
}
catch ( InvalidNameException e )
{
@@ -1375,7 +1375,7 @@
{
try
{
- compareRequest.setEntry( new LdapDN( attributeValue ) );
+ compareRequest.setEntry( new DN( attributeValue ) );
}
catch ( InvalidNameException e )
{
@@ -1486,7 +1486,7 @@
{
try
{
- delRequest.setEntry( new LdapDN( attributeValue ) );
+ delRequest.setEntry( new DN( attributeValue ) );
}
catch ( InvalidNameException e )
{
@@ -1632,7 +1632,7 @@
{
try
{
- modifyDNRequest.setEntry( new LdapDN( attributeValue ) );
+ modifyDNRequest.setEntry( new DN( attributeValue ) );
}
catch ( InvalidNameException e )
{
@@ -1687,7 +1687,7 @@
{
try
{
- modifyDNRequest.setNewSuperior( new LdapDN( attributeValue ) );
+ modifyDNRequest.setNewSuperior( new DN( attributeValue ) );
}
catch ( InvalidNameException e )
{
@@ -1732,7 +1732,7 @@
{
try
{
- modifyRequest.setObject( new LdapDN( attributeValue ) );
+ modifyRequest.setObject( new DN( attributeValue ) );
}
catch ( InvalidNameException e )
{
@@ -1867,7 +1867,7 @@
{
try
{
- searchRequest.setBaseObject( new LdapDN( attributeValue ) );
+ searchRequest.setBaseObject( new DN( attributeValue ) );
}
catch ( InvalidNameException e )
{
Modified: directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/request/ModifyDNRequestDsml.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/request/ModifyDNRequestDsml.java?rev=918756&r1=918755&r2=918756&view=diff
==============================================================================
--- directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/request/ModifyDNRequestDsml.java (original)
+++ directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/request/ModifyDNRequestDsml.java Wed Mar 3 23:05:29 2010
@@ -22,7 +22,7 @@
import org.apache.directory.shared.ldap.codec.MessageTypeEnum;
import org.apache.directory.shared.ldap.codec.modifyDn.ModifyDNRequestCodec;
-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.dom4j.Element;
@@ -104,7 +104,7 @@
*
* @return Returns the entry.
*/
- public LdapDN getEntry()
+ public DN getEntry()
{
return ( ( ModifyDNRequestCodec ) instance ).getEntry();
}
@@ -115,7 +115,7 @@
*
* @param entry The entry to set.
*/
- public void setEntry( LdapDN entry )
+ public void setEntry( DN entry )
{
( ( ModifyDNRequestCodec ) instance ).setEntry( entry );
}
@@ -170,7 +170,7 @@
*
* @return Returns the newSuperior.
*/
- public LdapDN getNewSuperior()
+ public DN getNewSuperior()
{
return ( ( ModifyDNRequestCodec ) instance ).getNewSuperior();
}
@@ -181,7 +181,7 @@
*
* @param newSuperior The newSuperior to set.
*/
- public void setNewSuperior( LdapDN newSuperior )
+ public void setNewSuperior( DN newSuperior )
{
( ( ModifyDNRequestCodec ) instance ).setNewSuperior( newSuperior );
}
Modified: directory/shared/trunk/ldap-convert/src/main/java/org/apache/directory/shared/converter/schema/AttributeTypeHolder.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap-convert/src/main/java/org/apache/directory/shared/converter/schema/AttributeTypeHolder.java?rev=918756&r1=918755&r2=918756&view=diff
==============================================================================
--- directory/shared/trunk/ldap-convert/src/main/java/org/apache/directory/shared/converter/schema/AttributeTypeHolder.java (original)
+++ directory/shared/trunk/ldap-convert/src/main/java/org/apache/directory/shared/converter/schema/AttributeTypeHolder.java Wed Mar 3 23:05:29 2010
@@ -26,7 +26,7 @@
import org.apache.directory.shared.ldap.entry.Entry;
import org.apache.directory.shared.ldap.entry.client.DefaultClientEntry;
import org.apache.directory.shared.ldap.ldif.LdifUtils;
-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.UsageEnum;
@@ -423,7 +423,7 @@
String dn = "m-oid=" + oid + ", " + SchemaConstants.ATTRIBUTES_TYPE_PATH + ", cn=" + RDN.escapeValue( schemaName ) + ", ou=schema";
// First dump the DN only
- Entry entry = new DefaultClientEntry( new LdapDN( dn ) );
+ Entry entry = new DefaultClientEntry( new DN( dn ) );
sb.append( LdifUtils.convertEntryToLdif( entry ) );
return sb.toString();
Modified: directory/shared/trunk/ldap-convert/src/main/java/org/apache/directory/shared/converter/schema/ObjectClassHolder.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap-convert/src/main/java/org/apache/directory/shared/converter/schema/ObjectClassHolder.java?rev=918756&r1=918755&r2=918756&view=diff
==============================================================================
--- directory/shared/trunk/ldap-convert/src/main/java/org/apache/directory/shared/converter/schema/ObjectClassHolder.java (original)
+++ directory/shared/trunk/ldap-convert/src/main/java/org/apache/directory/shared/converter/schema/ObjectClassHolder.java Wed Mar 3 23:05:29 2010
@@ -29,7 +29,7 @@
import org.apache.directory.shared.ldap.entry.Entry;
import org.apache.directory.shared.ldap.entry.client.DefaultClientEntry;
import org.apache.directory.shared.ldap.ldif.LdifUtils;
-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.ObjectClassTypeEnum;
@@ -216,7 +216,7 @@
String dn = "m-oid=" + oid + ", " + SchemaConstants.OBJECT_CLASSES_PATH + ", cn=" + RDN.escapeValue( schemaName ) + ", ou=schema";
// First dump the DN only
- Entry entry = new DefaultClientEntry( new LdapDN( dn ) );
+ Entry entry = new DefaultClientEntry( new DN( dn ) );
sb.append( LdifUtils.convertEntryToLdif( entry ) );
return sb.toString();
Modified: directory/shared/trunk/ldap-ldif/src/main/java/org/apache/directory/shared/ldap/ldif/LdifEntry.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap-ldif/src/main/java/org/apache/directory/shared/ldap/ldif/LdifEntry.java?rev=918756&r1=918755&r2=918756&view=diff
==============================================================================
--- directory/shared/trunk/ldap-ldif/src/main/java/org/apache/directory/shared/ldap/ldif/LdifEntry.java (original)
+++ directory/shared/trunk/ldap-ldif/src/main/java/org/apache/directory/shared/ldap/ldif/LdifEntry.java Wed Mar 3 23:05:29 2010
@@ -43,7 +43,7 @@
import org.apache.directory.shared.ldap.entry.client.DefaultClientAttribute;
import org.apache.directory.shared.ldap.entry.client.DefaultClientEntry;
import org.apache.directory.shared.ldap.message.control.Control;
-import org.apache.directory.shared.ldap.name.LdapDN;
+import org.apache.directory.shared.ldap.name.DN;
import org.apache.directory.shared.ldap.name.RDN;
import org.apache.directory.shared.ldap.util.StringTools;
@@ -111,22 +111,20 @@
* @param dn
* The Distinguished Name
*/
- public void setDn( LdapDN dn )
+ public void setDn( DN dn )
{
- entry.setDn( (LdapDN)dn.clone() );
+ entry.setDn( (DN)dn.clone() );
}
/**
* Set the Distinguished Name
*
- * @param dn
- * The Distinguished Name
+ * @param dn The Distinguished Name
*/
public void setDn( String dn ) throws InvalidNameException
{
- LdapDN ldapDn = new LdapDN( dn );
- entry.setDn( ldapDn );
+ entry.setDn( new DN( dn ) );
}
@@ -350,7 +348,7 @@
/**
* @return The entry Distinguished name
*/
- public LdapDN getDn()
+ public DN getDn()
{
return entry.getDn();
}
@@ -767,8 +765,8 @@
LdifEntry otherEntry = (LdifEntry)o;
// Check the DN
- LdapDN thisDn = entry.getDn();
- LdapDN dnEntry = otherEntry.getDn();
+ DN thisDn = entry.getDn();
+ DN dnEntry = otherEntry.getDn();
if ( !thisDn.equals( dnEntry ) )
{
@@ -888,8 +886,8 @@
// Check the newSuperior value
try
{
- LdapDN thisNewSuperior = new LdapDN( newSuperior );
- LdapDN entryNewSuperior = new LdapDN( otherEntry.newSuperior );
+ DN thisNewSuperior = new DN( newSuperior );
+ DN entryNewSuperior = new DN( otherEntry.newSuperior );
if ( ! thisNewSuperior.equals( entryNewSuperior ) )
{
Modified: directory/shared/trunk/ldap-ldif/src/main/java/org/apache/directory/shared/ldap/ldif/LdifReader.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap-ldif/src/main/java/org/apache/directory/shared/ldap/ldif/LdifReader.java?rev=918756&r1=918755&r2=918756&view=diff
==============================================================================
--- directory/shared/trunk/ldap-ldif/src/main/java/org/apache/directory/shared/ldap/ldif/LdifReader.java (original)
+++ directory/shared/trunk/ldap-ldif/src/main/java/org/apache/directory/shared/ldap/ldif/LdifReader.java Wed Mar 3 23:05:29 2010
@@ -52,8 +52,8 @@
import org.apache.directory.shared.ldap.entry.ModificationOperation;
import org.apache.directory.shared.ldap.entry.client.DefaultClientAttribute;
import org.apache.directory.shared.ldap.message.control.Control;
-import org.apache.directory.shared.ldap.name.LdapDN;
-import org.apache.directory.shared.ldap.name.LdapDnParser;
+import org.apache.directory.shared.ldap.name.DN;
+import org.apache.directory.shared.ldap.name.DnParser;
import org.apache.directory.shared.ldap.name.RDN;
import org.apache.directory.shared.ldap.util.Base64;
import org.apache.directory.shared.ldap.util.StringTools;
@@ -571,7 +571,7 @@
// Check that the DN is valid. If not, an exception will be thrown
try
{
- LdapDnParser.parseInternal( dn, new ArrayList<RDN>() );
+ DnParser.parseInternal( dn, new ArrayList<RDN>() );
}
catch ( InvalidNameException ine )
{
@@ -1248,7 +1248,7 @@
String name = parseDn( line );
- LdapDN dn = new LdapDN( name );
+ DN dn = new DN( name );
// Ok, we have found a DN
LdifEntry entry = new LdifEntry();
Modified: directory/shared/trunk/ldap-ldif/src/main/java/org/apache/directory/shared/ldap/ldif/LdifRevertor.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap-ldif/src/main/java/org/apache/directory/shared/ldap/ldif/LdifRevertor.java?rev=918756&r1=918755&r2=918756&view=diff
==============================================================================
--- directory/shared/trunk/ldap-ldif/src/main/java/org/apache/directory/shared/ldap/ldif/LdifRevertor.java (original)
+++ directory/shared/trunk/ldap-ldif/src/main/java/org/apache/directory/shared/ldap/ldif/LdifRevertor.java Wed Mar 3 23:05:29 2010
@@ -35,7 +35,7 @@
import org.apache.directory.shared.ldap.entry.client.ClientModification;
import org.apache.directory.shared.ldap.entry.client.DefaultClientAttribute;
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.util.AttributeUtils;
@@ -59,7 +59,7 @@
* @param dn the dn of the added entry
* @return a reverse LDIF
*/
- public static LdifEntry reverseAdd( LdapDN dn )
+ public static LdifEntry reverseAdd( DN dn )
{
LdifEntry entry = new LdifEntry();
entry.setChangeType( ChangeType.Delete );
@@ -76,7 +76,7 @@
* @param deletedEntry The entry which has been deleted
* @return A reverse LDIF
*/
- public static LdifEntry reverseDel( LdapDN dn, Entry deletedEntry ) throws NamingException
+ public static LdifEntry reverseDel( DN dn, Entry deletedEntry ) throws NamingException
{
LdifEntry entry = new LdifEntry();
@@ -110,7 +110,7 @@
* @return A reversed LDIF
* @throws NamingException If something went wrong
*/
- public static LdifEntry reverseModify( LdapDN dn, List<Modification> forwardModifications, Entry modifiedEntry )
+ public static LdifEntry reverseModify( DN dn, List<Modification> forwardModifications, Entry modifiedEntry )
throws NamingException
{
// First, protect the original entry by cloning it : we will modify it
@@ -248,12 +248,12 @@
* @return a reverse LDIF
* @throws NamingException if something went wrong
*/
- public static LdifEntry reverseMove( LdapDN newSuperiorDn, LdapDN modifiedDn ) throws NamingException
+ public static LdifEntry reverseMove( DN newSuperiorDn, DN modifiedDn ) throws NamingException
{
LdifEntry entry = new LdifEntry();
- LdapDN currentParent = null;
+ DN currentParent = null;
RDN currentRdn = null;
- LdapDN newDn = null;
+ DN newDn = null;
if ( newSuperiorDn == null )
{
@@ -270,11 +270,11 @@
throw new IllegalArgumentException( "Don't think about moving the rootDSE." );
}
- currentParent = ( LdapDN ) modifiedDn.clone();
+ currentParent = ( DN ) modifiedDn.clone();
currentRdn = currentParent.getRdn();
currentParent.remove( currentParent.size() - 1 );
- newDn = ( LdapDN ) newSuperiorDn.clone();
+ newDn = ( DN ) newSuperiorDn.clone();
newDn.add( modifiedDn.getRdn() );
entry.setChangeType( ChangeType.ModDn );
@@ -289,8 +289,8 @@
/**
* A small helper class to compute the simple revert.
*/
- private static LdifEntry revertEntry( List<LdifEntry> entries, Entry entry, LdapDN newDn,
- LdapDN newSuperior, RDN oldRdn, RDN newRdn ) throws InvalidNameException
+ private static LdifEntry revertEntry( List<LdifEntry> entries, Entry entry, DN newDn,
+ DN newSuperior, RDN oldRdn, RDN newRdn ) throws InvalidNameException
{
LdifEntry reverted = new LdifEntry();
@@ -300,7 +300,7 @@
if ( newSuperior != null )
{
- LdapDN restoredDn = (LdapDN)((LdapDN)newSuperior.clone()).add( newRdn );
+ DN restoredDn = (DN)((DN)newSuperior.clone()).add( newRdn );
reverted.setDn( restoredDn );
}
else
@@ -319,7 +319,7 @@
if ( newSuperior != null )
{
- LdapDN oldSuperior = ( LdapDN ) entry.getDn().clone();
+ DN oldSuperior = ( DN ) entry.getDn().clone();
oldSuperior.remove( oldSuperior.size() - 1 );
reverted.setNewSuperior( oldSuperior.getName() );
@@ -332,7 +332,7 @@
/**
* A helper method to generate the modified attribute after a rename.
*/
- private static LdifEntry generateModify( LdapDN parentDn, Entry entry, RDN oldRdn, RDN newRdn )
+ private static LdifEntry generateModify( DN parentDn, Entry entry, RDN oldRdn, RDN newRdn )
{
LdifEntry restored = new LdifEntry();
restored.setChangeType( ChangeType.Modify );
@@ -365,7 +365,7 @@
/**
* A helper method which generates a reverted entry
*/
- private static LdifEntry generateReverted( LdapDN newSuperior, RDN newRdn, LdapDN newDn,
+ private static LdifEntry generateReverted( DN newSuperior, RDN newRdn, DN newDn,
RDN oldRdn, boolean deleteOldRdn ) throws InvalidNameException
{
LdifEntry reverted = new LdifEntry();
@@ -373,7 +373,7 @@
if ( newSuperior != null )
{
- LdapDN restoredDn = (LdapDN)((LdapDN)newSuperior.clone()).add( newRdn );
+ DN restoredDn = (DN)((DN)newSuperior.clone()).add( newRdn );
reverted.setDn( restoredDn );
}
else
@@ -385,7 +385,7 @@
if ( newSuperior != null )
{
- LdapDN oldSuperior = ( LdapDN ) newDn.clone();
+ DN oldSuperior = ( DN ) newDn.clone();
oldSuperior.remove( oldSuperior.size() - 1 );
reverted.setNewSuperior( oldSuperior.getName() );
@@ -427,10 +427,10 @@
* @return A list of LDIF reverted entries
* @throws NamingException If the name reverting failed
*/
- public static List<LdifEntry> reverseMoveAndRename( Entry entry, LdapDN newSuperior, RDN newRdn, boolean deleteOldRdn ) throws NamingException
+ public static List<LdifEntry> reverseMoveAndRename( Entry entry, DN newSuperior, RDN newRdn, boolean deleteOldRdn ) throws NamingException
{
- LdapDN parentDn = entry.getDn();
- LdapDN newDn = null;
+ DN parentDn = entry.getDn();
+ DN newDn = null;
if ( newRdn == null )
{
@@ -447,10 +447,10 @@
throw new IllegalArgumentException( "Don't think about renaming the rootDSE." );
}
- parentDn = ( LdapDN ) entry.getDn().clone();
+ parentDn = ( DN ) entry.getDn().clone();
RDN oldRdn = parentDn.getRdn();
- newDn = ( LdapDN ) parentDn.clone();
+ newDn = ( DN ) parentDn.clone();
newDn.remove( newDn.size() - 1 );
newDn.add( newRdn );
Modified: directory/shared/trunk/ldap-ldif/src/main/java/org/apache/directory/shared/ldap/ldif/LdifUtils.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap-ldif/src/main/java/org/apache/directory/shared/ldap/ldif/LdifUtils.java?rev=918756&r1=918755&r2=918756&view=diff
==============================================================================
--- directory/shared/trunk/ldap-ldif/src/main/java/org/apache/directory/shared/ldap/ldif/LdifUtils.java (original)
+++ directory/shared/trunk/ldap-ldif/src/main/java/org/apache/directory/shared/ldap/ldif/LdifUtils.java Wed Mar 3 23:05:29 2010
@@ -30,7 +30,7 @@
import org.apache.directory.shared.ldap.entry.Modification;
import org.apache.directory.shared.ldap.entry.Value;
import org.apache.directory.shared.ldap.entry.client.DefaultClientAttribute;
-import org.apache.directory.shared.ldap.name.LdapDN;
+import org.apache.directory.shared.ldap.name.DN;
import org.apache.directory.shared.ldap.util.AttributeUtils;
import org.apache.directory.shared.ldap.util.Base64;
import org.apache.directory.shared.ldap.util.StringTools;
@@ -169,7 +169,7 @@
* @return the corresponding LDIF code as a String
* @throws NamingException If a naming exception is encountered.
*/
- public static String convertToLdif( Attributes attrs, LdapDN dn, int length ) throws NamingException
+ public static String convertToLdif( Attributes attrs, DN dn, int length ) throws NamingException
{
return convertEntryToLdif( AttributeUtils.toClientEntry( attrs, dn ), length );
}
@@ -181,7 +181,7 @@
* @return the corresponding LDIF code as a String
* @throws NamingException If a naming exception is encountered.
*/
- public static String convertToLdif( Attributes attrs, LdapDN dn ) throws NamingException
+ public static String convertToLdif( Attributes attrs, DN dn ) throws NamingException
{
return convertEntryToLdif( AttributeUtils.toClientEntry( attrs, dn ), DEFAULT_LINE_LENGTH );
}
Modified: directory/shared/trunk/ldap-ldif/src/test/java/org/apache/directory/shared/ldap/ldif/LdifRevertorTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap-ldif/src/test/java/org/apache/directory/shared/ldap/ldif/LdifRevertorTest.java?rev=918756&r1=918755&r2=918756&view=diff
==============================================================================
--- directory/shared/trunk/ldap-ldif/src/test/java/org/apache/directory/shared/ldap/ldif/LdifRevertorTest.java (original)
+++ directory/shared/trunk/ldap-ldif/src/test/java/org/apache/directory/shared/ldap/ldif/LdifRevertorTest.java Wed Mar 3 23:05:29 2010
@@ -40,7 +40,7 @@
import org.apache.directory.shared.ldap.entry.client.ClientModification;
import org.apache.directory.shared.ldap.entry.client.DefaultClientAttribute;
import org.apache.directory.shared.ldap.entry.client.DefaultClientEntry;
-import org.apache.directory.shared.ldap.name.LdapDN;
+import org.apache.directory.shared.ldap.name.DN;
import org.apache.directory.shared.ldap.name.RDN;
import org.apache.directory.shared.ldap.util.StringTools;
import org.junit.Test;
@@ -75,7 +75,7 @@
@Test
public void testReverseAdd() throws NamingException
{
- LdapDN dn = new LdapDN( "dc=apache, dc=com" );
+ DN dn = new DN( "dc=apache, dc=com" );
LdifEntry reversed = LdifRevertor.reverseAdd( dn );
assertNotNull( reversed );
@@ -93,7 +93,7 @@
@Test
public void testReverseDel() throws NamingException
{
- LdapDN dn = new LdapDN( "dc=apache, dc=com" );
+ DN dn = new DN( "dc=apache, dc=com" );
Entry deletedEntry = new DefaultClientEntry( dn );
@@ -128,7 +128,7 @@
ou.add( "apache", "acme corp" );
modifiedEntry.put( ou );
- LdapDN dn = new LdapDN( "cn=test, ou=system" );
+ DN dn = new DN( "cn=test, ou=system" );
Modification mod = new ClientModification(
ModificationOperation.REMOVE_ATTRIBUTE,
@@ -172,7 +172,7 @@
ou.add( "apache", "acme corp" );
modifiedEntry.put( ou );
- LdapDN dn = new LdapDN( "cn=test, ou=system" );
+ DN dn = new DN( "cn=test, ou=system" );
Modification mod = new ClientModification(
ModificationOperation.REMOVE_ATTRIBUTE,
@@ -216,7 +216,7 @@
EntryAttribute ou = new DefaultClientAttribute( "ou", "apache", "acme corp" );
modifiedEntry.put( ou );
- LdapDN dn = new LdapDN( "cn=test, ou=system" );
+ DN dn = new DN( "cn=test, ou=system" );
Modification mod = new ClientModification(
ModificationOperation.REMOVE_ATTRIBUTE, ou );
@@ -260,7 +260,7 @@
ou.add( "apache", "acme corp" );
modifiedEntry.put( ou );
- LdapDN dn = new LdapDN( "cn=test, ou=system" );
+ DN dn = new DN( "cn=test, ou=system" );
EntryAttribute ouModified = new DefaultClientAttribute( "ou" );
ouModified.add( "directory" );
@@ -303,7 +303,7 @@
{
Entry modifiedEntry = buildEntry();
- LdapDN dn = new LdapDN( "cn=test, ou=system" );
+ DN dn = new DN( "cn=test, ou=system" );
EntryAttribute newOu = new DefaultClientAttribute( "ou" );
newOu.add( "apache" );
@@ -352,7 +352,7 @@
ou.add( "acme corp" );
modifiedEntry.put( ou );
- LdapDN dn = new LdapDN( "cn=test, ou=system" );
+ DN dn = new DN( "cn=test, ou=system" );
Modification mod = new ClientModification(
ModificationOperation.REPLACE_ATTRIBUTE, new DefaultClientAttribute( "ou" ) );
@@ -478,7 +478,7 @@
// - add the 'l=FR' attribute
// - replace the 'l=FR' by a 'l=USA' attribute
// - replace the 'ou' attribute with 'apache' value.
- LdapDN dn = new LdapDN( "cn=test, ou=system" );
+ DN dn = new DN( "cn=test, ou=system" );
List<Modification> modifications = new ArrayList<Modification>();
@@ -555,7 +555,7 @@
ou.add( "acme corp" );
modifiedEntry.put( ou );
- LdapDN dn = new LdapDN( "cn=test, ou=system" );
+ DN dn = new DN( "cn=test, ou=system" );
Modification mod = new ClientModification(
ModificationOperation.ADD_ATTRIBUTE,
new DefaultClientAttribute( "ou", "BigCompany inc." ) );
@@ -592,7 +592,7 @@
{
Entry modifiedEntry = buildEntry();
- LdapDN dn = new LdapDN( "cn=test, ou=system" );
+ DN dn = new DN( "cn=test, ou=system" );
Modification mod = new ClientModification(
ModificationOperation.ADD_ATTRIBUTE,
new DefaultClientAttribute( "ou", "BigCompany inc." ) );
@@ -629,7 +629,7 @@
@Test
public void testReverseAddBase64DN() throws NamingException
{
- LdapDN dn = new LdapDN( "dc=Emmanuel L\u00c9charny" );
+ DN dn = new DN( "dc=Emmanuel L\u00c9charny" );
LdifEntry reversed = LdifRevertor.reverseAdd( dn );
assertNotNull( reversed );
assertEquals( dn.getName(), reversed.getDn().getName() );
@@ -646,8 +646,8 @@
@Test
public void testReverseModifyDNMove() throws NamingException
{
- LdapDN dn = new LdapDN( "cn=john doe, dc=example, dc=com" );
- LdapDN newSuperior = new LdapDN( "ou=system" );
+ DN dn = new DN( "cn=john doe, dc=example, dc=com" );
+ DN newSuperior = new DN( "ou=system" );
RDN rdn = new RDN( "cn=john doe" );
Attributes attrs = new BasicAttributes( "objectClass", "person", true );
@@ -690,7 +690,7 @@
@Test
public void test11ReverseRenameSimpleSimpleNotOverlappingKeepOldRdnDontExistInEntry() throws NamingException
{
- LdapDN dn = new LdapDN( "cn=test,ou=system" );
+ DN dn = new DN( "cn=test,ou=system" );
RDN oldRdn = new RDN( "cn=test" );
RDN newRdn = new RDN( "cn=joe" );
@@ -734,7 +734,7 @@
@Test
public void test12ReverseRenameSimpleSimpleNotOverlappingKeepOldRdnExistInEntry() throws NamingException
{
- LdapDN dn = new LdapDN( "cn=test,ou=system" );
+ DN dn = new DN( "cn=test,ou=system" );
RDN oldRdn = new RDN( "cn=test" );
RDN newRdn = new RDN( "cn=small" );
@@ -777,7 +777,7 @@
@Test
public void test21ReverseRenameSimpleSimpleNotOverlappingDeleteOldRdnDontExistInEntry() throws NamingException
{
- LdapDN dn = new LdapDN( "cn=test,ou=system" );
+ DN dn = new DN( "cn=test,ou=system" );
RDN oldRdn = new RDN( "cn=test" );
RDN newRdn = new RDN( "cn=joe" );
@@ -821,7 +821,7 @@
@Test
public void test22ReverseRenameSimpleSimpleNotOverlappingDeleteOldRdnExistInEntry() throws NamingException
{
- LdapDN dn = new LdapDN( "cn=test,ou=system" );
+ DN dn = new DN( "cn=test,ou=system" );
RDN oldRdn = new RDN( "cn=test" );
RDN newRdn = new RDN( "cn=small" );
@@ -866,7 +866,7 @@
@Test
public void test3ReverseRenameCompositeSimpleNotOverlappingKeepOldRdnDontExistInEntry() throws NamingException
{
- LdapDN dn = new LdapDN( "cn=small+cn=test,ou=system" );
+ DN dn = new DN( "cn=small+cn=test,ou=system" );
RDN oldRdn = new RDN( "cn=small+cn=test" );
RDN newRdn = new RDN( "cn=joe" );
@@ -912,7 +912,7 @@
@Test
public void test3ReverseRenameCompositeSimpleNotOverlappingKeepOldRdnExistsInEntry() throws NamingException
{
- LdapDN dn = new LdapDN( "cn=small+cn=test,ou=system" );
+ DN dn = new DN( "cn=small+cn=test,ou=system" );
RDN oldRdn = new RDN( "cn=small+cn=test" );
RDN newRdn = new RDN( "cn=big" );
@@ -957,7 +957,7 @@
@Test
public void test4ReverseRenameCompositeSimpleNotOverlappingDeleteOldRdnDontExistsInEntry() throws NamingException
{
- LdapDN dn = new LdapDN( "cn=small+cn=test,ou=system" );
+ DN dn = new DN( "cn=small+cn=test,ou=system" );
RDN oldRdn = new RDN( "cn=small+cn=test" );
RDN newRdn = new RDN( "cn=joe" );
@@ -1003,7 +1003,7 @@
@Test
public void test4ReverseRenameCompositeSimpleNotOverlappingDeleteOldRdnExistInEntry() throws NamingException
{
- LdapDN dn = new LdapDN( "cn=small+cn=test,ou=system" );
+ DN dn = new DN( "cn=small+cn=test,ou=system" );
RDN oldRdn = new RDN( "cn=small+cn=test" );
RDN newRdn = new RDN( "cn=big" );
@@ -1047,7 +1047,7 @@
@Test
public void test5ReverseRenameCompositeSimpleOverlappingKeepOldRdn() throws NamingException
{
- LdapDN dn = new LdapDN( "cn=small+cn=test,ou=system" );
+ DN dn = new DN( "cn=small+cn=test,ou=system" );
RDN oldRdn = new RDN( "cn=small+cn=test" );
RDN newRdn = new RDN( "cn=test" );
@@ -1091,7 +1091,7 @@
@Test
public void test5ReverseRenameCompositeSimpleOverlappingDeleteOldRdn() throws NamingException
{
- LdapDN dn = new LdapDN( "cn=small+cn=test,ou=system" );
+ DN dn = new DN( "cn=small+cn=test,ou=system" );
RDN oldRdn = new RDN( "cn=small+cn=test" );
RDN newRdn = new RDN( "cn=test" );
@@ -1136,7 +1136,7 @@
@Test
public void test61ReverseRenameSimpleCompositeNotOverlappingKeepOldRdnDontExistInEntry() throws NamingException
{
- LdapDN dn = new LdapDN( "cn=test,ou=system" );
+ DN dn = new DN( "cn=test,ou=system" );
RDN oldRdn = new RDN( "cn=test" );
RDN newRdn = new RDN( "cn=joe+cn=plumber" );
@@ -1181,7 +1181,7 @@
@Test
public void test62ReverseRenameSimpleCompositeNotOverlappingKeepOldRdnDontExistInEntry() throws NamingException
{
- LdapDN dn = new LdapDN( "cn=test,ou=system" );
+ DN dn = new DN( "cn=test,ou=system" );
RDN oldRdn = new RDN( "cn=test" );
RDN newRdn = new RDN( "cn=joe+cn=small" );
@@ -1239,7 +1239,7 @@
@Test
public void test71ReverseRenameSimpleCompositeNotOverlappingDeleteOldRdnDontExistInEntry() throws NamingException
{
- LdapDN dn = new LdapDN( "cn=test,ou=system" );
+ DN dn = new DN( "cn=test,ou=system" );
RDN oldRdn = new RDN( "cn=test" );
RDN newRdn = new RDN( "cn=joe+cn=plumber" );
@@ -1284,7 +1284,7 @@
@Test
public void test72ReverseRenameSimpleCompositeNotOverlappingDeleteOldRdnExistInEntry() throws NamingException
{
- LdapDN dn = new LdapDN( "cn=test,ou=system" );
+ DN dn = new DN( "cn=test,ou=system" );
RDN oldRdn = new RDN( "cn=test" );
RDN newRdn = new RDN( "cn=joe+cn=small" );
@@ -1342,7 +1342,7 @@
@Test
public void test81ReverseRenameSimpleCompositeOverlappingKeepOldRdnDontExistInEntry() throws NamingException
{
- LdapDN dn = new LdapDN( "cn=test,ou=system" );
+ DN dn = new DN( "cn=test,ou=system" );
RDN oldRdn = new RDN( "cn=test" );
RDN newRdn = new RDN( "cn=small+cn=test" );
@@ -1389,7 +1389,7 @@
@Test
public void test82ReverseRenameSimpleCompositeOverlappingKeepOldRdnExistInEntry() throws NamingException
{
- LdapDN dn = new LdapDN( "cn=test,ou=system" );
+ DN dn = new DN( "cn=test,ou=system" );
RDN oldRdn = new RDN( "cn=test" );
RDN newRdn = new RDN( "cn=small+cn=test+cn=big" );
@@ -1447,7 +1447,7 @@
@Test
public void test91ReverseRenameSimpleCompositeOverlappingDeleteOldRdnDontExistInEntry() throws NamingException
{
- LdapDN dn = new LdapDN( "cn=test,ou=system" );
+ DN dn = new DN( "cn=test,ou=system" );
RDN oldRdn = new RDN( "cn=test" );
RDN newRdn = new RDN( "cn=small+cn=test" );
@@ -1492,7 +1492,7 @@
@Test
public void test92ReverseRenameSimpleCompositeOverlappingDeleteOldRdnDontExistInEntry() throws NamingException
{
- LdapDN dn = new LdapDN( "cn=test,ou=system" );
+ DN dn = new DN( "cn=test,ou=system" );
RDN oldRdn = new RDN( "cn=test" );
RDN newRdn = new RDN( "cn=small+cn=test+cn=big" );
@@ -1551,7 +1551,7 @@
@Test
public void test101ReverseRenameCompositeCompositeNotOverlappingKeepOldRdnDontExistInEntry() throws NamingException
{
- LdapDN dn = new LdapDN( "cn=small+cn=test,ou=system" );
+ DN dn = new DN( "cn=small+cn=test,ou=system" );
RDN oldRdn = new RDN( "cn=small+cn=test" );
RDN newRdn = new RDN( "cn=joe+cn=plumber" );
@@ -1597,7 +1597,7 @@
@Test
public void test102ReverseRenameCompositeCompositeNotOverlappingKeepOldRdnExistInEntry() throws NamingException
{
- LdapDN dn = new LdapDN( "cn=small+cn=test,ou=system" );
+ DN dn = new DN( "cn=small+cn=test,ou=system" );
RDN oldRdn = new RDN( "cn=small+cn=test" );
RDN newRdn = new RDN( "cn=joe+cn=big" );
@@ -1656,7 +1656,7 @@
@Test
public void test111ReverseRenameCompositeCompositeNotOverlappingDeleteOldRdnDontExistInEntry() throws NamingException
{
- LdapDN dn = new LdapDN( "cn=small+cn=test,ou=system" );
+ DN dn = new DN( "cn=small+cn=test,ou=system" );
RDN oldRdn = new RDN( "cn=small+cn=test" );
RDN newRdn = new RDN( "cn=joe+cn=plumber" );
@@ -1702,7 +1702,7 @@
@Test
public void test112ReverseRenameCompositeCompositeNotOverlappingDeleteOldRdnExistInEntry() throws NamingException
{
- LdapDN dn = new LdapDN( "cn=small+cn=test,ou=system" );
+ DN dn = new DN( "cn=small+cn=test,ou=system" );
RDN oldRdn = new RDN( "cn=small+cn=test" );
RDN newRdn = new RDN( "cn=joe+cn=big" );
@@ -1761,7 +1761,7 @@
@Test
public void test121ReverseRenameCompositeCompositeOverlappingKeepOldRdnDontExistInEntry() throws NamingException
{
- LdapDN dn = new LdapDN( "cn=small+cn=test,ou=system" );
+ DN dn = new DN( "cn=small+cn=test,ou=system" );
RDN oldRdn = new RDN( "cn=small+cn=test" );
RDN newRdn = new RDN( "cn=joe+cn=test" );
@@ -1807,7 +1807,7 @@
@Test
public void test122ReverseRenameCompositeCompositeOverlappingKeepOldRdnExistInEntry() throws NamingException
{
- LdapDN dn = new LdapDN( "cn=small+cn=test,ou=system" );
+ DN dn = new DN( "cn=small+cn=test,ou=system" );
RDN oldRdn = new RDN( "cn=small+cn=test" );
RDN newRdn = new RDN( "cn=big+cn=test" );
@@ -1853,7 +1853,7 @@
@Test
public void test131ReverseRenameCompositeCompositeOverlappingDeleteOldRdnDontExistInEntry() throws NamingException
{
- LdapDN dn = new LdapDN( "cn=small+cn=test,ou=system" );
+ DN dn = new DN( "cn=small+cn=test,ou=system" );
RDN oldRdn = new RDN( "cn=small+cn=test" );
RDN newRdn = new RDN( "cn=joe+cn=test" );
@@ -1899,7 +1899,7 @@
@Test
public void test132ReverseRenameCompositeCompositeOverlappingDeleteOldRdnExistInEntry() throws NamingException
{
- LdapDN dn = new LdapDN( "cn=small+cn=test,ou=system" );
+ DN dn = new DN( "cn=small+cn=test,ou=system" );
RDN oldRdn = new RDN( "cn=small+cn=test" );
RDN newRdn = new RDN( "cn=big+cn=test" );
Modified: directory/shared/trunk/ldap-ldif/src/test/java/org/apache/directory/shared/ldap/ldif/LdifUtilsTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap-ldif/src/test/java/org/apache/directory/shared/ldap/ldif/LdifUtilsTest.java?rev=918756&r1=918755&r2=918756&view=diff
==============================================================================
--- directory/shared/trunk/ldap-ldif/src/test/java/org/apache/directory/shared/ldap/ldif/LdifUtilsTest.java (original)
+++ directory/shared/trunk/ldap-ldif/src/test/java/org/apache/directory/shared/ldap/ldif/LdifUtilsTest.java Wed Mar 3 23:05:29 2010
@@ -39,7 +39,7 @@
import org.apache.directory.shared.ldap.entry.EntryAttribute;
import org.apache.directory.shared.ldap.entry.client.DefaultClientAttribute;
import org.apache.directory.shared.ldap.entry.client.DefaultClientEntry;
-import org.apache.directory.shared.ldap.name.LdapDN;
+import org.apache.directory.shared.ldap.name.DN;
import org.apache.directory.shared.ldap.name.RDN;
import org.apache.directory.shared.ldap.util.StringTools;
import org.junit.Test;
@@ -373,7 +373,7 @@
attributes.put( "cn", "Saarbrucken" );
attributes.put( "sn", "test" );
- String ldif = LdifUtils.convertToLdif( attributes, (LdapDN)null, 15 );
+ String ldif = LdifUtils.convertToLdif( attributes, (DN)null, 15 );
Attributes result = LdifUtils.convertAttributesFromLdif( ldif );
assertEquals( attributes, result );
}
@@ -389,8 +389,8 @@
@Test
public void testReverseModifyDNSuperior() throws NamingException
{
- LdapDN dn = new LdapDN( "cn=john doe, dc=example, dc=com" );
- LdapDN newSuperior = new LdapDN( "ou=system" );
+ DN dn = new DN( "cn=john doe, dc=example, dc=com" );
+ DN newSuperior = new DN( "ou=system" );
Entry entry = new DefaultClientEntry( dn );
entry.add( "objectClass", "person", "uidObject" );
@@ -421,8 +421,8 @@
@Test
public void testReverseModifyDNDeleteOldRdnSuperior() throws NamingException
{
- LdapDN dn = new LdapDN( "cn=john doe, dc=example, dc=com" );
- LdapDN newSuperior = new LdapDN( "ou=system" );
+ DN dn = new DN( "cn=john doe, dc=example, dc=com" );
+ DN newSuperior = new DN( "ou=system" );
Entry entry = new DefaultClientEntry( dn );
entry.add( "objectClass", "person", "uidObject" );
Modified: directory/shared/trunk/ldap-schema-manager/src/main/java/org/apache/directory/shared/ldap/schema/manager/impl/DefaultSchemaManager.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap-schema-manager/src/main/java/org/apache/directory/shared/ldap/schema/manager/impl/DefaultSchemaManager.java?rev=918756&r1=918755&r2=918756&view=diff
==============================================================================
--- directory/shared/trunk/ldap-schema-manager/src/main/java/org/apache/directory/shared/ldap/schema/manager/impl/DefaultSchemaManager.java (original)
+++ directory/shared/trunk/ldap-schema-manager/src/main/java/org/apache/directory/shared/ldap/schema/manager/impl/DefaultSchemaManager.java Wed Mar 3 23:05:29 2010
@@ -36,7 +36,7 @@
import org.apache.directory.shared.ldap.exception.LdapOperationNotSupportedException;
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.EntityFactory;
import org.apache.directory.shared.ldap.schema.LdapComparator;
@@ -95,7 +95,7 @@
private static final Logger LOG = LoggerFactory.getLogger( DefaultSchemaManager.class );
/** The NamingContext this SchemaManager is associated with */
- private LdapDN namingContext;
+ private DN namingContext;
/** The global registries for this namingContext */
private volatile Registries registries;
@@ -110,7 +110,7 @@
protected final EntityFactory factory;
/** the normalized name for the schema modification attributes */
- private LdapDN schemaModificationAttributesDN;
+ private DN schemaModificationAttributesDN;
/** A Map containing all the schema being dependent from a schema */
private Map<String, Set<String>> schemaDependences = new HashMap<String, Set<String>>();
@@ -131,7 +131,7 @@
public DefaultSchemaManager( SchemaLoader loader ) throws Exception
{
// Default to the the root (one schemaManager for all the entries
- namingContext = LdapDN.EMPTY_LDAPDN;
+ namingContext = DN.EMPTY_DN;
this.schemaLoader = loader;
errors = new ArrayList<Throwable>();
registries = new Registries( this );
@@ -147,7 +147,7 @@
* @param loader The schema loader to use
* @param namingContext The associated NamingContext
*/
- public DefaultSchemaManager( SchemaLoader loader, LdapDN namingContext ) throws Exception
+ public DefaultSchemaManager( SchemaLoader loader, DN namingContext ) throws Exception
{
this.namingContext = namingContext;
this.schemaLoader = loader;
@@ -1311,7 +1311,7 @@
/**
* @return the namingContext
*/
- public LdapDN getNamingContext()
+ public DN getNamingContext()
{
return namingContext;
}
@@ -1326,7 +1326,7 @@
{
try
{
- schemaModificationAttributesDN = new LdapDN( SchemaConstants.SCHEMA_MODIFICATIONS_DN );
+ schemaModificationAttributesDN = new DN( SchemaConstants.SCHEMA_MODIFICATIONS_DN );
schemaModificationAttributesDN
.normalize( getRegistries().getAttributeTypeRegistry().getNormalizerMapping() );
}
Modified: directory/shared/trunk/ldap/src/main/antlr/ACIItem.g
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/antlr/ACIItem.g?rev=918756&r1=918755&r2=918756&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/antlr/ACIItem.g (original)
+++ directory/shared/trunk/ldap/src/main/antlr/ACIItem.g Wed Mar 3 23:05:29 2010
@@ -51,7 +51,7 @@
import org.apache.directory.shared.ldap.util.NamespaceTools;
import org.apache.directory.shared.ldap.util.NoDuplicateKeysMap;
import org.apache.directory.shared.ldap.util.OptionalComponentsMonitor;
-import org.apache.directory.shared.ldap.name.LdapDN;
+import org.apache.directory.shared.ldap.name.DN;
import org.apache.directory.shared.ldap.constants.SchemaConstants;
import org.apache.directory.shared.ldap.constants.AuthenticationLevel;
import org.apache.directory.shared.ldap.schema.normalizers.OidNormalizer;
@@ -126,8 +126,8 @@
private Set<UserPermission> userPermissions;
private Map<String, OidNormalizer> oidsMap;
- private Set<LdapDN> chopBeforeExclusions;
- private Set<LdapDN> chopAfterExclusions;
+ private Set<DN> chopBeforeExclusions;
+ private Set<DN> chopAfterExclusions;
private SubtreeSpecificationModifier ssModifier = null;
private ComponentsMonitor mainACIItemComponentsMonitor;
@@ -494,7 +494,7 @@
{
// A Dn can be considered as a set of attributeTypeAndValues
// So, parse the set as a Dn and extract each attributeTypeAndValue
- LdapDN attributeTypeAndValueSetAsDn = new LdapDN( token.getText() );
+ DN attributeTypeAndValueSetAsDn = new DN( token.getText() );
if ( oidsMap != null )
{
@@ -897,8 +897,8 @@
name
{
log.debug( "entered name()" );
- Set<LdapDN> names = new HashSet<LdapDN>();
- LdapDN distinguishedName = null;
+ Set<DN> names = new HashSet<DN>();
+ DN distinguishedName = null;
}
:
ID_name ( SP )+
@@ -920,8 +920,8 @@
userGroup
{
log.debug( "entered userGroup()" );
- Set<LdapDN> userGroup = new HashSet<LdapDN>();
- LdapDN distinguishedName = null;
+ Set<DN> userGroup = new HashSet<DN>();
+ DN distinguishedName = null;
}
:
ID_userGroup ( SP )+
@@ -1037,8 +1037,8 @@
// in case something is left from the last parse
ss = null;
ssModifier = new SubtreeSpecificationModifier();
- chopBeforeExclusions = new HashSet<LdapDN>();
- chopAfterExclusions = new HashSet<LdapDN>();
+ chopBeforeExclusions = new HashSet<DN>();
+ chopAfterExclusions = new HashSet<DN>();
subtreeSpecificationComponentsMonitor = new OptionalComponentsMonitor(
new String [] { "base", "specificExclusions", "minimum", "maximum" } );
}
@@ -1083,7 +1083,7 @@
ss_base
{
log.debug( "entered ss_base()" );
- LdapDN base = null;
+ DN base = null;
}
:
ID_base ( SP )+ base=distinguishedName
@@ -1127,7 +1127,7 @@
chopBefore
{
log.debug( "entered chopBefore()" );
- LdapDN chopBeforeExclusion = null;
+ DN chopBeforeExclusion = null;
}
:
ID_chopBefore ( SP )* COLON ( SP )* chopBeforeExclusion=distinguishedName
@@ -1139,7 +1139,7 @@
chopAfter
{
log.debug( "entered chopAfter()" );
- LdapDN chopAfterExclusion = null;
+ DN chopAfterExclusion = null;
}
:
ID_chopAfter ( SP )* COLON ( SP )* chopAfterExclusion=distinguishedName
@@ -1172,7 +1172,7 @@
}
;
-distinguishedName returns [ LdapDN name ]
+distinguishedName returns [ DN name ]
{
log.debug( "entered distinguishedName()" );
name = null;
@@ -1180,7 +1180,7 @@
:
token:SAFEUTF8STRING
{
- name = new LdapDN( token.getText() );
+ name = new DN( token.getText() );
if ( oidsMap != null )
{
name.normalize( oidsMap );
Modified: directory/shared/trunk/ldap/src/main/antlr/SubtreeSpecificationChecker.g
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/antlr/SubtreeSpecificationChecker.g?rev=918756&r1=918755&r2=918756&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/antlr/SubtreeSpecificationChecker.g (original)
+++ directory/shared/trunk/ldap/src/main/antlr/SubtreeSpecificationChecker.g Wed Mar 3 23:05:29 2010
@@ -23,7 +23,7 @@
package org.apache.directory.shared.ldap.subtree;
-import org.apache.directory.shared.ldap.name.LdapDN;
+import org.apache.directory.shared.ldap.name.DN;
import org.apache.directory.shared.ldap.filter.FilterParser;
import org.apache.directory.shared.ldap.util.ComponentsMonitor;
import org.apache.directory.shared.ldap.util.OptionalComponentsMonitor;
@@ -255,7 +255,7 @@
:
token:SAFEUTF8STRING
{
- new LdapDN( token.getText() );
+ new DN( token.getText() );
log.debug( "recognized a DistinguishedName: " + token.getText() );
}
;
Modified: directory/shared/trunk/ldap/src/main/antlr/TriggerSpecification.g
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/antlr/TriggerSpecification.g?rev=918756&r1=918755&r2=918756&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/antlr/TriggerSpecification.g (original)
+++ directory/shared/trunk/ldap/src/main/antlr/TriggerSpecification.g Wed Mar 3 23:05:29 2010
@@ -26,7 +26,7 @@
import java.util.ArrayList;
import java.util.List;
-import org.apache.directory.shared.ldap.name.LdapDN;
+import org.apache.directory.shared.ldap.name.DN;
import org.apache.directory.shared.ldap.schema.NormalizerMappingResolver;
import org.apache.directory.shared.ldap.trigger.StoredProcedureOption;
import org.apache.directory.shared.ldap.trigger.StoredProcedureParameter;
@@ -346,7 +346,7 @@
ldapContextStoredProcedureParameter
{
log.debug( "entered ldapContextStoredProcedureParameter()" );
- LdapDN ldapContext = null;
+ DN ldapContext = null;
}
: ID_ldapContext ( SP )+ ldapContext=distinguishedName
{ triggerStoredProcedureParameters.add( StoredProcedureParameter.Generic_LDAP_CONTEXT.instance( ldapContext ) ); }
@@ -386,7 +386,7 @@
log.debug( "entered storedProcedureSearchContextOption()" );
spSearchContextOption = null;
SearchScope searchScope = SearchScope.OBJECT; // default scope
- LdapDN spSearchContext = null;
+ DN spSearchContext = null;
}
:
ID_searchContext ( SP )+ // FIXME: SP should not be mandatory if an OPEN_CURLY follows
@@ -407,7 +407,7 @@
| ID_scope_subtree { scope = SearchScope.SUBTREE; }
;
-storedProcedureSearchContext returns [ LdapDN spSearchContext ]
+storedProcedureSearchContext returns [ DN spSearchContext ]
{
log.debug( "entered storedProcedureSearchContext()" );
spSearchContext = null;
@@ -426,14 +426,14 @@
{ spName = spNameToken.getText(); }
;
-distinguishedName returns [ LdapDN name ]
+distinguishedName returns [ DN name ]
{
log.debug( "entered distinguishedName()" );
name = null;
}
: nameToken:UTF8String
{
- name = new LdapDN( nameToken.getText() );
+ name = new DN( nameToken.getText() );
}
;
exception
Modified: directory/shared/trunk/ldap/src/main/antlr/distinguishedName.g
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/antlr/distinguishedName.g?rev=918756&r1=918755&r2=918756&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/antlr/distinguishedName.g (original)
+++ directory/shared/trunk/ldap/src/main/antlr/distinguishedName.g Wed Mar 3 23:05:29 2010
@@ -174,7 +174,7 @@
* <optional-space> ::= ( <CR> ) *( " " )
*
*/
-distinguishedName [LdapDN dn]
+distinguishedName [DN dn]
{
matchedProduction( "distinguishedName()" );
RDN rdn = null;
Modified: directory/shared/trunk/ldap/src/main/antlr/subtree-specification.g
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/antlr/subtree-specification.g?rev=918756&r1=918755&r2=918756&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/antlr/subtree-specification.g (original)
+++ directory/shared/trunk/ldap/src/main/antlr/subtree-specification.g Wed Mar 3 23:05:29 2010
@@ -29,7 +29,7 @@
import java.util.List;
import java.util.ArrayList;
-import org.apache.directory.shared.ldap.name.LdapDN;
+import org.apache.directory.shared.ldap.name.DN;
import org.apache.directory.shared.ldap.filter.ExprNode;
import org.apache.directory.shared.ldap.filter.LeafNode;
import org.apache.directory.shared.ldap.filter.BranchNode;
@@ -86,8 +86,8 @@
private NormalizerMappingResolver resolver;
- private Set<LdapDN> chopBeforeExclusions = null;
- private Set<LdapDN> chopAfterExclusions = null;
+ private Set<DN> chopBeforeExclusions = null;
+ private Set<DN> chopAfterExclusions = null;
private SubtreeSpecificationModifier ssModifier = null;
@@ -162,8 +162,8 @@
ssModifier = new SubtreeSpecificationModifier();
subtreeSpecificationComponentsMonitor = new OptionalComponentsMonitor(
new String [] { "base", "specificExclusions", "minimum", "maximum", "specificationFilter" } );
- chopBeforeExclusions = new HashSet<LdapDN>();
- chopAfterExclusions = new HashSet<LdapDN>();
+ chopBeforeExclusions = new HashSet<DN>();
+ chopAfterExclusions = new HashSet<DN>();
// always create a new filter parser in case we may have some statefulness problems with it
}
:
@@ -211,7 +211,7 @@
ss_base
{
log.debug( "entered ss_base()" );
- LdapDN base = null;
+ DN base = null;
}
:
ID_base ( SP )+ base=distinguishedName
@@ -255,7 +255,7 @@
chopBefore
{
log.debug( "entered chopBefore()" );
- LdapDN chopBeforeExclusion = null;
+ DN chopBeforeExclusion = null;
}
:
ID_chopBefore ( SP )* COLON ( SP )* chopBeforeExclusion=distinguishedName
@@ -267,7 +267,7 @@
chopAfter
{
log.debug( "entered chopAfter()" );
- LdapDN chopAfterExclusion = null;
+ DN chopAfterExclusion = null;
}
:
ID_chopAfter ( SP )* COLON ( SP )* chopAfterExclusion=distinguishedName
@@ -330,7 +330,7 @@
throw new RecognitionException( "filterParser failed. " + e.getMessage() );
}
-distinguishedName returns [ LdapDN name ]
+distinguishedName returns [ DN name ]
{
log.debug( "entered distinguishedName()" );
name = null;
@@ -338,7 +338,7 @@
:
token:SAFEUTF8STRING
{
- name = new LdapDN( token.getText() );
+ name = new DN( token.getText() );
if ( isNormalizing() )
{
Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/aci/UserClass.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/aci/UserClass.java?rev=918756&r1=918755&r2=918756&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/aci/UserClass.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/aci/UserClass.java Wed Mar 3 23:05:29 2010
@@ -27,7 +27,7 @@
import java.util.HashSet;
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;
@@ -130,7 +130,7 @@
*/
private static abstract class NamedUserClass extends UserClass
{
- protected final Set<LdapDN> names;
+ protected final Set<DN> names;
/**
@@ -138,16 +138,16 @@
*
* @param names a set of names
*/
- protected NamedUserClass( Set<LdapDN> names )
+ protected NamedUserClass( Set<DN> names )
{
- this.names = Collections.unmodifiableSet( new HashSet<LdapDN>( names ) );
+ this.names = Collections.unmodifiableSet( new HashSet<DN>( names ) );
}
/**
* Returns the set of all names.
*/
- public Set<LdapDN> getNames()
+ public Set<DN> getNames()
{
return names;
}
@@ -218,7 +218,7 @@
* @param usernames
* the set of user DNs.
*/
- public Name( Set<LdapDN> usernames )
+ public Name( Set<DN> usernames )
{
super( usernames );
}
@@ -247,7 +247,7 @@
* @param groupNames
* the set of group DNs.
*/
- public UserGroup( Set<LdapDN> groupNames )
+ public UserGroup( Set<DN> groupNames )
{
super( groupNames );
}