You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by fe...@apache.org on 2010/01/20 20:39:06 UTC
svn commit: r901348 [1/2] - in /directory/shared/trunk:
dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/request/
ldap-client-api/src/main/java/org/apache/directory/shared/ldap/client/api/
ldap-client-api/src/main/java/org/apache/directory/...
Author: felixk
Date: Wed Jan 20 19:39:05 2010
New Revision: 901348
URL: http://svn.apache.org/viewvc?rev=901348&view=rev
Log:
Fixed Ldap API requires a renaming of Rdn to RDN
(DIRSHARED-44)
Added:
directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/name/RDN.java
- copied, changed from r901333, directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/name/Rdn.java
Removed:
directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/name/Rdn.java
Modified:
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-client-api/src/main/java/org/apache/directory/shared/ldap/client/api/LdapConnection.java
directory/shared/trunk/ldap-client-api/src/main/java/org/apache/directory/shared/ldap/client/api/messages/ModifyDnRequest.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/src/main/antlr/distinguishedName.g
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/modifyDn/ModifyDNRequestCodec.java
directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/ldif/LdifEntry.java
directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/ldif/LdifReader.java
directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/ldif/LdifRevertor.java
directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/InternalModifyDnRequest.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/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/main/java/org/apache/directory/shared/ldap/name/RdnParser.java
directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/name/RdnSerializer.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/ldif/LdifRevertorTest.java
directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/ldif/LdifUtilsTest.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/name/DnParserDIRSERVER_584_Test.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/RdnTest.java
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=901348&r1=901347&r2=901348&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 Jan 20 19:39:05 2010
@@ -68,7 +68,7 @@
import org.apache.directory.shared.ldap.entry.client.ClientStringValue;
import org.apache.directory.shared.ldap.filter.SearchScope;
import org.apache.directory.shared.ldap.name.LdapDN;
-import org.apache.directory.shared.ldap.name.Rdn;
+import org.apache.directory.shared.ldap.name.RDN;
import org.apache.directory.shared.ldap.util.Base64;
import org.apache.directory.shared.ldap.util.StringTools;
import org.xmlpull.v1.XmlPullParser;
@@ -1647,7 +1647,7 @@
{
try
{
- modifyDNRequest.setNewRDN( new Rdn( attributeValue ) );
+ modifyDNRequest.setNewRDN( new RDN( 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=901348&r1=901347&r2=901348&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 Jan 20 19:39:05 2010
@@ -22,7 +22,7 @@
import org.apache.directory.shared.ldap.codec.modifyDn.ModifyDNRequestCodec;
import org.apache.directory.shared.ldap.name.LdapDN;
-import org.apache.directory.shared.ldap.name.Rdn;
+import org.apache.directory.shared.ldap.name.RDN;
import org.dom4j.Element;
@@ -147,7 +147,7 @@
*
* @return Returns the newRDN.
*/
- public Rdn getNewRDN()
+ public RDN getNewRDN()
{
return ( ( ModifyDNRequestCodec ) instance ).getNewRDN();
}
@@ -158,7 +158,7 @@
*
* @param newRDN The newRDN to set.
*/
- public void setNewRDN( Rdn newRDN )
+ public void setNewRDN( RDN newRDN )
{
( ( ModifyDNRequestCodec ) instance ).setNewRDN( newRDN );
}
Modified: directory/shared/trunk/ldap-client-api/src/main/java/org/apache/directory/shared/ldap/client/api/LdapConnection.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap-client-api/src/main/java/org/apache/directory/shared/ldap/client/api/LdapConnection.java?rev=901348&r1=901347&r2=901348&view=diff
==============================================================================
--- directory/shared/trunk/ldap-client-api/src/main/java/org/apache/directory/shared/ldap/client/api/LdapConnection.java (original)
+++ directory/shared/trunk/ldap-client-api/src/main/java/org/apache/directory/shared/ldap/client/api/LdapConnection.java Wed Jan 20 19:39:05 2010
@@ -125,7 +125,7 @@
import org.apache.directory.shared.ldap.message.AliasDerefMode;
import org.apache.directory.shared.ldap.message.ResultCodeEnum;
import org.apache.directory.shared.ldap.name.LdapDN;
-import org.apache.directory.shared.ldap.name.Rdn;
+import org.apache.directory.shared.ldap.name.RDN;
import org.apache.directory.shared.ldap.util.LdapURL;
import org.apache.directory.shared.ldap.util.StringTools;
import org.apache.mina.core.filterchain.IoFilter;
@@ -1857,22 +1857,22 @@
/**
* renames the given entryDn with new RDN and deletes the old RDN.
- * @see #rename(LdapDN, Rdn, boolean)
+ * @see #rename(LdapDN, RDN, boolean)
*/
- public ModifyDnResponse rename( LdapDN entryDn, Rdn newRdn ) throws LdapException
+ public ModifyDnResponse rename( LdapDN entryDn, RDN newRdn ) throws LdapException
{
return rename( entryDn, newRdn, true );
}
/**
- * @see #rename(LdapDN, Rdn, boolean)
+ * @see #rename(LdapDN, RDN, boolean)
*/
public ModifyDnResponse rename( String entryDn, String newRdn, boolean deleteOldRdn ) throws LdapException
{
try
{
- return rename( new LdapDN( entryDn ), new Rdn( newRdn ), deleteOldRdn );
+ return rename( new LdapDN( entryDn ), new RDN( newRdn ), deleteOldRdn );
}
catch( InvalidNameException e )
{
@@ -1893,7 +1893,7 @@
* @return modifyDn operations response
* @throws LdapException
*/
- public ModifyDnResponse rename( LdapDN entryDn, Rdn newRdn, boolean deleteOldRdn ) throws LdapException
+ public ModifyDnResponse rename( LdapDN entryDn, RDN newRdn, boolean deleteOldRdn ) throws LdapException
{
ModifyDnRequest modDnRequest = new ModifyDnRequest();
modDnRequest.setEntryDn( entryDn );
Modified: directory/shared/trunk/ldap-client-api/src/main/java/org/apache/directory/shared/ldap/client/api/messages/ModifyDnRequest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap-client-api/src/main/java/org/apache/directory/shared/ldap/client/api/messages/ModifyDnRequest.java?rev=901348&r1=901347&r2=901348&view=diff
==============================================================================
--- directory/shared/trunk/ldap-client-api/src/main/java/org/apache/directory/shared/ldap/client/api/messages/ModifyDnRequest.java (original)
+++ directory/shared/trunk/ldap-client-api/src/main/java/org/apache/directory/shared/ldap/client/api/messages/ModifyDnRequest.java Wed Jan 20 19:39:05 2010
@@ -22,7 +22,7 @@
import org.apache.directory.shared.ldap.name.LdapDN;
-import org.apache.directory.shared.ldap.name.Rdn;
+import org.apache.directory.shared.ldap.name.RDN;
/**
@@ -37,7 +37,7 @@
private LdapDN entryDn;
/** the new RDN */
- private Rdn newRdn;
+ private RDN newRdn;
/** target entry's new parent DN */
private LdapDN newSuperior;
@@ -64,13 +64,13 @@
}
- public Rdn getNewRdn()
+ public RDN getNewRdn()
{
return newRdn;
}
- public void setNewRdn( Rdn newRdn )
+ public void setNewRdn( RDN newRdn )
{
this.newRdn = newRdn;
}
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=901348&r1=901347&r2=901348&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 Jan 20 19:39:05 2010
@@ -27,7 +27,7 @@
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.Rdn;
+import org.apache.directory.shared.ldap.name.RDN;
import org.apache.directory.shared.ldap.schema.UsageEnum;
@@ -420,7 +420,7 @@
{
StringBuilder sb = new StringBuilder();
- String dn = "m-oid=" + oid + ", " + SchemaConstants.ATTRIBUTES_TYPE_PATH + ", cn=" + Rdn.escapeValue( schemaName ) + ", ou=schema";
+ 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 ) );
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=901348&r1=901347&r2=901348&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 Jan 20 19:39:05 2010
@@ -30,7 +30,7 @@
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.Rdn;
+import org.apache.directory.shared.ldap.name.RDN;
import org.apache.directory.shared.ldap.schema.ObjectClassTypeEnum;
@@ -213,7 +213,7 @@
{
StringBuilder sb = new StringBuilder();
- String dn = "m-oid=" + oid + ", " + SchemaConstants.OBJECT_CLASSES_PATH + ", cn=" + Rdn.escapeValue( schemaName ) + ", ou=schema";
+ 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 ) );
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=901348&r1=901347&r2=901348&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/antlr/distinguishedName.g (original)
+++ directory/shared/trunk/ldap/src/main/antlr/distinguishedName.g Wed Jan 20 19:39:05 2010
@@ -177,14 +177,14 @@
distinguishedName [LdapDN dn]
{
matchedProduction( "distinguishedName()" );
- Rdn rdn = null;
+ RDN rdn = null;
}
:
(
- rdn = relativeDistinguishedName[new Rdn()] { dn.add( rdn ); rdn=null; }
+ rdn = relativeDistinguishedName[new RDN()] { dn.add( rdn ); rdn=null; }
(
( COMMA | SEMI )
- rdn = relativeDistinguishedName[new Rdn()] { dn.add( rdn ); rdn=null; }
+ rdn = relativeDistinguishedName[new RDN()] { dn.add( rdn ); rdn=null; }
)*
EOF
)?
@@ -212,17 +212,17 @@
* <optional-space> ::= ( <CR> ) *( " " )
*
*/
-relativeDistinguishedNames [List<Rdn> rdns]
+relativeDistinguishedNames [List<RDN> rdns]
{
matchedProduction( "relativeDistinguishedNames()" );
- Rdn rdn = null;
+ RDN rdn = null;
}
:
(
- rdn = relativeDistinguishedName[new Rdn()] { rdns.add( rdn ); }
+ rdn = relativeDistinguishedName[new RDN()] { rdns.add( rdn ); }
(
( COMMA | SEMI )
- rdn = relativeDistinguishedName[new Rdn()] { rdns.add( rdn ); }
+ rdn = relativeDistinguishedName[new RDN()] { rdns.add( rdn ); }
)*
EOF
)?
@@ -244,7 +244,7 @@
* <optional-space> <name-component>
*
*/
-relativeDistinguishedName [Rdn initialRdn] returns [Rdn rdn]
+relativeDistinguishedName [RDN initialRdn] returns [RDN rdn]
{
matchedProduction( "relativeDistinguishedName()" );
rdn = initialRdn;
@@ -280,7 +280,7 @@
* attributeTypeAndValue = attributeType "=" attributeValue
*
*/
-attributeTypeAndValue [Rdn rdn] returns [String upName = ""]
+attributeTypeAndValue [RDN rdn] returns [String upName = ""]
{
matchedProduction( "attributeTypeAndValue()" );
String type = null;
Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/LdapMessageGrammar.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/LdapMessageGrammar.java?rev=901348&r1=901347&r2=901348&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/LdapMessageGrammar.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/LdapMessageGrammar.java Wed Jan 20 19:39:05 2010
@@ -105,7 +105,7 @@
import org.apache.directory.shared.ldap.message.ResultCodeEnum;
import org.apache.directory.shared.ldap.message.SearchResponseDoneImpl;
import org.apache.directory.shared.ldap.name.LdapDN;
-import org.apache.directory.shared.ldap.name.Rdn;
+import org.apache.directory.shared.ldap.name.RDN;
import org.apache.directory.shared.ldap.util.StringTools;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -2313,7 +2313,7 @@
// We have to handle the special case of a 0 length matched
// newDN
- Rdn newRdn = null;
+ RDN newRdn = null;
if ( tlv.getLength() == 0 )
{
Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/modifyDn/ModifyDNRequestCodec.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/modifyDn/ModifyDNRequestCodec.java?rev=901348&r1=901347&r2=901348&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/modifyDn/ModifyDNRequestCodec.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/modifyDn/ModifyDNRequestCodec.java Wed Jan 20 19:39:05 2010
@@ -29,7 +29,7 @@
import org.apache.directory.shared.ldap.codec.LdapConstants;
import org.apache.directory.shared.ldap.codec.LdapMessageCodec;
import org.apache.directory.shared.ldap.name.LdapDN;
-import org.apache.directory.shared.ldap.name.Rdn;
+import org.apache.directory.shared.ldap.name.RDN;
import org.apache.directory.shared.ldap.util.StringTools;
@@ -53,7 +53,7 @@
private LdapDN entry;
/** The new RDN to be added to the RDN or to the new superior, if present */
- private Rdn newRDN;
+ private RDN newRDN;
/** If the previous RDN is to be deleted, this flag will be set to true */
private boolean deleteOldRDN;
@@ -140,7 +140,7 @@
*
* @return Returns the newRDN.
*/
- public Rdn getNewRDN()
+ public RDN getNewRDN()
{
return newRDN;
}
@@ -151,7 +151,7 @@
*
* @param newRDN The newRDN to set.
*/
- public void setNewRDN( Rdn newRDN )
+ public void setNewRDN( RDN newRDN )
{
this.newRDN = newRDN;
}
Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/ldif/LdifEntry.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/ldif/LdifEntry.java?rev=901348&r1=901347&r2=901348&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/ldif/LdifEntry.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/ldif/LdifEntry.java Wed Jan 20 19:39:05 2010
@@ -44,7 +44,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.name.LdapDN;
-import org.apache.directory.shared.ldap.name.Rdn;
+import org.apache.directory.shared.ldap.name.RDN;
import org.apache.directory.shared.ldap.util.StringTools;
@@ -872,8 +872,8 @@
// Check the newRdn value
try
{
- Rdn thisNewRdn = new Rdn( newRdn );
- Rdn entryNewRdn = new Rdn( otherEntry.newRdn );
+ RDN thisNewRdn = new RDN( newRdn );
+ RDN entryNewRdn = new RDN( otherEntry.newRdn );
if ( !thisNewRdn.equals( entryNewRdn ) )
{
Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/ldif/LdifReader.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/ldif/LdifReader.java?rev=901348&r1=901347&r2=901348&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/ldif/LdifReader.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/ldif/LdifReader.java Wed Jan 20 19:39:05 2010
@@ -54,7 +54,7 @@
import org.apache.directory.shared.ldap.entry.client.DefaultClientAttribute;
import org.apache.directory.shared.ldap.name.LdapDN;
import org.apache.directory.shared.ldap.name.LdapDnParser;
-import org.apache.directory.shared.ldap.name.Rdn;
+import org.apache.directory.shared.ldap.name.RDN;
import org.apache.directory.shared.ldap.util.Base64;
import org.apache.directory.shared.ldap.util.StringTools;
import org.slf4j.Logger;
@@ -571,7 +571,7 @@
// Check that the DN is valid. If not, an exception will be thrown
try
{
- LdapDnParser.parseInternal( dn, new ArrayList<Rdn>() );
+ LdapDnParser.parseInternal( dn, new ArrayList<RDN>() );
}
catch ( InvalidNameException ine )
{
Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/ldif/LdifRevertor.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/ldif/LdifRevertor.java?rev=901348&r1=901347&r2=901348&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/ldif/LdifRevertor.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/ldif/LdifRevertor.java Wed Jan 20 19:39:05 2010
@@ -36,7 +36,7 @@
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.Rdn;
+import org.apache.directory.shared.ldap.name.RDN;
import org.apache.directory.shared.ldap.util.AttributeUtils;
@@ -252,7 +252,7 @@
{
LdifEntry entry = new LdifEntry();
LdapDN currentParent = null;
- Rdn currentRdn = null;
+ RDN currentRdn = null;
LdapDN newDn = null;
if ( newSuperiorDn == null )
@@ -290,7 +290,7 @@
* 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
+ LdapDN newSuperior, RDN oldRdn, RDN newRdn ) throws InvalidNameException
{
LdifEntry reverted = new LdifEntry();
@@ -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( LdapDN parentDn, Entry entry, RDN oldRdn, RDN newRdn )
{
LdifEntry restored = new LdifEntry();
restored.setChangeType( ChangeType.Modify );
@@ -365,8 +365,8 @@
/**
* A helper method which generates a reverted entry
*/
- private static LdifEntry generateReverted( LdapDN newSuperior, Rdn newRdn, LdapDN newDn,
- Rdn oldRdn, boolean deleteOldRdn ) throws InvalidNameException
+ private static LdifEntry generateReverted( LdapDN newSuperior, RDN newRdn, LdapDN newDn,
+ RDN oldRdn, boolean deleteOldRdn ) throws InvalidNameException
{
LdifEntry reverted = new LdifEntry();
reverted.setChangeType( ChangeType.ModRdn );
@@ -409,7 +409,7 @@
* @return A list of LDIF reverted entries
* @throws NamingException If the name reverting failed
*/
- public static List<LdifEntry> reverseRename( Entry entry, Rdn newRdn, boolean deleteOldRdn ) throws NamingException
+ public static List<LdifEntry> reverseRename( Entry entry, RDN newRdn, boolean deleteOldRdn ) throws NamingException
{
return reverseMoveAndRename( entry, null, newRdn, deleteOldRdn );
}
@@ -427,7 +427,7 @@
* @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, LdapDN newSuperior, RDN newRdn, boolean deleteOldRdn ) throws NamingException
{
LdapDN parentDn = entry.getDn();
LdapDN newDn = null;
@@ -448,7 +448,7 @@
}
parentDn = ( LdapDN ) entry.getDn().clone();
- Rdn oldRdn = parentDn.getRdn();
+ RDN oldRdn = parentDn.getRdn();
newDn = ( LdapDN ) parentDn.clone();
newDn.remove( newDn.size() - 1 );
Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/InternalModifyDnRequest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/InternalModifyDnRequest.java?rev=901348&r1=901347&r2=901348&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/InternalModifyDnRequest.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/InternalModifyDnRequest.java Wed Jan 20 19:39:05 2010
@@ -20,7 +20,7 @@
package org.apache.directory.shared.ldap.message;
import org.apache.directory.shared.ldap.name.LdapDN;
-import org.apache.directory.shared.ldap.name.Rdn;
+import org.apache.directory.shared.ldap.name.RDN;
/**
@@ -99,7 +99,7 @@
*
* @return the relative dn with one component
*/
- Rdn getNewRdn();
+ RDN getNewRdn();
/**
@@ -109,7 +109,7 @@
* @param newRdn
* the relative dn with one component
*/
- void setNewRdn( Rdn newRdn );
+ void setNewRdn( RDN newRdn );
/**
Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/ModifyDnRequestImpl.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/ModifyDnRequestImpl.java?rev=901348&r1=901347&r2=901348&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/ModifyDnRequestImpl.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/ModifyDnRequestImpl.java Wed Jan 20 19:39:05 2010
@@ -20,7 +20,7 @@
package org.apache.directory.shared.ldap.message;
import org.apache.directory.shared.ldap.name.LdapDN;
-import org.apache.directory.shared.ldap.name.Rdn;
+import org.apache.directory.shared.ldap.name.RDN;
/**
@@ -37,7 +37,7 @@
private LdapDN name;
/** PDU's <b>newrdn</b> relative distinguished name property */
- private Rdn newRdn;
+ private RDN newRdn;
/** PDU's <b>newSuperior</b> distinguished name property */
private LdapDN newSuperior;
@@ -145,7 +145,7 @@
*
* @return the relative dn with one component
*/
- public Rdn getNewRdn()
+ public RDN getNewRdn()
{
return newRdn;
}
@@ -158,7 +158,7 @@
* @param newRdn
* the relative dn with one component
*/
- public void setNewRdn( Rdn newRdn )
+ public void setNewRdn( RDN newRdn )
{
this.newRdn = newRdn;
}
Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/name/ComplexLdapDnParser.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/name/ComplexLdapDnParser.java?rev=901348&r1=901347&r2=901348&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/name/ComplexLdapDnParser.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/name/ComplexLdapDnParser.java Wed Jan 20 19:39:05 2010
@@ -43,7 +43,7 @@
*
* @throws InvalidNameException the invalid name exception
*/
- public void parseDn( String name, List<Rdn> rdns ) throws InvalidNameException
+ public void parseDn( String name, List<RDN> rdns ) throws InvalidNameException
{
AntlrDnParser dnParser = new AntlrDnParser( new AntlrDnLexer( new StringReader( name ) ) );
@@ -68,7 +68,7 @@
*
* @throws InvalidNameException the invalid name exception
*/
- public void parseRdn( String name, Rdn rdn ) throws InvalidNameException
+ public void parseRdn( String name, RDN rdn ) throws InvalidNameException
{
AntlrDnParser dnParser = new AntlrDnParser( new AntlrDnLexer( new StringReader( name ) ) );
try
Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/name/FastLdapDnParser.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/name/FastLdapDnParser.java?rev=901348&r1=901347&r2=901348&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/name/FastLdapDnParser.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/name/FastLdapDnParser.java Wed Jan 20 19:39:05 2010
@@ -80,7 +80,7 @@
dn.normalizeInternal();
}
- void parseDn( String name, List<Rdn> rdns ) throws InvalidNameException
+ void parseDn( String name, List<RDN> rdns ) throws InvalidNameException
{
if ( ( name == null ) || ( name.trim().length() == 0 ) )
{
@@ -94,7 +94,7 @@
while ( true )
{
- Rdn rdn = new Rdn();
+ RDN rdn = new RDN();
parseRdnInternal( name, pos, rdn );
rdns.add( rdn );
@@ -127,7 +127,7 @@
*
* @throws InvalidNameException the invalid name exception
*/
- public void parseRdn( String name, Rdn rdn ) throws InvalidNameException
+ public void parseRdn( String name, RDN rdn ) throws InvalidNameException
{
if ( name == null || name.length() == 0 )
{
@@ -146,7 +146,7 @@
}
- private void parseRdnInternal( String name, Position pos, Rdn rdn ) throws InvalidNameException
+ private void parseRdnInternal( String name, Position pos, RDN rdn ) throws InvalidNameException
{
int rdnStart = pos.start;
Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/name/LdapDN.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/name/LdapDN.java?rev=901348&r1=901347&r2=901348&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/name/LdapDN.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/name/LdapDN.java Wed Jan 20 19:39:05 2010
@@ -90,7 +90,7 @@
* NOTE THAT THESE ARE IN THE OPPOSITE ORDER FROM THAT IMPLIED BY THE JAVADOC!
* Rdn[0] is rdns.get(n) and Rdn[n] is rdns.get(0)
*/
- protected List<Rdn> rdns = new ArrayList<Rdn>( 5 );
+ protected List<RDN> rdns = new ArrayList<RDN>( 5 );
/** The user provided name */
private String upName;
@@ -274,12 +274,12 @@
{
LdapDN newDn = new LdapDN( name );
- Enumeration<Rdn> rdns = newDn.getAllRdn();
+ Enumeration<RDN> rdns = newDn.getAllRdn();
// Loop on all RDNs
while ( rdns.hasMoreElements() )
{
- Rdn rdn = rdns.nextElement();
+ RDN rdn = rdns.nextElement();
String upName = rdn.getUpName();
rdnOidToName( rdn, oidsMap );
rdn.normalize();
@@ -324,7 +324,7 @@
StringBuffer sb = new StringBuffer();
boolean isFirst = true;
- for ( Rdn rdn : rdns )
+ for ( RDN rdn : rdns )
{
if ( isFirst )
{
@@ -380,7 +380,7 @@
StringBuffer sb = new StringBuffer();
boolean isFirst = true;
- for ( Rdn rdn : rdns )
+ for ( RDN rdn : rdns )
{
if ( isFirst )
{
@@ -512,7 +512,7 @@
{
int result = 37;
- for ( Rdn rdn : rdns )
+ for ( RDN rdn : rdns )
{
result = result * 17 + rdn.hashCode();
}
@@ -629,8 +629,8 @@
for ( int i = nameDN.size() - 1; i >= 0; i-- )
{
- Rdn nameRdn = nameDN.rdns.get( nameDN.rdns.size() - i - 1 );
- Rdn ldapRdn = rdns.get( rdns.size() - i - 1 );
+ RDN nameRdn = nameDN.rdns.get( nameDN.rdns.size() - i - 1 );
+ RDN ldapRdn = rdns.get( rdns.size() - i - 1 );
if ( nameRdn.compareTo( ldapRdn ) != 0 )
{
@@ -659,12 +659,12 @@
for ( int i = name.size() - 1; i >= 0; i-- )
{
- Rdn ldapRdn = rdns.get( i + starting );
- Rdn nameRdn = null;
+ RDN ldapRdn = rdns.get( i + starting );
+ RDN nameRdn = null;
try
{
- nameRdn = new Rdn( name.get( name.size() - i - 1 ) );
+ nameRdn = new RDN( name.get( name.size() - i - 1 ) );
}
catch ( InvalidNameException e )
{
@@ -724,8 +724,8 @@
// Ok, iterate through all the RDN of the name
for ( int i = 0; i < nameDN.size(); i++ )
{
- Rdn nameRdn = nameDN.rdns.get( i );
- Rdn ldapRdn = rdns.get( i );
+ RDN nameRdn = nameDN.rdns.get( i );
+ RDN ldapRdn = rdns.get( i );
if ( nameRdn.compareTo( ldapRdn ) != 0 )
{
@@ -753,12 +753,12 @@
for ( int i = name.size() - 1; i >= 0; i-- )
{
- Rdn ldapRdn = rdns.get( nameSize - i - 1 );
- Rdn nameRdn = null;
+ RDN ldapRdn = rdns.get( nameSize - i - 1 );
+ RDN nameRdn = null;
try
{
- nameRdn = new Rdn( name.get( i ) );
+ nameRdn = new RDN( name.get( i ) );
}
catch ( InvalidNameException e )
{
@@ -797,7 +797,7 @@
}
else
{
- Rdn rdn = rdns.get( rdns.size() - posn - 1 );
+ RDN rdn = rdns.get( rdns.size() - posn - 1 );
return rdn.toString();
}
@@ -814,7 +814,7 @@
* @throws ArrayIndexOutOfBoundsException
* if posn is outside the specified range
*/
- public Rdn getRdn( int posn )
+ public RDN getRdn( int posn )
{
if ( rdns.size() == 0 )
{
@@ -822,7 +822,7 @@
}
else
{
- Rdn rdn = rdns.get( rdns.size() - posn - 1 );
+ RDN rdn = rdns.get( rdns.size() - posn - 1 );
return rdn;
}
@@ -834,7 +834,7 @@
*
* @return the last component of this DN
*/
- public Rdn getRdn()
+ public RDN getRdn()
{
if ( rdns.size() == 0 )
{
@@ -852,14 +852,14 @@
*
* @return All the components
*/
- public List<Rdn> getRdns()
+ public List<RDN> getRdns()
{
- List<Rdn> newRdns = new ArrayList<Rdn>();
+ List<RDN> newRdns = new ArrayList<RDN>();
// We will clone the list, to avoid user modifications
- for ( Rdn rdn : rdns )
+ for ( RDN rdn : rdns )
{
- newRdns.add( ( Rdn ) rdn.clone() );
+ newRdns.add( ( RDN ) rdn.clone() );
}
return newRdns;
@@ -896,7 +896,7 @@
throw new NoSuchElementException();
}
- Rdn rdn = rdns.get( rdns.size() - pos - 1 );
+ RDN rdn = rdns.get( rdns.size() - pos - 1 );
pos++;
return rdn.toString();
}
@@ -912,7 +912,7 @@
*
* @return an enumeration of the components of this name, as Rdn
*/
- public Enumeration<Rdn> getAllRdn()
+ public Enumeration<RDN> getAllRdn()
{
/*
* Note that by accessing the name component using the get() method on
@@ -920,7 +920,7 @@
* right to left with increasing index values. LdapName.get() does the
* index translation on m_list for us.
*/
- return new Enumeration<Rdn>()
+ return new Enumeration<RDN>()
{
private int pos;
@@ -931,7 +931,7 @@
}
- public Rdn nextElement()
+ public RDN nextElement()
{
if ( pos >= rdns.size() )
{
@@ -939,7 +939,7 @@
throw new NoSuchElementException();
}
- Rdn rdn = rdns.get( rdns.size() - pos - 1 );
+ RDN rdn = rdns.get( rdns.size() - pos - 1 );
pos++;
return rdn;
}
@@ -969,7 +969,7 @@
for ( int i = rdns.size() - posn; i < rdns.size(); i++ )
{
// Don't forget to clone the rdns !
- newLdapDN.rdns.add( ( Rdn ) rdns.get( i ).clone() );
+ newLdapDN.rdns.add( ( RDN ) rdns.get( i ).clone() );
}
newLdapDN.normName = newLdapDN.toNormName();
@@ -1001,7 +1001,7 @@
for ( int i = 0; i < size() - posn; i++ )
{
// Don't forget to clone the rdns !
- newLdapDN.rdns.add( ( Rdn ) rdns.get( i ).clone() );
+ newLdapDN.rdns.add( ( RDN ) rdns.get( i ).clone() );
}
newLdapDN.normName = newLdapDN.toNormName();
@@ -1063,7 +1063,7 @@
for ( int i = name.size() - 1; i >= 0; i-- )
{
- Rdn rdn = new Rdn( name.get( i ) );
+ RDN rdn = new RDN( name.get( i ) );
rdns.add( size() - posn, rdn );
}
@@ -1129,7 +1129,7 @@
for ( int i = name.size() - 1; i >= 0; i-- )
{
- Rdn rdn = new Rdn( name.get( i ) );
+ RDN rdn = new RDN( name.get( i ) );
rdns.add( size() - posn, rdn );
}
@@ -1152,7 +1152,7 @@
}
// We have to parse the nameComponent which is given as an argument
- Rdn newRdn = new Rdn( comp );
+ RDN newRdn = new RDN( comp );
rdns.add( 0, newRdn );
normalizeInternal();
@@ -1168,7 +1168,7 @@
* @param newRdn the RDN to add
* @return the updated name (not a new one)
*/
- public Name add( Rdn newRdn )
+ public Name add( RDN newRdn )
{
rdns.add( 0, newRdn );
@@ -1186,7 +1186,7 @@
* @param pos The position where we want to add the Rdn
* @return the updated name (not a new one)
*/
- public Name add( int pos, Rdn newRdn )
+ public Name add( int pos, RDN newRdn )
{
rdns.add( newRdn );
@@ -1203,7 +1203,7 @@
* @param newRdn the RDN to add
* @return the updated name (not a new one)
*/
- public Name addNormalized( Rdn newRdn )
+ public Name addNormalized( RDN newRdn )
{
rdns.add( 0, newRdn );
@@ -1241,7 +1241,7 @@
}
// We have to parse the nameComponent which is given as an argument
- Rdn newRdn = new Rdn( comp );
+ RDN newRdn = new RDN( comp );
int realPos = size() - posn;
rdns.add( realPos, newRdn );
@@ -1271,7 +1271,7 @@
}
int realPos = size() - posn - 1;
- Rdn rdn = rdns.remove( realPos );
+ RDN rdn = rdns.remove( realPos );
normalizeInternal();
toUpName();
@@ -1288,11 +1288,11 @@
try
{
LdapDN dn = ( LdapDN ) super.clone();
- dn.rdns = new ArrayList<Rdn>();
+ dn.rdns = new ArrayList<RDN>();
- for ( Rdn rdn : rdns )
+ for ( RDN rdn : rdns )
{
- dn.rdns.add( ( Rdn ) rdn.clone() );
+ dn.rdns.add( ( RDN ) rdn.clone() );
}
return dn;
@@ -1358,8 +1358,8 @@
for ( int i = rdns.size(); i > 0; i-- )
{
- Rdn rdn1 = rdns.get( i - 1 );
- Rdn rdn2 = dn.rdns.get( i - 1 );
+ RDN rdn1 = rdns.get( i - 1 );
+ RDN rdn2 = dn.rdns.get( i - 1 );
int res = rdn1.compareTo( rdn2 );
if ( res != 0 )
@@ -1431,14 +1431,14 @@
* @throws InvalidNameException If the RDN is invalid.
* @throws NamingException If something went wrong.
*/
- /** No qualifier */ static void rdnOidToName( Rdn rdn, Map<String, OidNormalizer> oidsMap ) throws InvalidNameException,
+ /** No qualifier */ static void rdnOidToName( RDN rdn, Map<String, OidNormalizer> oidsMap ) throws InvalidNameException,
NamingException
{
if ( rdn.getNbAtavs() > 1 )
{
// We have more than one ATAV for this RDN. We will loop on all
// ATAVs
- Rdn rdnCopy = ( Rdn ) rdn.clone();
+ RDN rdnCopy = ( RDN ) rdn.clone();
rdn.clear();
for ( AVA val:rdnCopy )
@@ -1481,12 +1481,12 @@
return dn;
}
- Enumeration<Rdn> rdns = dn.getAllRdn();
+ Enumeration<RDN> rdns = dn.getAllRdn();
// Loop on all RDNs
while ( rdns.hasMoreElements() )
{
- Rdn rdn = rdns.nextElement();
+ RDN rdn = rdns.nextElement();
String upName = rdn.getUpName();
rdnOidToName( rdn, oidsMap );
rdn.normalize();
@@ -1529,12 +1529,12 @@
return this;
}
- Enumeration<Rdn> localRdns = getAllRdn();
+ Enumeration<RDN> localRdns = getAllRdn();
// Loop on all RDNs
while ( localRdns.hasMoreElements() )
{
- Rdn rdn = localRdns.nextElement();
+ RDN rdn = localRdns.nextElement();
String localUpName = rdn.getUpName();
rdnOidToName( rdn, oidsMap );
rdn.normalize();
@@ -1623,7 +1623,7 @@
out.writeInt( rdns.size() );
// Loop on the RDNs
- for ( Rdn rdn:rdns )
+ for ( RDN rdn:rdns )
{
out.writeObject( rdn );
}
@@ -1665,11 +1665,11 @@
// Read the RDNs. Is it's null, the number will be -1.
int nbRdns = in.readInt();
- rdns = new ArrayList<Rdn>( nbRdns );
+ rdns = new ArrayList<RDN>( nbRdns );
for ( int i = 0; i < nbRdns; i++ )
{
- Rdn rdn = (Rdn)in.readObject();
+ RDN rdn = (RDN)in.readObject();
rdns.add( rdn );
}
}
Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/name/LdapDNSerializer.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/name/LdapDNSerializer.java?rev=901348&r1=901347&r2=901348&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/name/LdapDNSerializer.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/name/LdapDNSerializer.java Wed Jan 20 19:39:05 2010
@@ -93,7 +93,7 @@
out.writeInt( dn.size() );
// Loop on the RDNs
- for ( Rdn rdn:dn.getRdns() )
+ for ( RDN rdn:dn.getRdns() )
{
RdnSerializer.serialize( rdn, out );
}
@@ -137,7 +137,7 @@
for ( int i = 0; i < nbRdns; i++ )
{
- Rdn rdn = RdnSerializer.deserialize( in );
+ RDN rdn = RdnSerializer.deserialize( in );
dn.add( 0, rdn );
}
Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/name/LdapDnParser.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/name/LdapDnParser.java?rev=901348&r1=901347&r2=901348&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/name/LdapDnParser.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/name/LdapDnParser.java Wed Jan 20 19:39:05 2010
@@ -85,7 +85,7 @@
* @param rdns The list that will contain the RDNs
* @throws InvalidNameException If the DN is invalid
*/
- public static void parseInternal( String name, List<Rdn> rdns ) throws InvalidNameException
+ public static void parseInternal( String name, List<RDN> rdns ) throws InvalidNameException
{
try
{
Copied: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/name/RDN.java (from r901333, directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/name/Rdn.java)
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/name/RDN.java?p2=directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/name/RDN.java&p1=directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/name/Rdn.java&r1=901333&r2=901348&rev=901348&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/name/Rdn.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/name/RDN.java Wed Jan 20 19:39:05 2010
@@ -108,10 +108,10 @@
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
* @version $Rev$, $Date$
*/
-public class Rdn implements Cloneable, Comparable, Externalizable, Iterable<AVA>
+public class RDN implements Cloneable, Comparable, Externalizable, Iterable<AVA>
{
/** The LoggerFactory used by this class */
- protected static final Logger LOG = LoggerFactory.getLogger( Rdn.class );
+ protected static final Logger LOG = LoggerFactory.getLogger( RDN.class );
/**
* Declares the Serial Version Uid.
@@ -185,7 +185,7 @@
/**
* A empty constructor.
*/
- public Rdn()
+ public RDN()
{
// Don't waste space... This is not so often we have multiple
// name-components in a RDN... So we won't initialize the Map and the
@@ -201,7 +201,7 @@
* @param rdn The String containing the RDN to parse
* @throws InvalidNameException If the RDN is invalid
*/
- public Rdn( String rdn ) throws InvalidNameException
+ public RDN( String rdn ) throws InvalidNameException
{
start = 0;
@@ -237,7 +237,7 @@
* @param normValue The normalized provided value of the RDN
* @throws InvalidNameException If the RDN is invalid
*/
- public Rdn( String upType, String normType, String upValue, String normValue ) throws InvalidNameException
+ public RDN( String upType, String normType, String upValue, String normValue ) throws InvalidNameException
{
addAttributeTypeAndValue( upType, normType, new ClientStringValue( upValue ), new ClientStringValue( normValue ) );
@@ -259,7 +259,7 @@
* @param upValue The user provided value of the RDN
* @throws InvalidNameException If the RDN is invalid
*/
- public Rdn( String upType, String upValue ) throws InvalidNameException
+ public RDN( String upType, String upValue ) throws InvalidNameException
{
addAttributeTypeAndValue( upType, upType, new ClientStringValue( upValue ), new ClientStringValue( upValue ) );
@@ -279,7 +279,7 @@
* @param upName The user provided name
* @param normName the normalized name
*/
- /* No protection */Rdn( int start, int length, String upName, String normName )
+ RDN( int start, int length, String upName, String normName )
{
this.start = 0;
this.length = length;
@@ -295,7 +295,7 @@
* @param rdn
* The non-null Rdn to be copied.
*/
- public Rdn( Rdn rdn )
+ public RDN( RDN rdn )
{
nbAtavs = rdn.getNbAtavs();
this.normName = rdn.normName;
@@ -395,7 +395,7 @@
* @throws InvalidNameException If the RDN is invalid.
* @throws NamingException If something went wrong.
*/
- public Rdn normalize( Map<String, OidNormalizer> oidsMap ) throws InvalidNameException, NamingException
+ public RDN normalize( Map<String, OidNormalizer> oidsMap ) throws InvalidNameException, NamingException
{
String upName = getUpName();
LdapDN.rdnOidToName( this, oidsMap );
@@ -701,7 +701,7 @@
{
try
{
- Rdn rdn = ( Rdn ) super.clone();
+ RDN rdn = ( RDN ) super.clone();
// The AttributeTypeAndValue is immutable. We won't clone it
@@ -758,9 +758,9 @@
return SUPERIOR;
}
- if ( object instanceof Rdn )
+ if ( object instanceof RDN )
{
- Rdn rdn = ( Rdn ) object;
+ RDN rdn = ( RDN ) object;
if ( rdn.nbAtavs != nbAtavs )
{
@@ -986,7 +986,7 @@
return true;
}
- if ( !( rdn instanceof Rdn ) )
+ if ( !( rdn instanceof RDN ) )
{
return false;
}
@@ -1410,7 +1410,7 @@
* @see Externalizable#readExternal(ObjectInput)
*
* We read back the data to create a new RDB. The structure
- * read is exposed in the {@link Rdn#writeExternal(ObjectOutput)}
+ * read is exposed in the {@link RDN#writeExternal(ObjectOutput)}
* method<p>
*
* @param in The input stream from which the RDN will be read
Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/name/RdnParser.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/name/RdnParser.java?rev=901348&r1=901347&r2=901348&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/name/RdnParser.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/name/RdnParser.java Wed Jan 20 19:39:05 2010
@@ -96,7 +96,7 @@
* AttributeTypeAndValue will be added.
* @throws InvalidNameException If the NameComponent is invalid
*/
- public static void parse( String dn, Rdn rdn ) throws InvalidNameException
+ public static void parse( String dn, RDN rdn ) throws InvalidNameException
{
try
{
@@ -122,7 +122,7 @@
*/
public static boolean isValid( String dn )
{
- Rdn rdn = new Rdn();
+ RDN rdn = new RDN();
try
{
parse( dn, rdn );
Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/name/RdnSerializer.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/name/RdnSerializer.java?rev=901348&r1=901347&r2=901348&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/name/RdnSerializer.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/name/RdnSerializer.java Wed Jan 20 19:39:05 2010
@@ -60,7 +60,7 @@
* @param out the stream in which the RDN will be serialized
* @throws IOException If we can't write in this stream
*/
- public static void serialize( Rdn rdn, ObjectOutput out ) throws IOException
+ public static void serialize( RDN rdn, ObjectOutput out ) throws IOException
{
out.writeInt( rdn.getNbAtavs() );
out.writeUTF( rdn.getUpName() );
@@ -92,14 +92,14 @@
* Deserialize a RDN instance
*
* We read back the data to create a new RDB. The structure
- * read is exposed in the {@link Rdn#writeExternal(ObjectOutput)}
+ * read is exposed in the {@link RDN#writeExternal(ObjectOutput)}
* method<p>
*
* @param in The input stream from which the RDN is read
* @return a deserialized RDN
* @throws IOException If the stream can't be read
*/
- public static Rdn deserialize( ObjectInput in ) throws IOException
+ public static RDN deserialize( ObjectInput in ) throws IOException
{
// Read the ATAV number
int nbAtavs = in.readInt();
@@ -120,7 +120,7 @@
int length = in.readInt();
// Now creates the RDN
- Rdn rdn = new Rdn( length, start, upName, normName );
+ RDN rdn = new RDN( length, start, upName, normName );
// Read through the Atavs
switch ( nbAtavs )
Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/util/tree/DnBranchNode.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/util/tree/DnBranchNode.java?rev=901348&r1=901347&r2=901348&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/util/tree/DnBranchNode.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/util/tree/DnBranchNode.java Wed Jan 20 19:39:05 2010
@@ -27,7 +27,7 @@
import javax.naming.NamingException;
import org.apache.directory.shared.ldap.name.LdapDN;
-import org.apache.directory.shared.ldap.name.Rdn;
+import org.apache.directory.shared.ldap.name.RDN;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -239,7 +239,7 @@
*/
public boolean hasParentElement( LdapDN dn )
{
- Enumeration<Rdn> rdns = dn.getAllRdn();
+ Enumeration<RDN> rdns = dn.getAllRdn();
// This is synchronized so that we can't read the
// partitionList when it is modified.
@@ -250,7 +250,7 @@
// Iterate through all the RDN until we find the associated partition
while ( rdns.hasMoreElements() )
{
- Rdn rdn = rdns.nextElement();
+ RDN rdn = rdns.nextElement();
if ( currentNode == null )
{
Modified: directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/ldif/LdifRevertorTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/ldif/LdifRevertorTest.java?rev=901348&r1=901347&r2=901348&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/ldif/LdifRevertorTest.java (original)
+++ directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/ldif/LdifRevertorTest.java Wed Jan 20 19:39:05 2010
@@ -41,7 +41,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.name.LdapDN;
-import org.apache.directory.shared.ldap.name.Rdn;
+import org.apache.directory.shared.ldap.name.RDN;
import org.apache.directory.shared.ldap.util.StringTools;
import org.junit.Test;
@@ -648,7 +648,7 @@
{
LdapDN dn = new LdapDN( "cn=john doe, dc=example, dc=com" );
LdapDN newSuperior = new LdapDN( "ou=system" );
- Rdn rdn = new Rdn( "cn=john doe" );
+ RDN rdn = new RDN( "cn=john doe" );
Attributes attrs = new BasicAttributes( "objectClass", "person", true );
attrs.get( "objectClass" ).add( "uidObject" );
@@ -691,8 +691,8 @@
public void test11ReverseRenameSimpleSimpleNotOverlappingKeepOldRdnDontExistInEntry() throws NamingException
{
LdapDN dn = new LdapDN( "cn=test,ou=system" );
- Rdn oldRdn = new Rdn( "cn=test" );
- Rdn newRdn = new Rdn( "cn=joe" );
+ RDN oldRdn = new RDN( "cn=test" );
+ RDN newRdn = new RDN( "cn=joe" );
Entry entry = new DefaultClientEntry( dn );
entry.put( "cn", "test" );
@@ -735,8 +735,8 @@
public void test12ReverseRenameSimpleSimpleNotOverlappingKeepOldRdnExistInEntry() throws NamingException
{
LdapDN dn = new LdapDN( "cn=test,ou=system" );
- Rdn oldRdn = new Rdn( "cn=test" );
- Rdn newRdn = new Rdn( "cn=small" );
+ RDN oldRdn = new RDN( "cn=test" );
+ RDN newRdn = new RDN( "cn=small" );
Entry entry = new DefaultClientEntry( dn );
entry.put( "cn", "test", "small" );
@@ -778,8 +778,8 @@
public void test21ReverseRenameSimpleSimpleNotOverlappingDeleteOldRdnDontExistInEntry() throws NamingException
{
LdapDN dn = new LdapDN( "cn=test,ou=system" );
- Rdn oldRdn = new Rdn( "cn=test" );
- Rdn newRdn = new Rdn( "cn=joe" );
+ RDN oldRdn = new RDN( "cn=test" );
+ RDN newRdn = new RDN( "cn=joe" );
Entry entry = new DefaultClientEntry( dn );
entry.put( "cn", "test" );
@@ -822,8 +822,8 @@
public void test22ReverseRenameSimpleSimpleNotOverlappingDeleteOldRdnExistInEntry() throws NamingException
{
LdapDN dn = new LdapDN( "cn=test,ou=system" );
- Rdn oldRdn = new Rdn( "cn=test" );
- Rdn newRdn = new Rdn( "cn=small" );
+ RDN oldRdn = new RDN( "cn=test" );
+ RDN newRdn = new RDN( "cn=small" );
Entry entry = new DefaultClientEntry( dn );
entry.put( "cn", "test", "small" );
@@ -867,8 +867,8 @@
public void test3ReverseRenameCompositeSimpleNotOverlappingKeepOldRdnDontExistInEntry() throws NamingException
{
LdapDN dn = new LdapDN( "cn=small+cn=test,ou=system" );
- Rdn oldRdn = new Rdn( "cn=small+cn=test" );
- Rdn newRdn = new Rdn( "cn=joe" );
+ RDN oldRdn = new RDN( "cn=small+cn=test" );
+ RDN newRdn = new RDN( "cn=joe" );
Entry entry = new DefaultClientEntry( dn );
entry.put( "cn", "test", "small" );
@@ -913,8 +913,8 @@
public void test3ReverseRenameCompositeSimpleNotOverlappingKeepOldRdnExistsInEntry() throws NamingException
{
LdapDN dn = new LdapDN( "cn=small+cn=test,ou=system" );
- Rdn oldRdn = new Rdn( "cn=small+cn=test" );
- Rdn newRdn = new Rdn( "cn=big" );
+ RDN oldRdn = new RDN( "cn=small+cn=test" );
+ RDN newRdn = new RDN( "cn=big" );
Entry entry = new DefaultClientEntry( dn );
entry.put( "cn", "test", "small", "big" );
@@ -958,8 +958,8 @@
public void test4ReverseRenameCompositeSimpleNotOverlappingDeleteOldRdnDontExistsInEntry() throws NamingException
{
LdapDN dn = new LdapDN( "cn=small+cn=test,ou=system" );
- Rdn oldRdn = new Rdn( "cn=small+cn=test" );
- Rdn newRdn = new Rdn( "cn=joe" );
+ RDN oldRdn = new RDN( "cn=small+cn=test" );
+ RDN newRdn = new RDN( "cn=joe" );
Entry entry = new DefaultClientEntry( dn );
entry.put( "cn", "test", "small" );
@@ -1004,8 +1004,8 @@
public void test4ReverseRenameCompositeSimpleNotOverlappingDeleteOldRdnExistInEntry() throws NamingException
{
LdapDN dn = new LdapDN( "cn=small+cn=test,ou=system" );
- Rdn oldRdn = new Rdn( "cn=small+cn=test" );
- Rdn newRdn = new Rdn( "cn=big" );
+ RDN oldRdn = new RDN( "cn=small+cn=test" );
+ RDN newRdn = new RDN( "cn=big" );
Entry entry = new DefaultClientEntry( dn );
entry.put( "cn", "test", "small", "big" );
@@ -1048,8 +1048,8 @@
public void test5ReverseRenameCompositeSimpleOverlappingKeepOldRdn() throws NamingException
{
LdapDN dn = new LdapDN( "cn=small+cn=test,ou=system" );
- Rdn oldRdn = new Rdn( "cn=small+cn=test" );
- Rdn newRdn = new Rdn( "cn=test" );
+ RDN oldRdn = new RDN( "cn=small+cn=test" );
+ RDN newRdn = new RDN( "cn=test" );
Entry entry = new DefaultClientEntry( dn );
entry.put( "cn", "test", "small" );
@@ -1092,8 +1092,8 @@
public void test5ReverseRenameCompositeSimpleOverlappingDeleteOldRdn() throws NamingException
{
LdapDN dn = new LdapDN( "cn=small+cn=test,ou=system" );
- Rdn oldRdn = new Rdn( "cn=small+cn=test" );
- Rdn newRdn = new Rdn( "cn=test" );
+ RDN oldRdn = new RDN( "cn=small+cn=test" );
+ RDN newRdn = new RDN( "cn=test" );
Entry entry = new DefaultClientEntry( dn );
entry.put( "cn", "test", "small" );
@@ -1137,8 +1137,8 @@
public void test61ReverseRenameSimpleCompositeNotOverlappingKeepOldRdnDontExistInEntry() throws NamingException
{
LdapDN dn = new LdapDN( "cn=test,ou=system" );
- Rdn oldRdn = new Rdn( "cn=test" );
- Rdn newRdn = new Rdn( "cn=joe+cn=plumber" );
+ RDN oldRdn = new RDN( "cn=test" );
+ RDN newRdn = new RDN( "cn=joe+cn=plumber" );
Entry entry = new DefaultClientEntry( dn );
entry.put( "cn", "test", "small" );
@@ -1182,8 +1182,8 @@
public void test62ReverseRenameSimpleCompositeNotOverlappingKeepOldRdnDontExistInEntry() throws NamingException
{
LdapDN dn = new LdapDN( "cn=test,ou=system" );
- Rdn oldRdn = new Rdn( "cn=test" );
- Rdn newRdn = new Rdn( "cn=joe+cn=small" );
+ RDN oldRdn = new RDN( "cn=test" );
+ RDN newRdn = new RDN( "cn=joe+cn=small" );
Entry entry = new DefaultClientEntry( dn );
entry.put( "cn", "test", "small" );
@@ -1240,8 +1240,8 @@
public void test71ReverseRenameSimpleCompositeNotOverlappingDeleteOldRdnDontExistInEntry() throws NamingException
{
LdapDN dn = new LdapDN( "cn=test,ou=system" );
- Rdn oldRdn = new Rdn( "cn=test" );
- Rdn newRdn = new Rdn( "cn=joe+cn=plumber" );
+ RDN oldRdn = new RDN( "cn=test" );
+ RDN newRdn = new RDN( "cn=joe+cn=plumber" );
Entry entry = new DefaultClientEntry( dn );
entry.put( "cn", "test", "small" );
@@ -1285,8 +1285,8 @@
public void test72ReverseRenameSimpleCompositeNotOverlappingDeleteOldRdnExistInEntry() throws NamingException
{
LdapDN dn = new LdapDN( "cn=test,ou=system" );
- Rdn oldRdn = new Rdn( "cn=test" );
- Rdn newRdn = new Rdn( "cn=joe+cn=small" );
+ RDN oldRdn = new RDN( "cn=test" );
+ RDN newRdn = new RDN( "cn=joe+cn=small" );
Entry entry = new DefaultClientEntry( dn );
entry.put( "cn", "test", "small" );
@@ -1343,8 +1343,8 @@
public void test81ReverseRenameSimpleCompositeOverlappingKeepOldRdnDontExistInEntry() throws NamingException
{
LdapDN dn = new LdapDN( "cn=test,ou=system" );
- Rdn oldRdn = new Rdn( "cn=test" );
- Rdn newRdn = new Rdn( "cn=small+cn=test" );
+ RDN oldRdn = new RDN( "cn=test" );
+ RDN newRdn = new RDN( "cn=small+cn=test" );
Entry entry = new DefaultClientEntry( dn );
entry.put( "cn", "test", "big" );
@@ -1390,8 +1390,8 @@
public void test82ReverseRenameSimpleCompositeOverlappingKeepOldRdnExistInEntry() throws NamingException
{
LdapDN dn = new LdapDN( "cn=test,ou=system" );
- Rdn oldRdn = new Rdn( "cn=test" );
- Rdn newRdn = new Rdn( "cn=small+cn=test+cn=big" );
+ RDN oldRdn = new RDN( "cn=test" );
+ RDN newRdn = new RDN( "cn=small+cn=test+cn=big" );
Entry entry = new DefaultClientEntry( dn );
entry.put( "cn", "test", "big" );
@@ -1448,8 +1448,8 @@
public void test91ReverseRenameSimpleCompositeOverlappingDeleteOldRdnDontExistInEntry() throws NamingException
{
LdapDN dn = new LdapDN( "cn=test,ou=system" );
- Rdn oldRdn = new Rdn( "cn=test" );
- Rdn newRdn = new Rdn( "cn=small+cn=test" );
+ RDN oldRdn = new RDN( "cn=test" );
+ RDN newRdn = new RDN( "cn=small+cn=test" );
Entry entry = new DefaultClientEntry( dn );
entry.put( "cn", "test", "big" );
@@ -1493,8 +1493,8 @@
public void test92ReverseRenameSimpleCompositeOverlappingDeleteOldRdnDontExistInEntry() throws NamingException
{
LdapDN dn = new LdapDN( "cn=test,ou=system" );
- Rdn oldRdn = new Rdn( "cn=test" );
- Rdn newRdn = new Rdn( "cn=small+cn=test+cn=big" );
+ RDN oldRdn = new RDN( "cn=test" );
+ RDN newRdn = new RDN( "cn=small+cn=test+cn=big" );
Entry entry = new DefaultClientEntry( dn );
entry.put( "cn", "test", "big" );
@@ -1552,8 +1552,8 @@
public void test101ReverseRenameCompositeCompositeNotOverlappingKeepOldRdnDontExistInEntry() throws NamingException
{
LdapDN dn = new LdapDN( "cn=small+cn=test,ou=system" );
- Rdn oldRdn = new Rdn( "cn=small+cn=test" );
- Rdn newRdn = new Rdn( "cn=joe+cn=plumber" );
+ RDN oldRdn = new RDN( "cn=small+cn=test" );
+ RDN newRdn = new RDN( "cn=joe+cn=plumber" );
Entry entry = new DefaultClientEntry( dn );
entry.put( "cn", "test", "big", "small" );
@@ -1598,8 +1598,8 @@
public void test102ReverseRenameCompositeCompositeNotOverlappingKeepOldRdnExistInEntry() throws NamingException
{
LdapDN dn = new LdapDN( "cn=small+cn=test,ou=system" );
- Rdn oldRdn = new Rdn( "cn=small+cn=test" );
- Rdn newRdn = new Rdn( "cn=joe+cn=big" );
+ RDN oldRdn = new RDN( "cn=small+cn=test" );
+ RDN newRdn = new RDN( "cn=joe+cn=big" );
Entry entry = new DefaultClientEntry( dn );
entry.put( "cn", "test", "big", "small" );
@@ -1657,8 +1657,8 @@
public void test111ReverseRenameCompositeCompositeNotOverlappingDeleteOldRdnDontExistInEntry() throws NamingException
{
LdapDN dn = new LdapDN( "cn=small+cn=test,ou=system" );
- Rdn oldRdn = new Rdn( "cn=small+cn=test" );
- Rdn newRdn = new Rdn( "cn=joe+cn=plumber" );
+ RDN oldRdn = new RDN( "cn=small+cn=test" );
+ RDN newRdn = new RDN( "cn=joe+cn=plumber" );
Entry entry = new DefaultClientEntry( dn );
entry.put( "cn", "test", "big", "small" );
@@ -1703,8 +1703,8 @@
public void test112ReverseRenameCompositeCompositeNotOverlappingDeleteOldRdnExistInEntry() throws NamingException
{
LdapDN dn = new LdapDN( "cn=small+cn=test,ou=system" );
- Rdn oldRdn = new Rdn( "cn=small+cn=test" );
- Rdn newRdn = new Rdn( "cn=joe+cn=big" );
+ RDN oldRdn = new RDN( "cn=small+cn=test" );
+ RDN newRdn = new RDN( "cn=joe+cn=big" );
Entry entry = new DefaultClientEntry( dn );
entry.put( "cn", "test", "big", "small" );
@@ -1762,8 +1762,8 @@
public void test121ReverseRenameCompositeCompositeOverlappingKeepOldRdnDontExistInEntry() throws NamingException
{
LdapDN dn = new LdapDN( "cn=small+cn=test,ou=system" );
- Rdn oldRdn = new Rdn( "cn=small+cn=test" );
- Rdn newRdn = new Rdn( "cn=joe+cn=test" );
+ RDN oldRdn = new RDN( "cn=small+cn=test" );
+ RDN newRdn = new RDN( "cn=joe+cn=test" );
Entry entry = new DefaultClientEntry( dn );
entry.put( "cn", "test", "big", "small" );
@@ -1808,8 +1808,8 @@
public void test122ReverseRenameCompositeCompositeOverlappingKeepOldRdnExistInEntry() throws NamingException
{
LdapDN dn = new LdapDN( "cn=small+cn=test,ou=system" );
- Rdn oldRdn = new Rdn( "cn=small+cn=test" );
- Rdn newRdn = new Rdn( "cn=big+cn=test" );
+ RDN oldRdn = new RDN( "cn=small+cn=test" );
+ RDN newRdn = new RDN( "cn=big+cn=test" );
Entry entry = new DefaultClientEntry( dn );
entry.put( "cn", "test", "big", "small" );
@@ -1854,8 +1854,8 @@
public void test131ReverseRenameCompositeCompositeOverlappingDeleteOldRdnDontExistInEntry() throws NamingException
{
LdapDN dn = new LdapDN( "cn=small+cn=test,ou=system" );
- Rdn oldRdn = new Rdn( "cn=small+cn=test" );
- Rdn newRdn = new Rdn( "cn=joe+cn=test" );
+ RDN oldRdn = new RDN( "cn=small+cn=test" );
+ RDN newRdn = new RDN( "cn=joe+cn=test" );
Entry entry = new DefaultClientEntry( dn );
entry.put( "cn", "test", "big", "small" );
@@ -1900,8 +1900,8 @@
public void test132ReverseRenameCompositeCompositeOverlappingDeleteOldRdnExistInEntry() throws NamingException
{
LdapDN dn = new LdapDN( "cn=small+cn=test,ou=system" );
- Rdn oldRdn = new Rdn( "cn=small+cn=test" );
- Rdn newRdn = new Rdn( "cn=big+cn=test" );
+ RDN oldRdn = new RDN( "cn=small+cn=test" );
+ RDN newRdn = new RDN( "cn=big+cn=test" );
Entry entry = new DefaultClientEntry( dn );
entry.put( "cn", "test", "big", "small" );
Modified: directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/ldif/LdifUtilsTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/ldif/LdifUtilsTest.java?rev=901348&r1=901347&r2=901348&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/ldif/LdifUtilsTest.java (original)
+++ directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/ldif/LdifUtilsTest.java Wed Jan 20 19:39:05 2010
@@ -39,7 +39,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.name.LdapDN;
-import org.apache.directory.shared.ldap.name.Rdn;
+import org.apache.directory.shared.ldap.name.RDN;
import org.apache.directory.shared.ldap.util.StringTools;
import org.junit.Test;
@@ -397,7 +397,7 @@
entry.add( "sn", "doe" );
entry.add( "uid", "jdoe" );
- List<LdifEntry> reverseds = LdifRevertor.reverseMoveAndRename( entry, newSuperior, new Rdn( "cn=jack doe" ), false );
+ List<LdifEntry> reverseds = LdifRevertor.reverseMoveAndRename( entry, newSuperior, new RDN( "cn=jack doe" ), false );
assertNotNull( reverseds );
assertEquals( 1, reverseds.size() );
@@ -429,7 +429,7 @@
entry.add( "sn", "doe" );
entry.add( "uid", "jdoe" );
- List<LdifEntry> reverseds = LdifRevertor.reverseMoveAndRename( entry, newSuperior, new Rdn( "cn=jack doe" ), false );
+ List<LdifEntry> reverseds = LdifRevertor.reverseMoveAndRename( entry, newSuperior, new RDN( "cn=jack doe" ), false );
assertNotNull( reverseds );
assertEquals( 1, reverseds.size() );
Modified: directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/message/ModifyDnRequestImplTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/message/ModifyDnRequestImplTest.java?rev=901348&r1=901347&r2=901348&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/message/ModifyDnRequestImplTest.java (original)
+++ directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/message/ModifyDnRequestImplTest.java Wed Jan 20 19:39:05 2010
@@ -33,7 +33,7 @@
import org.apache.directory.shared.ldap.message.ModifyDnRequestImpl;
import org.apache.directory.shared.ldap.message.InternalResultResponse;
import org.apache.directory.shared.ldap.name.LdapDN;
-import org.apache.directory.shared.ldap.name.Rdn;
+import org.apache.directory.shared.ldap.name.RDN;
import org.junit.Test;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
@@ -63,7 +63,7 @@
try
{
request.setName( new LdapDN( "dc=admins,dc=apache,dc=org" ) );
- request.setNewRdn( new Rdn( "dc=administrators" ) );
+ request.setNewRdn( new RDN( "dc=administrators" ) );
request.setNewSuperior( new LdapDN( "dc=groups,dc=apache,dc=org" ) );
}
catch ( InvalidNameException ine )
@@ -182,10 +182,10 @@
public void testNotEqualDiffNewRdn() throws InvalidNameException
{
ModifyDnRequestImpl req0 = getRequest();
- req0.setNewRdn( new Rdn( "cn=admin0" ) );
+ req0.setNewRdn( new RDN( "cn=admin0" ) );
ModifyDnRequestImpl req1 = getRequest();
- req1.setNewRdn( new Rdn( "cn=admin1" ) );
+ req1.setNewRdn( new RDN( "cn=admin1" ) );
assertFalse( req0.equals( req1 ) );
assertFalse( req1.equals( req0 ) );
@@ -219,11 +219,11 @@
}
- public Rdn getNewRdn()
+ public RDN getNewRdn()
{
try
{
- return new Rdn( "dc=administrators" );
+ return new RDN( "dc=administrators" );
}
catch ( InvalidNameException ine )
{
@@ -233,7 +233,7 @@
}
- public void setNewRdn( Rdn newRdn )
+ public void setNewRdn( RDN newRdn )
{
}
Modified: directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/name/DnParserDIRSERVER_584_Test.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/name/DnParserDIRSERVER_584_Test.java?rev=901348&r1=901347&r2=901348&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/name/DnParserDIRSERVER_584_Test.java (original)
+++ directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/name/DnParserDIRSERVER_584_Test.java Wed Jan 20 19:39:05 2010
@@ -45,7 +45,7 @@
{
try
{
- LdapDnParser.parseInternal( "ou=test+testing", new ArrayList<Rdn>() );
+ LdapDnParser.parseInternal( "ou=test+testing", new ArrayList<RDN>() );
fail( "should never get here" );
}
catch ( InvalidNameException e )
@@ -62,6 +62,6 @@
@Test
public void testb() throws Exception
{
- LdapDnParser.parseInternal( "ou=system", new ArrayList<Rdn>() );
+ LdapDnParser.parseInternal( "ou=system", new ArrayList<RDN>() );
}
}
\ No newline at end of file
Modified: directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/name/LdapDNTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/name/LdapDNTest.java?rev=901348&r1=901347&r2=901348&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/name/LdapDNTest.java (original)
+++ directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/name/LdapDNTest.java Wed Jan 20 19:39:05 2010
@@ -369,7 +369,7 @@
assertEquals( "a=\\#123456", dn.toString() );
assertEquals( "a = \\#123456", dn.getName() );
- Rdn rdn = dn.getRdn();
+ RDN rdn = dn.getRdn();
assertEquals( "a = \\#123456", rdn.getUpName() );
assertTrue( LdapDN.isValid( "a = \\#00" ) );
@@ -396,7 +396,7 @@
assertEquals( "a=\\#this is a sharp", dn.toString() );
assertEquals( "a = \\#this is a sharp", dn.getName() );
- Rdn rdn = dn.getRdn();
+ RDN rdn = dn.getRdn();
assertEquals( "a = \\#this is a sharp", rdn.getUpName() );
}
@@ -1959,12 +1959,12 @@
{
LdapDN name = new LdapDN( "cn=Airline,cn=Website,cn=HomeDir,cn=John,ou=Marketing,ou=West" );
- Enumeration<Rdn> rdns = name.getAllRdn();
+ Enumeration<RDN> rdns = name.getAllRdn();
assertEquals( true, rdns.hasMoreElements() );
for ( int i = 0; rdns.hasMoreElements(); i++ )
{
- Rdn element = ( Rdn ) rdns.nextElement();
+ RDN element = ( RDN ) rdns.nextElement();
if ( i == 0 )
{
@@ -2494,7 +2494,7 @@
assertTrue( name.getName().equals( "ou= Some People ,dc = eXample,dc= cOm" ) );
- Rdn rdn = name.getRdn();
+ RDN rdn = name.getRdn();
assertEquals( "ou= Some People ", rdn.getUpName() );
assertEquals( "ou", rdn.getNormType() );
@@ -2506,7 +2506,7 @@
"2.5.4.11=some people,0.9.2342.19200300.100.1.25=example,0.9.2342.19200300.100.1.25=com" ) );
assertTrue( name.getName().equals( "ou= Some People ,dc = eXample,dc= cOm" ) );
- Rdn rdn2 = result.getRdn();
+ RDN rdn2 = result.getRdn();
assertEquals( "ou= Some People ", rdn2.getUpName() );
assertEquals( "2.5.4.11", rdn2.getNormType() );
@@ -3481,7 +3481,7 @@
assertEquals( "2.5.4.11=example,2.5.4.11=com", dn.getNormName() );
assertEquals( " ou = Example , ou = COM ", dn.getName() );
- Rdn rdn = dn.getRdn();
+ RDN rdn = dn.getRdn();
assertEquals( "2.5.4.11", rdn.getNormType() );
assertEquals( "example",rdn.getNormValue() );
assertEquals( "2.5.4.11=example", rdn.getNormName() );
@@ -3511,7 +3511,7 @@
assertEquals( "2.5.4.11=example+2.5.4.11=test,2.5.4.11=com", dn.getNormName() );
assertEquals( " ou = Example + ou = TEST , ou = COM ", dn.getName() );
- Rdn rdn = dn.getRdn();
+ RDN rdn = dn.getRdn();
assertEquals( "2.5.4.11", rdn.getNormType() );
assertEquals( "example",rdn.getNormValue() );
assertEquals( "2.5.4.11=example+2.5.4.11=test", rdn.getNormName() );
@@ -3562,7 +3562,7 @@
assertEquals( "2.5.4.11=ex\\+mple,2.5.4.11=com", dn.getNormName() );
assertEquals( " ou = Ex\\+mple , ou = COM ", dn.getName() );
- Rdn rdn = dn.getRdn();
+ RDN rdn = dn.getRdn();
assertEquals( "2.5.4.11", rdn.getNormType() );
assertEquals( "ex+mple",rdn.getNormValue() );
assertEquals( "2.5.4.11=ex\\+mple", rdn.getNormName() );
@@ -3594,7 +3594,7 @@
assertEquals( "ou=Ex\\+mple+ou=T\\+ST\\ ,ou=COM", dn.getNormName() );
// Check the first RDN
- Rdn rdn = dn.getRdn();
+ RDN rdn = dn.getRdn();
assertEquals( " OU = Ex\\+mple + ou = T\\+ST\\ ", rdn.getUpName() );
assertEquals( "ou=Ex\\+mple+ou=T\\+ST\\ ", rdn.getNormName() );