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 2012/02/22 00:48:51 UTC
svn commit: r1292078 - in /directory:
apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/schema/registries/synchronizers/
apacheds/trunk/core-jndi/src/main/java/org/apache/directory/server/core/jndi/
apacheds/trunk/interceptors/...
Author: elecharny
Date: Tue Feb 21 23:48:51 2012
New Revision: 1292078
URL: http://svn.apache.org/viewvc?rev=1292078&view=rev
Log:
Renamed the Rdn.getUpType() and getUpValue() methods to getType() and getValue() to be consistent with DN methods
Modified:
directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/schema/registries/synchronizers/SchemaSynchronizer.java
directory/apacheds/trunk/core-jndi/src/main/java/org/apache/directory/server/core/jndi/ServerContext.java
directory/apacheds/trunk/interceptors/authn/src/main/java/org/apache/directory/server/core/authn/AuthenticationInterceptor.java
directory/apacheds/trunk/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmStoreTest.java
directory/apacheds/trunk/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/ClientModifyDnRequestTest.java
directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/bind/SaslBindIT.java
directory/shared/trunk/integ/src/test/java/org/apache/directory/shared/ldap/model/name/DnTest.java
directory/shared/trunk/integ/src/test/java/org/apache/directory/shared/ldap/model/name/RdnTest.java
directory/shared/trunk/integ/src/test/java/org/apache/directory/shared/ldap/model/name/SchemaAwareRdnSerializationTest.java
directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/name/Rdn.java
Modified: directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/schema/registries/synchronizers/SchemaSynchronizer.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/schema/registries/synchronizers/SchemaSynchronizer.java?rev=1292078&r1=1292077&r2=1292078&view=diff
==============================================================================
--- directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/schema/registries/synchronizers/SchemaSynchronizer.java (original)
+++ directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/schema/registries/synchronizers/SchemaSynchronizer.java Tue Feb 21 23:48:51 2012
@@ -44,7 +44,6 @@ import org.apache.directory.shared.ldap.
import org.apache.directory.shared.ldap.model.name.Rdn;
import org.apache.directory.shared.ldap.model.schema.AttributeType;
import org.apache.directory.shared.ldap.model.schema.SchemaManager;
-import org.apache.directory.shared.ldap.model.schema.registries.Registries;
import org.apache.directory.shared.ldap.model.schema.registries.Schema;
import org.apache.directory.shared.ldap.schemaloader.SchemaEntityFactory;
import org.apache.directory.shared.util.Strings;
@@ -261,7 +260,7 @@ public class SchemaSynchronizer implemen
*/
public void rename( Entry entry, Rdn newRdn, boolean cascade ) throws LdapException
{
- String rdnAttribute = newRdn.getUpType();
+ String rdnAttribute = newRdn.getNormType();
String rdnAttributeOid = schemaManager.getAttributeTypeRegistry().getOidByName( rdnAttribute );
if ( !rdnAttributeOid.equals( cnAT.getOid() ) )
Modified: directory/apacheds/trunk/core-jndi/src/main/java/org/apache/directory/server/core/jndi/ServerContext.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-jndi/src/main/java/org/apache/directory/server/core/jndi/ServerContext.java?rev=1292078&r1=1292077&r2=1292078&view=diff
==============================================================================
--- directory/apacheds/trunk/core-jndi/src/main/java/org/apache/directory/server/core/jndi/ServerContext.java (original)
+++ directory/apacheds/trunk/core-jndi/src/main/java/org/apache/directory/server/core/jndi/ServerContext.java Tue Feb 21 23:48:51 2012
@@ -944,7 +944,7 @@ public abstract class ServerContext impl
{
if ( SchemaConstants.CN_AT_OID.equals( rdn.getNormType() ) )
{
- serverEntry.put( rdn.getUpType(), rdn.getUpValue() );
+ serverEntry.put( rdn.getType(), rdn.getValue() );
}
else
{
@@ -1037,7 +1037,7 @@ public abstract class ServerContext impl
if ( rdn.size() == 1 )
{
- serverEntry.put( rdn.getUpType(), rdn.getUpValue() );
+ serverEntry.put( rdn.getType(), rdn.getValue() );
}
else
{
Modified: directory/apacheds/trunk/interceptors/authn/src/main/java/org/apache/directory/server/core/authn/AuthenticationInterceptor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/interceptors/authn/src/main/java/org/apache/directory/server/core/authn/AuthenticationInterceptor.java?rev=1292078&r1=1292077&r2=1292078&view=diff
==============================================================================
--- directory/apacheds/trunk/interceptors/authn/src/main/java/org/apache/directory/server/core/authn/AuthenticationInterceptor.java (original)
+++ directory/apacheds/trunk/interceptors/authn/src/main/java/org/apache/directory/server/core/authn/AuthenticationInterceptor.java Tue Feb 21 23:48:51 2012
@@ -332,7 +332,7 @@ public class AuthenticationInterceptor e
try
{
- username = entry.getDn().getRdn().getUpValue().getString();
+ username = entry.getDn().getRdn().getValue().getString();
check( username, userPassword.getValue(), policyConfig );
}
catch ( PasswordPolicyException e )
@@ -901,7 +901,7 @@ public class AuthenticationInterceptor e
try
{
- String userName = entry.getDn().getRdn().getUpValue().getString();
+ String userName = entry.getDn().getRdn().getValue().getString();
check( userName, newPassword, policyConfig );
}
catch ( PasswordPolicyException e )
Modified: directory/apacheds/trunk/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmStoreTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmStoreTest.java?rev=1292078&r1=1292077&r2=1292078&view=diff
==============================================================================
--- directory/apacheds/trunk/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmStoreTest.java (original)
+++ directory/apacheds/trunk/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmStoreTest.java Tue Feb 21 23:48:51 2012
@@ -735,7 +735,7 @@ public class JdbmStoreTest
dn = new Dn( schemaManager, "sn=James,ou=Engineering,o=Good Times Co." );
Entry renamed = store.lookup( new LookupOperationContext( null, dn ) );
assertNotNull( renamed );
- assertEquals( "James", renamed.getDn().getRdn().getUpValue().getString() );
+ assertEquals( "James", renamed.getDn().getRdn().getValue().getString() );
}
Modified: directory/apacheds/trunk/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/ClientModifyDnRequestTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/ClientModifyDnRequestTest.java?rev=1292078&r1=1292077&r2=1292078&view=diff
==============================================================================
--- directory/apacheds/trunk/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/ClientModifyDnRequestTest.java (original)
+++ directory/apacheds/trunk/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/ClientModifyDnRequestTest.java Tue Feb 21 23:48:51 2012
@@ -102,7 +102,7 @@ public class ClientModifyDnRequestTest e
assertNotNull( entry );
Rdn oldRdn = oldDn.getRdn();
- assertTrue( entry.contains( oldRdn.getUpType(), oldRdn.getNormValue() ) );
+ assertTrue( entry.contains( oldRdn.getType(), oldRdn.getNormValue() ) );
}
Modified: directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/bind/SaslBindIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/bind/SaslBindIT.java?rev=1292078&r1=1292077&r2=1292078&view=diff
==============================================================================
--- directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/bind/SaslBindIT.java (original)
+++ directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/bind/SaslBindIT.java Tue Feb 21 23:48:51 2012
@@ -293,7 +293,7 @@ public class SaslBindIT extends Abstract
LdapNetworkConnection connection = new LdapNetworkConnection( "localhost", getLdapServer().getPort() );
CramMd5Request request = new CramMd5Request();
- request.setUsername( userDn.getRdn().getUpValue().getString() );
+ request.setUsername( userDn.getRdn().getValue().getString() );
request.setCredentials( "secret" );
BindResponse resp = connection.bind( request );
@@ -316,7 +316,7 @@ public class SaslBindIT extends Abstract
LdapNetworkConnection connection = new LdapNetworkConnection( "localhost", getLdapServer().getPort() );
CramMd5Request request = new CramMd5Request();
- request.setUsername( userDn.getRdn().getUpValue().getString() );
+ request.setUsername( userDn.getRdn().getValue().getString() );
request.setCredentials( "badsecret" );
BindResponse resp = connection.bind( request );
@@ -335,7 +335,7 @@ public class SaslBindIT extends Abstract
LdapNetworkConnection connection = new LdapNetworkConnection( "localhost", getLdapServer().getPort() );
DigestMd5Request request = new DigestMd5Request();
- request.setUsername( userDn.getRdn().getUpValue().getString() );
+ request.setUsername( userDn.getRdn().getValue().getString() );
request.setCredentials( "secret" );
request.setRealmName( ldapServer.getSaslRealms().get( 0 ) );
BindResponse resp = connection.bind( request );
@@ -359,7 +359,7 @@ public class SaslBindIT extends Abstract
LdapNetworkConnection connection = new LdapNetworkConnection( "localhost", getLdapServer().getPort() );
DigestMd5Request request = new DigestMd5Request();
- request.setUsername( userDn.getRdn().getUpValue().getString() );
+ request.setUsername( userDn.getRdn().getValue().getString() );
request.setCredentials( "secret" );
request.setRealmName( ldapServer.getSaslRealms().get( 0 ) );
request.setQualityOfProtection( SaslQoP.AUTH );
@@ -385,7 +385,7 @@ public class SaslBindIT extends Abstract
LdapNetworkConnection connection = new LdapNetworkConnection( "localhost", getLdapServer().getPort() );
DigestMd5Request request = new DigestMd5Request();
- request.setUsername( userDn.getRdn().getUpValue().getString() );
+ request.setUsername( userDn.getRdn().getValue().getString() );
request.setCredentials( "secret" );
request.setRealmName( ldapServer.getSaslRealms().get( 0 ) );
request.setQualityOfProtection( SaslQoP.AUTH_INT );
@@ -411,7 +411,7 @@ public class SaslBindIT extends Abstract
LdapNetworkConnection connection = new LdapNetworkConnection( "localhost", getLdapServer().getPort() );
DigestMd5Request request = new DigestMd5Request();
- request.setUsername( userDn.getRdn().getUpValue().getString() );
+ request.setUsername( userDn.getRdn().getValue().getString() );
request.setCredentials( "secret" );
request.setRealmName( ldapServer.getSaslRealms().get( 0 ) );
request.setQualityOfProtection( SaslQoP.AUTH_CONF );
@@ -435,7 +435,7 @@ public class SaslBindIT extends Abstract
LdapNetworkConnection connection = new LdapNetworkConnection( "localhost", getLdapServer().getPort() );
DigestMd5Request request = new DigestMd5Request();
- request.setUsername( userDn.getRdn().getUpValue().getString() );
+ request.setUsername( userDn.getRdn().getValue().getString() );
request.setCredentials( "secret" );
request.setRealmName( "badrealm.com" );
BindResponse resp = connection.bind( request );
@@ -455,7 +455,7 @@ public class SaslBindIT extends Abstract
LdapNetworkConnection connection = new LdapNetworkConnection( "localhost", getLdapServer().getPort() );
DigestMd5Request request = new DigestMd5Request();
- request.setUsername( userDn.getRdn().getUpValue().getString() );
+ request.setUsername( userDn.getRdn().getValue().getString() );
request.setCredentials( "badsecret" );
request.setRealmName( ldapServer.getSaslRealms().get( 0 ) );
BindResponse resp = connection.bind( request );
@@ -475,7 +475,7 @@ public class SaslBindIT extends Abstract
LdapNetworkConnection connection = new LdapNetworkConnection( "localhost", getLdapServer().getPort() );
GssApiRequest request = new GssApiRequest();
- request.setUsername( userDn.getRdn().getUpValue().getString() );
+ request.setUsername( userDn.getRdn().getValue().getString() );
request.setCredentials( "secret" );
request.setRealmName( ldapServer.getSaslRealms().get( 0 ).toUpperCase() );
request.setKdcHost( "localhost" );
@@ -500,7 +500,7 @@ public class SaslBindIT extends Abstract
LdapNetworkConnection connection = new LdapNetworkConnection( "localhost", ldapServer.getPort() );
GssApiRequest request = new GssApiRequest();
- request.setUsername( userDn.getRdn().getUpValue().getString() );
+ request.setUsername( userDn.getRdn().getValue().getString() );
request.setCredentials( "secret" );
request.setRealmName( "badrealm.com" );
request.setKdcHost( "localhost" );
@@ -530,7 +530,7 @@ public class SaslBindIT extends Abstract
LdapNetworkConnection connection = new LdapNetworkConnection( "localhost", ldapServer.getPort() );
GssApiRequest request = new GssApiRequest();
- request.setUsername( userDn.getRdn().getUpValue().getString() );
+ request.setUsername( userDn.getRdn().getValue().getString() );
request.setCredentials( "badsecret" );
request.setRealmName( ldapServer.getSaslRealms().get( 0 ).toUpperCase() );
request.setKdcHost( "localhost" );
@@ -621,7 +621,7 @@ public class SaslBindIT extends Abstract
// Digest-MD5
connection = new LdapNetworkConnection( "localhost", ldapServer.getPort() );
DigestMd5Request digetDigestMd5Request = new DigestMd5Request();
- digetDigestMd5Request.setUsername( userDn.getRdn().getUpValue().getString() );
+ digetDigestMd5Request.setUsername( userDn.getRdn().getValue().getString() );
digetDigestMd5Request.setCredentials( "secret" );
digetDigestMd5Request.setRealmName( ldapServer.getSaslRealms().get( 0 ) );
resp = connection.bind( digetDigestMd5Request );
@@ -633,7 +633,7 @@ public class SaslBindIT extends Abstract
// Cram-MD5
connection = new LdapNetworkConnection( "localhost", ldapServer.getPort() );
CramMd5Request cramMd5Request = new CramMd5Request();
- cramMd5Request.setUsername( userDn.getRdn().getUpValue().getString() );
+ cramMd5Request.setUsername( userDn.getRdn().getValue().getString() );
cramMd5Request.setCredentials( "secret" );
resp = connection.bind( cramMd5Request );
assertEquals( ResultCodeEnum.SUCCESS, resp.getLdapResult().getResultCode() );
@@ -644,7 +644,7 @@ public class SaslBindIT extends Abstract
// GSSAPI
connection = new LdapNetworkConnection( "localhost", ldapServer.getPort() );
GssApiRequest gssApiRequest = new GssApiRequest();
- gssApiRequest.setUsername( userDn.getRdn().getUpValue().getString() );
+ gssApiRequest.setUsername( userDn.getRdn().getValue().getString() );
gssApiRequest.setCredentials( "secret" );
gssApiRequest.setRealmName( ldapServer.getSaslRealms().get( 0 ) );
gssApiRequest.setKdcHost( "localhost" );
Modified: directory/shared/trunk/integ/src/test/java/org/apache/directory/shared/ldap/model/name/DnTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/integ/src/test/java/org/apache/directory/shared/ldap/model/name/DnTest.java?rev=1292078&r1=1292077&r2=1292078&view=diff
==============================================================================
--- directory/shared/trunk/integ/src/test/java/org/apache/directory/shared/ldap/model/name/DnTest.java (original)
+++ directory/shared/trunk/integ/src/test/java/org/apache/directory/shared/ldap/model/name/DnTest.java Tue Feb 21 23:48:51 2012
@@ -1971,7 +1971,7 @@ public class DnTest
assertEquals( "ou= Some People ", rdn.getName() );
assertEquals( "ou", rdn.getNormType() );
- assertEquals( "ou", rdn.getUpType() );
+ assertEquals( "ou", rdn.getType() );
Dn result = name.apply( schemaManager );
@@ -1983,7 +1983,7 @@ public class DnTest
assertEquals( "ou= Some People ", rdn2.getName() );
assertEquals( "2.5.4.11", rdn2.getNormType() );
- assertEquals( "ou", rdn2.getUpType() );
+ assertEquals( "ou", rdn2.getType() );
}
@@ -2434,7 +2434,7 @@ public class DnTest
public void testPreserveAttributeIdCase() throws LdapException
{
Dn dn = new Dn( "uID=kevin" );
- assertEquals( "uID", dn.getRdn().getUpType() );
+ assertEquals( "uID", dn.getRdn().getType() );
}
@@ -2618,8 +2618,8 @@ public class DnTest
assertEquals( "2.5.4.11", rdn.getNormType() );
assertEquals( "example", rdn.getNormValue().getString() );
assertEquals( "2.5.4.11=example", rdn.getNormName() );
- assertEquals( "ou", rdn.getUpType() );
- assertEquals( "Example", rdn.getUpValue().getString() );
+ assertEquals( "ou", rdn.getType() );
+ assertEquals( "Example", rdn.getValue().getString() );
assertEquals( " ou = Example ", rdn.getName() );
Ava atav = rdn.getAva();
@@ -2648,8 +2648,8 @@ public class DnTest
assertEquals( "2.5.4.11", rdn.getNormType() );
assertEquals( "example", rdn.getNormValue().getString() );
assertEquals( "2.5.4.11=example+2.5.4.3=test", rdn.getNormName() );
- assertEquals( "ou", rdn.getUpType() );
- assertEquals( "Example", rdn.getUpValue().getString() );
+ assertEquals( "ou", rdn.getType() );
+ assertEquals( "Example", rdn.getValue().getString() );
assertEquals( " ou = Example + cn = TEST ", rdn.getName() );
// The first ATAV
@@ -2699,8 +2699,8 @@ public class DnTest
assertEquals( "2.5.4.11", rdn.getNormType() );
assertEquals( "ex+mple", rdn.getNormValue().getString() );
assertEquals( "2.5.4.11=ex\\+mple", rdn.getNormName() );
- assertEquals( "ou", rdn.getUpType() );
- assertEquals( "Ex+mple", rdn.getUpValue().getString() );
+ assertEquals( "ou", rdn.getType() );
+ assertEquals( "Ex+mple", rdn.getValue().getString() );
assertEquals( " ou = Ex\\+mple ", rdn.getName() );
Ava atav = rdn.getAva();
@@ -2731,10 +2731,10 @@ public class DnTest
assertEquals( " OU = Ex\\+mple + cn = T\\+ST\\ ", rdn.getName() );
assertEquals( "ou=Ex\\+mple+cn=T\\+ST\\ ", rdn.getNormName() );
- assertEquals( "OU", rdn.getUpType() );
+ assertEquals( "OU", rdn.getType() );
assertEquals( "ou", rdn.getNormType() );
- assertEquals( "Ex+mple", rdn.getUpValue().getString() );
+ assertEquals( "Ex+mple", rdn.getValue().getString() );
assertEquals( "Ex+mple", rdn.getNormValue().getString() );
// The first ATAV
@@ -2782,10 +2782,10 @@ public class DnTest
assertEquals( " OU = Ex\\+mple + cn = T\\+ST\\ ", rdn.getName() );
assertEquals( "2.5.4.11=ex\\+mple+2.5.4.3=t\\+st", rdn.getNormName() );
- assertEquals( "OU", rdn.getUpType() );
+ assertEquals( "OU", rdn.getType() );
assertEquals( "2.5.4.11", rdn.getNormType() );
- assertEquals( "Ex+mple", rdn.getUpValue().getString() );
+ assertEquals( "Ex+mple", rdn.getValue().getString() );
assertEquals( "ex+mple", rdn.getNormValue().getString() );
// The first ATAV
Modified: directory/shared/trunk/integ/src/test/java/org/apache/directory/shared/ldap/model/name/RdnTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/integ/src/test/java/org/apache/directory/shared/ldap/model/name/RdnTest.java?rev=1292078&r1=1292077&r2=1292078&view=diff
==============================================================================
--- directory/shared/trunk/integ/src/test/java/org/apache/directory/shared/ldap/model/name/RdnTest.java (original)
+++ directory/shared/trunk/integ/src/test/java/org/apache/directory/shared/ldap/model/name/RdnTest.java Tue Feb 21 23:48:51 2012
@@ -75,14 +75,14 @@ public class RdnTest
errors += "\nRdn.getNormValue fails '" + rdn.getNormValue().getString() + "'";
}
- if ( !"OU".equals( rdn.getUpType() ) )
+ if ( !"OU".equals( rdn.getType() ) )
{
- errors += "\nRdn.getUpType fails '" + rdn.getUpType() + "'";
+ errors += "\nRdn.getUpType fails '" + rdn.getType() + "'";
}
- if ( !"Exemple + Rdn\u00E4".equals( rdn.getUpValue().getString() ) )
+ if ( !"Exemple + Rdn\u00E4".equals( rdn.getValue().getString() ) )
{
- errors += "\nRdn.getUpValue fails '" + rdn.getUpValue() + "'";
+ errors += "\nRdn.getUpValue fails '" + rdn.getValue() + "'";
}
if ( !"Exemple + Rdn\u00E4 ".equals( rdn.getValue( "ou" ) ) )
@@ -131,14 +131,14 @@ public class RdnTest
errors += "\nRdn.getNormValue fails '" + rdn.getNormValue().getString() + "'";
}
- if ( !"OU".equals( rdn.getUpType() ) )
+ if ( !"OU".equals( rdn.getType() ) )
{
- errors += "\nRdn.getUpType fails '" + rdn.getUpType() + "'";
+ errors += "\nRdn.getUpType fails '" + rdn.getType() + "'";
}
- if ( !"Exemple + Rdn\u00E4".equals( rdn.getUpValue().getString() ) )
+ if ( !"Exemple + Rdn\u00E4".equals( rdn.getValue().getString() ) )
{
- errors += "\nRdn.getUpValue fails '" + rdn.getUpValue().getString() + "'";
+ errors += "\nRdn.getUpValue fails '" + rdn.getValue().getString() + "'";
}
if ( !"exemple + rdn\u00E4".equals( rdn.getValue( "ou" ) ) )
Modified: directory/shared/trunk/integ/src/test/java/org/apache/directory/shared/ldap/model/name/SchemaAwareRdnSerializationTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/integ/src/test/java/org/apache/directory/shared/ldap/model/name/SchemaAwareRdnSerializationTest.java?rev=1292078&r1=1292077&r2=1292078&view=diff
==============================================================================
--- directory/shared/trunk/integ/src/test/java/org/apache/directory/shared/ldap/model/name/SchemaAwareRdnSerializationTest.java (original)
+++ directory/shared/trunk/integ/src/test/java/org/apache/directory/shared/ldap/model/name/SchemaAwareRdnSerializationTest.java Tue Feb 21 23:48:51 2012
@@ -126,6 +126,6 @@ public class SchemaAwareRdnSerialization
assertEquals( rdn1, rdn2 );
assertEquals( "doe", rdn2.getValue( "cn" ) );
- assertEquals( "Doe", rdn2.getUpValue().getString() );
+ assertEquals( "Doe", rdn2.getValue().getString() );
}
}
Modified: directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/name/Rdn.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/name/Rdn.java?rev=1292078&r1=1292077&r2=1292078&view=diff
==============================================================================
--- directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/name/Rdn.java (original)
+++ directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/name/Rdn.java Tue Feb 21 23:48:51 2012
@@ -874,7 +874,7 @@ public class Rdn implements Cloneable, E
*
* @return The first user provided type of this Rdn
*/
- public String getUpType()
+ public String getType()
{
switch ( nbAvas )
{
@@ -916,7 +916,7 @@ public class Rdn implements Cloneable, E
*
* @return The first User provided value of this Rdn
*/
- public Value<?> getUpValue()
+ public Value<?> getValue()
{
switch ( nbAvas )
{