You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by el...@apache.org on 2010/08/14 16:18:55 UTC
svn commit: r985495 [2/7] - in /directory:
apacheds/branches/apacheds-codec-merge/core-api/src/main/java/org/apache/directory/server/core/
apacheds/branches/apacheds-codec-merge/core-integ/src/test/java/org/apache/directory/server/core/admin/
apacheds/...
Modified: directory/apacheds/branches/apacheds-codec-merge/core-integ/src/test/java/org/apache/directory/server/core/authz/AddAuthorizationIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-codec-merge/core-integ/src/test/java/org/apache/directory/server/core/authz/AddAuthorizationIT.java?rev=985495&r1=985494&r2=985495&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-codec-merge/core-integ/src/test/java/org/apache/directory/server/core/authz/AddAuthorizationIT.java (original)
+++ directory/apacheds/branches/apacheds-codec-merge/core-integ/src/test/java/org/apache/directory/server/core/authz/AddAuthorizationIT.java Sat Aug 14 14:18:49 2010
@@ -36,7 +36,7 @@ import org.apache.directory.shared.ldap.
import org.apache.directory.shared.ldap.entry.Entry;
import org.apache.directory.shared.ldap.exception.LdapException;
import org.apache.directory.shared.ldap.message.ResultCodeEnum;
-import org.apache.directory.shared.ldap.message.internal.InternalAddResponse;
+import org.apache.directory.shared.ldap.message.internal.AddResponse;
import org.apache.directory.shared.ldap.name.DN;
import org.junit.After;
import org.junit.Before;
@@ -93,7 +93,7 @@ public class AddAuthorizationIT extends
entry.add( SchemaConstants.OU_AT, "testou" );
entry.add( SchemaConstants.OBJECT_CLASS_AT, "organizationalUnit" );
- InternalAddResponse resp = connection.add( entry );
+ AddResponse resp = connection.add( entry );
if ( resp.getLdapResult().getResultCode() != ResultCodeEnum.SUCCESS )
{
Modified: directory/apacheds/branches/apacheds-codec-merge/core-integ/src/test/java/org/apache/directory/server/core/authz/AdministratorsGroupIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-codec-merge/core-integ/src/test/java/org/apache/directory/server/core/authz/AdministratorsGroupIT.java?rev=985495&r1=985494&r2=985495&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-codec-merge/core-integ/src/test/java/org/apache/directory/server/core/authz/AdministratorsGroupIT.java (original)
+++ directory/apacheds/branches/apacheds-codec-merge/core-integ/src/test/java/org/apache/directory/server/core/authz/AdministratorsGroupIT.java Sat Aug 14 14:18:49 2010
@@ -31,7 +31,7 @@ import org.apache.directory.server.core.
import org.apache.directory.server.core.integ.AbstractLdapTestUnit;
import org.apache.directory.server.core.integ.FrameworkRunner;
import org.apache.directory.server.core.integ.IntegrationUtils;
-import org.apache.directory.shared.ldap.message.internal.InternalSearchResultEntry;
+import org.apache.directory.shared.ldap.message.internal.SearchResultEntry;
import org.apache.directory.shared.ldap.name.DN;
import org.junit.After;
import org.junit.Before;
@@ -65,7 +65,7 @@ public class AdministratorsGroupIT exten
boolean canReadAdministrators( LdapConnection connection ) throws Exception
{
- InternalSearchResultEntry res = ( InternalSearchResultEntry ) connection
+ SearchResultEntry res = ( SearchResultEntry ) connection
.lookup( "cn=Administrators,ou=groups,ou=system" );
if ( res == null )
Modified: directory/apacheds/branches/apacheds-codec-merge/core-integ/src/test/java/org/apache/directory/server/core/authz/AuthorizationServiceAsAdminIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-codec-merge/core-integ/src/test/java/org/apache/directory/server/core/authz/AuthorizationServiceAsAdminIT.java?rev=985495&r1=985494&r2=985495&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-codec-merge/core-integ/src/test/java/org/apache/directory/server/core/authz/AuthorizationServiceAsAdminIT.java (original)
+++ directory/apacheds/branches/apacheds-codec-merge/core-integ/src/test/java/org/apache/directory/server/core/authz/AuthorizationServiceAsAdminIT.java Sat Aug 14 14:18:49 2010
@@ -38,10 +38,10 @@ import org.apache.directory.shared.ldap.
import org.apache.directory.shared.ldap.entry.Entry;
import org.apache.directory.shared.ldap.filter.SearchScope;
import org.apache.directory.shared.ldap.message.ResultCodeEnum;
-import org.apache.directory.shared.ldap.message.internal.InternalDeleteResponse;
-import org.apache.directory.shared.ldap.message.internal.InternalModifyDnResponse;
-import org.apache.directory.shared.ldap.message.internal.InternalResponse;
-import org.apache.directory.shared.ldap.message.internal.InternalSearchResultEntry;
+import org.apache.directory.shared.ldap.message.internal.DeleteResponse;
+import org.apache.directory.shared.ldap.message.internal.ModifyDnResponse;
+import org.apache.directory.shared.ldap.message.internal.Response;
+import org.apache.directory.shared.ldap.message.internal.SearchResultEntry;
import org.apache.directory.shared.ldap.name.DN;
import org.apache.directory.shared.ldap.name.RDN;
import org.apache.directory.shared.ldap.util.StringTools;
@@ -83,7 +83,7 @@ public class AuthorizationServiceAsAdmin
@Test
public void testNoDeleteOnAdminByAdmin() throws Exception
{
- InternalDeleteResponse delResp = getAdminConnection().delete( "uid=admin,ou=system" );
+ DeleteResponse delResp = getAdminConnection().delete( "uid=admin,ou=system" );
assertEquals( ResultCodeEnum.INSUFFICIENT_ACCESS_RIGHTS, delResp.getLdapResult().getResultCode() );
}
@@ -96,7 +96,7 @@ public class AuthorizationServiceAsAdmin
@Test
public void testNoRdnChangesOnAdminByAdmin() throws Exception
{
- InternalModifyDnResponse resp = getAdminConnection().rename( new DN( "uid=admin,ou=system" ),
+ ModifyDnResponse resp = getAdminConnection().rename( new DN( "uid=admin,ou=system" ),
new RDN( "uid=alex" ) );
assertEquals( ResultCodeEnum.INSUFFICIENT_ACCESS_RIGHTS, resp.getLdapResult().getResultCode() );
}
@@ -119,7 +119,7 @@ public class AuthorizationServiceAsAdmin
connection.close();
connection = getConnectionAs( adminDN, newPwd );
- Entry entry = ( ( InternalSearchResultEntry ) connection.lookup( adminDN.getName() ) ).getEntry();
+ Entry entry = ( ( SearchResultEntry ) connection.lookup( adminDN.getName() ) ).getEntry();
assertTrue( ArrayUtils.isEquals( StringTools.getBytesUtf8( newPwd ), entry.get( "userPassword" ).get()
.getBytes() ) );
}
@@ -137,11 +137,11 @@ public class AuthorizationServiceAsAdmin
HashSet<String> set = new HashSet<String>();
- Cursor<InternalResponse> cursor = connection.search( "ou=system", "(objectClass=*)", SearchScope.SUBTREE, "*" );
+ Cursor<Response> cursor = connection.search( "ou=system", "(objectClass=*)", SearchScope.SUBTREE, "*" );
while ( cursor.next() )
{
- Entry result = ( ( InternalSearchResultEntry ) cursor.get() ).getEntry();
+ Entry result = ( ( SearchResultEntry ) cursor.get() ).getEntry();
set.add( result.getDn().getName() );
}
Modified: directory/apacheds/branches/apacheds-codec-merge/core-integ/src/test/java/org/apache/directory/server/core/authz/AuthzAuthnIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-codec-merge/core-integ/src/test/java/org/apache/directory/server/core/authz/AuthzAuthnIT.java?rev=985495&r1=985494&r2=985495&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-codec-merge/core-integ/src/test/java/org/apache/directory/server/core/authz/AuthzAuthnIT.java (original)
+++ directory/apacheds/branches/apacheds-codec-merge/core-integ/src/test/java/org/apache/directory/server/core/authz/AuthzAuthnIT.java Sat Aug 14 14:18:49 2010
@@ -32,7 +32,7 @@ import org.apache.directory.server.core.
import org.apache.directory.server.core.integ.FrameworkRunner;
import org.apache.directory.server.core.integ.IntegrationUtils;
import org.apache.directory.shared.ldap.entry.Entry;
-import org.apache.directory.shared.ldap.message.internal.InternalSearchResultEntry;
+import org.apache.directory.shared.ldap.message.internal.SearchResultEntry;
import org.apache.directory.shared.ldap.name.DN;
import org.junit.After;
import org.junit.Before;
@@ -79,7 +79,7 @@ public class AuthzAuthnIT extends Abstra
DN userName = new DN( "uid=billyd,ou=users,ou=system" );
// Authenticate to RootDSE
LdapConnection connection = getConnectionAs( userName, "billyd" );
- Entry entry = ( ( InternalSearchResultEntry ) connection.lookup( "" ) ).getEntry();
+ Entry entry = ( ( SearchResultEntry ) connection.lookup( "" ) ).getEntry();
assertNotNull( entry );
assertEquals( 0, entry.getDn().size() );
}
@@ -98,7 +98,7 @@ public class AuthzAuthnIT extends Abstra
DN userName = new DN( "uid=billyd,ou=users,ou=system" );
LdapConnection connection = getConnectionAs( userName, "billyd" );
- InternalSearchResultEntry entry = ( InternalSearchResultEntry ) connection.lookup( "ou=system" );
+ SearchResultEntry entry = ( SearchResultEntry ) connection.lookup( "ou=system" );
assertNull( entry );
}
@@ -131,7 +131,7 @@ public class AuthzAuthnIT extends Abstra
DN userName = new DN( "uid=billyd,ou=users,ou=system" );
LdapConnection connection = getConnectionAs( userName, "billyd" );
- InternalSearchResultEntry entry = ( InternalSearchResultEntry ) connection.lookup( "ou=system" );
+ SearchResultEntry entry = ( SearchResultEntry ) connection.lookup( "ou=system" );
assertNull( entry );
}
}
Modified: directory/apacheds/branches/apacheds-codec-merge/core-integ/src/test/java/org/apache/directory/server/core/authz/AutzIntegUtils.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-codec-merge/core-integ/src/test/java/org/apache/directory/server/core/authz/AutzIntegUtils.java?rev=985495&r1=985494&r2=985495&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-codec-merge/core-integ/src/test/java/org/apache/directory/server/core/authz/AutzIntegUtils.java (original)
+++ directory/apacheds/branches/apacheds-codec-merge/core-integ/src/test/java/org/apache/directory/server/core/authz/AutzIntegUtils.java Sat Aug 14 14:18:49 2010
@@ -30,8 +30,8 @@ import org.apache.directory.shared.ldap.
import org.apache.directory.shared.ldap.entry.Entry;
import org.apache.directory.shared.ldap.entry.EntryAttribute;
import org.apache.directory.shared.ldap.message.ResultCodeEnum;
-import org.apache.directory.shared.ldap.message.internal.InternalAddResponse;
-import org.apache.directory.shared.ldap.message.internal.InternalSearchResultEntry;
+import org.apache.directory.shared.ldap.message.internal.AddResponse;
+import org.apache.directory.shared.ldap.message.internal.SearchResultEntry;
import org.apache.directory.shared.ldap.name.DN;
@@ -233,7 +233,7 @@ public class AutzIntegUtils
{
LdapConnection connection = getAdminConnection();
- Entry systemEntry = ( ( InternalSearchResultEntry ) connection.lookup( ServerDNConstants.SYSTEM_DN, "+", "*" ) )
+ Entry systemEntry = ( ( SearchResultEntry ) connection.lookup( ServerDNConstants.SYSTEM_DN, "+", "*" ) )
.getEntry();
// modify ou=system to be an AP for an A/C AA if it is not already
@@ -253,7 +253,7 @@ public class AutzIntegUtils
subEntry.add( SchemaConstants.SUBTREE_SPECIFICATION_AT, subtree );
subEntry.add( SchemaConstants.PRESCRIPTIVE_ACI_AT, aciItem );
- InternalAddResponse addResp = connection.add( subEntry );
+ AddResponse addResp = connection.add( subEntry );
return addResp.getLdapResult().getResultCode();
}
Modified: directory/apacheds/branches/apacheds-codec-merge/core-integ/src/test/java/org/apache/directory/server/core/authz/CompareAuthorizationIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-codec-merge/core-integ/src/test/java/org/apache/directory/server/core/authz/CompareAuthorizationIT.java?rev=985495&r1=985494&r2=985495&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-codec-merge/core-integ/src/test/java/org/apache/directory/server/core/authz/CompareAuthorizationIT.java (original)
+++ directory/apacheds/branches/apacheds-codec-merge/core-integ/src/test/java/org/apache/directory/server/core/authz/CompareAuthorizationIT.java Sat Aug 14 14:18:49 2010
@@ -38,7 +38,7 @@ import org.apache.directory.shared.ldap.
import org.apache.directory.shared.ldap.entry.DefaultEntry;
import org.apache.directory.shared.ldap.entry.Entry;
import org.apache.directory.shared.ldap.message.ResultCodeEnum;
-import org.apache.directory.shared.ldap.message.internal.InternalCompareResponse;
+import org.apache.directory.shared.ldap.message.internal.CompareResponse;
import org.apache.directory.shared.ldap.name.DN;
import org.junit.After;
import org.junit.Before;
@@ -110,7 +110,7 @@ public class CompareAuthorizationIT exte
DN userName = new DN( "uid=" + uid + ",ou=users,ou=system" );
// compare the telephone numbers
LdapConnection userConnection = getConnectionAs( userName, password );
- InternalCompareResponse resp = userConnection.compare( entryDN, "telephoneNumber", number );
+ CompareResponse resp = userConnection.compare( entryDN, "telephoneNumber", number );
// don't set based on compare result success/failure but based on whether the op was permitted or not
if ( resp.getLdapResult().getResultCode() == ResultCodeEnum.INSUFFICIENT_ACCESS_RIGHTS )
@@ -258,7 +258,7 @@ public class CompareAuthorizationIT exte
adminCtx.add( user );
- InternalCompareResponse resp = adminCtx.compare( userDN, "userPassword", "bobspassword" );
+ CompareResponse resp = adminCtx.compare( userDN, "userPassword", "bobspassword" );
assertEquals( ResultCodeEnum.COMPARE_TRUE, resp.getLdapResult().getResultCode() );
}
Modified: directory/apacheds/branches/apacheds-codec-merge/core-integ/src/test/java/org/apache/directory/server/core/authz/DeleteAuthorizationIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-codec-merge/core-integ/src/test/java/org/apache/directory/server/core/authz/DeleteAuthorizationIT.java?rev=985495&r1=985494&r2=985495&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-codec-merge/core-integ/src/test/java/org/apache/directory/server/core/authz/DeleteAuthorizationIT.java (original)
+++ directory/apacheds/branches/apacheds-codec-merge/core-integ/src/test/java/org/apache/directory/server/core/authz/DeleteAuthorizationIT.java Sat Aug 14 14:18:49 2010
@@ -37,7 +37,7 @@ import org.apache.directory.shared.ldap.
import org.apache.directory.shared.ldap.entry.DefaultEntry;
import org.apache.directory.shared.ldap.entry.Entry;
import org.apache.directory.shared.ldap.message.ResultCodeEnum;
-import org.apache.directory.shared.ldap.message.internal.InternalDeleteResponse;
+import org.apache.directory.shared.ldap.message.internal.DeleteResponse;
import org.apache.directory.shared.ldap.name.DN;
import org.junit.After;
import org.junit.Before;
@@ -106,7 +106,7 @@ public class DeleteAuthorizationIT exten
// delete the newly created context as the user
LdapConnection userConnection = getConnectionAs( userName, password );
- InternalDeleteResponse resp = userConnection.delete( entryDN );
+ DeleteResponse resp = userConnection.delete( entryDN );
if ( resp.getLdapResult().getResultCode() == ResultCodeEnum.SUCCESS )
{
Modified: directory/apacheds/branches/apacheds-codec-merge/core-integ/src/test/java/org/apache/directory/server/core/authz/ModifyAuthorizationIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-codec-merge/core-integ/src/test/java/org/apache/directory/server/core/authz/ModifyAuthorizationIT.java?rev=985495&r1=985494&r2=985495&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-codec-merge/core-integ/src/test/java/org/apache/directory/server/core/authz/ModifyAuthorizationIT.java (original)
+++ directory/apacheds/branches/apacheds-codec-merge/core-integ/src/test/java/org/apache/directory/server/core/authz/ModifyAuthorizationIT.java Sat Aug 14 14:18:49 2010
@@ -46,7 +46,7 @@ import org.apache.directory.shared.ldap.
import org.apache.directory.shared.ldap.entry.Modification;
import org.apache.directory.shared.ldap.entry.ModificationOperation;
import org.apache.directory.shared.ldap.message.ResultCodeEnum;
-import org.apache.directory.shared.ldap.message.internal.InternalModifyResponse;
+import org.apache.directory.shared.ldap.message.internal.ModifyResponse;
import org.apache.directory.shared.ldap.name.DN;
import org.junit.After;
import org.junit.Before;
@@ -120,7 +120,7 @@ public class ModifyAuthorizationIT exten
// modify the entry as the user
ModifyRequest modReq = new ModifyRequest( entryDN );
modReq.addModification( mods );
- InternalModifyResponse resp = userConnection.modify( modReq );
+ ModifyResponse resp = userConnection.modify( modReq );
if ( resp.getLdapResult().getResultCode() == ResultCodeEnum.SUCCESS )
{
@@ -180,7 +180,7 @@ public class ModifyAuthorizationIT exten
ModifyRequest modReq = new ModifyRequest( entryDN );
modReq.addModification( attr, modOp );
- InternalModifyResponse resp = userConnection.modify( modReq );
+ ModifyResponse resp = userConnection.modify( modReq );
if ( resp.getLdapResult().getResultCode() == ResultCodeEnum.SUCCESS )
{
@@ -219,7 +219,7 @@ public class ModifyAuthorizationIT exten
ModifyRequest modReq = new ModifyRequest( userDN );
modReq.addModification( mods );
- InternalModifyResponse resp = connection.modify( modReq );
+ ModifyResponse resp = connection.modify( modReq );
return resp.getLdapResult().getResultCode() == ResultCodeEnum.SUCCESS;
}
Modified: directory/apacheds/branches/apacheds-codec-merge/core-integ/src/test/java/org/apache/directory/server/core/authz/MoveRenameAuthorizationIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-codec-merge/core-integ/src/test/java/org/apache/directory/server/core/authz/MoveRenameAuthorizationIT.java?rev=985495&r1=985494&r2=985495&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-codec-merge/core-integ/src/test/java/org/apache/directory/server/core/authz/MoveRenameAuthorizationIT.java (original)
+++ directory/apacheds/branches/apacheds-codec-merge/core-integ/src/test/java/org/apache/directory/server/core/authz/MoveRenameAuthorizationIT.java Sat Aug 14 14:18:49 2010
@@ -39,7 +39,7 @@ import org.apache.directory.shared.ldap.
import org.apache.directory.shared.ldap.entry.DefaultEntry;
import org.apache.directory.shared.ldap.entry.Entry;
import org.apache.directory.shared.ldap.message.ResultCodeEnum;
-import org.apache.directory.shared.ldap.message.internal.InternalModifyDnResponse;
+import org.apache.directory.shared.ldap.message.internal.ModifyDnResponse;
import org.apache.directory.shared.ldap.name.DN;
import org.junit.After;
import org.junit.Before;
@@ -88,7 +88,7 @@ public class MoveRenameAuthorizationIT e
DN userName = new DN( "uid=" + uid + ",ou=users,ou=system" );
LdapConnection userConnection = getConnectionAs( userName, password );
- InternalModifyDnResponse resp = userConnection.rename( entryDN.getName(), newNameRdn );
+ ModifyDnResponse resp = userConnection.rename( entryDN.getName(), newNameRdn );
if ( resp.getLdapResult().getResultCode() == ResultCodeEnum.SUCCESS )
{
@@ -141,7 +141,7 @@ public class MoveRenameAuthorizationIT e
LdapConnection userConnection = getConnectionAs( userName, password );
boolean isMoved = false;
- InternalModifyDnResponse moveResp = userConnection.move( entryDN.getName(), newParentRdn + ",ou=system" );
+ ModifyDnResponse moveResp = userConnection.move( entryDN.getName(), newParentRdn + ",ou=system" );
if ( moveResp.getLdapResult().getResultCode() == ResultCodeEnum.SUCCESS )
{
@@ -153,7 +153,7 @@ public class MoveRenameAuthorizationIT e
return false;
}
- InternalModifyDnResponse resp = userConnection
+ ModifyDnResponse resp = userConnection
.rename( entryRdn + "," + newParentRdn + ",ou=system", newNameRdn );
ResultCodeEnum code = resp.getLdapResult().getResultCode();
Modified: directory/apacheds/branches/apacheds-codec-merge/core-integ/src/test/java/org/apache/directory/server/core/authz/SearchAuthorizationIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-codec-merge/core-integ/src/test/java/org/apache/directory/server/core/authz/SearchAuthorizationIT.java?rev=985495&r1=985494&r2=985495&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-codec-merge/core-integ/src/test/java/org/apache/directory/server/core/authz/SearchAuthorizationIT.java (original)
+++ directory/apacheds/branches/apacheds-codec-merge/core-integ/src/test/java/org/apache/directory/server/core/authz/SearchAuthorizationIT.java Sat Aug 14 14:18:49 2010
@@ -48,8 +48,8 @@ import org.apache.directory.shared.ldap.
import org.apache.directory.shared.ldap.entry.DefaultEntry;
import org.apache.directory.shared.ldap.entry.Entry;
import org.apache.directory.shared.ldap.filter.SearchScope;
-import org.apache.directory.shared.ldap.message.internal.InternalResponse;
-import org.apache.directory.shared.ldap.message.internal.InternalSearchResultEntry;
+import org.apache.directory.shared.ldap.message.internal.Response;
+import org.apache.directory.shared.ldap.message.internal.SearchResultEntry;
import org.apache.directory.shared.ldap.name.DN;
import org.junit.After;
import org.junit.Before;
@@ -191,12 +191,12 @@ public class SearchAuthorizationIT exten
*/
private void recursivelyDelete( DN rdn ) throws Exception
{
- Cursor<InternalResponse> results = reusableAdminCon.search( rdn.getName(), "(objectClass=*)",
+ Cursor<Response> results = reusableAdminCon.search( rdn.getName(), "(objectClass=*)",
SearchScope.ONELEVEL, "*" );
while ( results.next() )
{
- InternalSearchResultEntry result = ( InternalSearchResultEntry ) results.get();
+ SearchResultEntry result = ( SearchResultEntry ) results.get();
DN childRdn = result.getEntry().getDn();
recursivelyDelete( childRdn );
}
@@ -277,12 +277,12 @@ public class SearchAuthorizationIT exten
DN userDn = new DN( "uid=" + uid + ",ou=users,ou=system" );
results.clear();
LdapConnection userCtx = getConnectionAs( userDn, password );
- Cursor<InternalResponse> cursor = userCtx.search( base.getName(), filter, scope, "*" );
+ Cursor<Response> cursor = userCtx.search( base.getName(), filter, scope, "*" );
int counter = 0;
while ( cursor.next() )
{
- Entry result = ( ( InternalSearchResultEntry ) cursor.get() ).getEntry();
+ Entry result = ( ( SearchResultEntry ) cursor.get() ).getEntry();
results.put( result.getDn().getName(), result );
counter++;
}
@@ -317,12 +317,12 @@ public class SearchAuthorizationIT exten
results.clear();
LdapConnection userCtx = getConnectionAs( userDn, password );
- Cursor<InternalResponse> cursor = userCtx.search( base.getName(), "(objectClass=*)", scope, "*" );
+ Cursor<Response> cursor = userCtx.search( base.getName(), "(objectClass=*)", scope, "*" );
int counter = 0;
while ( cursor.next() )
{
- Entry result = ( ( InternalSearchResultEntry ) cursor.get() ).getEntry();
+ Entry result = ( ( SearchResultEntry ) cursor.get() ).getEntry();
results.put( result.getDn().getName(), result );
counter++;
}
@@ -346,7 +346,7 @@ public class SearchAuthorizationIT exten
LdapConnection connection = getAdminConnection();
DN base = addSearchData( new DN( "ou=system" ), 3, 10 );
- Cursor<InternalResponse> results = connection.search( base.getName(), "(objectClass=*)", SearchScope.SUBTREE,
+ Cursor<Response> results = connection.search( base.getName(), "(objectClass=*)", SearchScope.SUBTREE,
"+" );
int counter = 0;
@@ -359,7 +359,7 @@ public class SearchAuthorizationIT exten
assertEquals( 10, counter );
recursivelyDelete( base );
- InternalSearchResultEntry entry = ( InternalSearchResultEntry ) connection.lookup( base.getName() );
+ SearchResultEntry entry = ( SearchResultEntry ) connection.lookup( base.getName() );
assertNull( entry );
}
@@ -777,16 +777,16 @@ public class SearchAuthorizationIT exten
* @return the single search result if access is allowed or null
* @throws Exception if the search fails w/ exception other than no permission
*/
- private InternalSearchResultEntry checkCanSearhSubentryAs( String uid, String password, DN dn ) throws Exception
+ private SearchResultEntry checkCanSearhSubentryAs( String uid, String password, DN dn ) throws Exception
{
LdapConnection userCtx = getConnectionAs( new DN( "uid=" + uid + ",ou=users,ou=system" ), password );
- InternalSearchResultEntry result = null;
- Cursor<InternalResponse> list = null;
+ SearchResultEntry result = null;
+ Cursor<Response> list = null;
list = userCtx.search( dn.getName(), "(objectClass=*)", SearchScope.OBJECT, "*" );
if ( list.next() )
{
- result = ( InternalSearchResultEntry ) list.get();
+ result = ( SearchResultEntry ) list.get();
}
list.close();
@@ -844,7 +844,7 @@ public class SearchAuthorizationIT exten
LdapConnection userCtx = getConnectionAs( "uid=billyd,ou=users,ou=system", "billyd" );
// we should not see ou=groups,ou=system for the remaining name
- InternalSearchResultEntry entry = ( InternalSearchResultEntry ) userCtx.lookup( "cn=blah,ou=groups" );
+ SearchResultEntry entry = ( SearchResultEntry ) userCtx.lookup( "cn=blah,ou=groups" );
assertNull( entry );
// now delete and replace subentry with one that does not excluse ou=groups,ou=system
@@ -857,7 +857,7 @@ public class SearchAuthorizationIT exten
+ " grantDiscloseOnError " + " } " + " } " + " } " + " } " + "}" );
// now try a lookup of a non-existant entry under ou=groups,ou=system again
- entry = ( InternalSearchResultEntry ) userCtx.lookup( "cn=blah,ou=groups" );
+ entry = ( SearchResultEntry ) userCtx.lookup( "cn=blah,ou=groups" );
assertNull( entry );
}
Modified: directory/apacheds/branches/apacheds-codec-merge/core-integ/src/test/java/org/apache/directory/server/core/changelog/DefaultChangeLogIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-codec-merge/core-integ/src/test/java/org/apache/directory/server/core/changelog/DefaultChangeLogIT.java?rev=985495&r1=985494&r2=985495&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-codec-merge/core-integ/src/test/java/org/apache/directory/server/core/changelog/DefaultChangeLogIT.java (original)
+++ directory/apacheds/branches/apacheds-codec-merge/core-integ/src/test/java/org/apache/directory/server/core/changelog/DefaultChangeLogIT.java Sat Aug 14 14:18:49 2010
@@ -39,7 +39,7 @@ import org.apache.directory.shared.ldap.
import org.apache.directory.shared.ldap.entry.Entry;
import org.apache.directory.shared.ldap.entry.EntryAttribute;
import org.apache.directory.shared.ldap.exception.LdapException;
-import org.apache.directory.shared.ldap.message.internal.InternalSearchResultEntry;
+import org.apache.directory.shared.ldap.message.internal.SearchResultEntry;
import org.apache.directory.shared.ldap.name.DN;
import org.junit.After;
import org.junit.Test;
@@ -293,7 +293,7 @@ public class DefaultChangeLogIT extends
modReq.add( "description", "a desc value" );
sysRoot.modify( modReq );
- Entry resusitated = ( ( InternalSearchResultEntry ) sysRoot.lookup( "ou=test5,ou=system" ) ).getEntry();
+ Entry resusitated = ( ( SearchResultEntry ) sysRoot.lookup( "ou=test5,ou=system" ) ).getEntry();
assertNotNull( resusitated );
EntryAttribute description = resusitated.get( "description" );
assertNotNull( description );
@@ -301,7 +301,7 @@ public class DefaultChangeLogIT extends
// now revert and assert that the added entry re-appears
service.revert( t0.getRevision() );
- resusitated = ( ( InternalSearchResultEntry ) sysRoot.lookup( "ou=test5,ou=system" ) ).getEntry();
+ resusitated = ( ( SearchResultEntry ) sysRoot.lookup( "ou=test5,ou=system" ) ).getEntry();
assertNotNull( resusitated );
assertNull( resusitated.get( "description" ) );
@@ -313,7 +313,7 @@ public class DefaultChangeLogIT extends
modReq = new ModifyRequest( resusitated.getDn() );
modReq.add( "description", "old value" );
sysRoot.modify( modReq );
- resusitated = ( ( InternalSearchResultEntry ) sysRoot.lookup( "ou=test5,ou=system" ) ).getEntry();
+ resusitated = ( ( SearchResultEntry ) sysRoot.lookup( "ou=test5,ou=system" ) ).getEntry();
assertNotNull( resusitated );
description = resusitated.get( "description" );
assertNotNull( description );
@@ -325,7 +325,7 @@ public class DefaultChangeLogIT extends
modReq.replace( "description", "new value" );
sysRoot.modify( modReq );
- resusitated = ( ( InternalSearchResultEntry ) sysRoot.lookup( "ou=test5,ou=system" ) ).getEntry();
+ resusitated = ( ( SearchResultEntry ) sysRoot.lookup( "ou=test5,ou=system" ) ).getEntry();
assertNotNull( resusitated );
description = resusitated.get( "description" );
assertNotNull( description );
@@ -333,7 +333,7 @@ public class DefaultChangeLogIT extends
// now revert and assert the old value is now reverted
service.revert( t1.getRevision() );
- resusitated = ( ( InternalSearchResultEntry ) sysRoot.lookup( "ou=test5,ou=system" ) ).getEntry();
+ resusitated = ( ( SearchResultEntry ) sysRoot.lookup( "ou=test5,ou=system" ) ).getEntry();
assertNotNull( resusitated );
description = resusitated.get( "description" );
assertNotNull( description );
@@ -348,14 +348,14 @@ public class DefaultChangeLogIT extends
modReq.remove( "description", "old value" );
sysRoot.modify( modReq );
- resusitated = ( ( InternalSearchResultEntry ) sysRoot.lookup( "ou=test5,ou=system" ) ).getEntry();
+ resusitated = ( ( SearchResultEntry ) sysRoot.lookup( "ou=test5,ou=system" ) ).getEntry();
assertNotNull( resusitated );
description = resusitated.get( "description" );
assertNull( description );
// now revert and assert the old value is now reverted
service.revert( t2.getRevision() );
- resusitated = ( ( InternalSearchResultEntry ) sysRoot.lookup( "ou=test5,ou=system" ) ).getEntry();
+ resusitated = ( ( SearchResultEntry ) sysRoot.lookup( "ou=test5,ou=system" ) ).getEntry();
assertNotNull( resusitated );
description = resusitated.get( "description" );
assertNotNull( description );
@@ -369,7 +369,7 @@ public class DefaultChangeLogIT extends
modReq = new ModifyRequest( resusitated.getDn() );
modReq.add( "userPassword", "to be replaced" );
sysRoot.modify( modReq );
- resusitated = ( ( InternalSearchResultEntry ) sysRoot.lookup( "ou=test5,ou=system" ) ).getEntry();
+ resusitated = ( ( SearchResultEntry ) sysRoot.lookup( "ou=test5,ou=system" ) ).getEntry();
assertPassword( resusitated, "to be replaced" );
modReq = new ModifyRequest( resusitated.getDn() );
@@ -382,7 +382,7 @@ public class DefaultChangeLogIT extends
// now make the modification and check that description is gone,
// seeAlso is added, and that the userPassword has been replaced
sysRoot.modify( modReq );
- resusitated = ( ( InternalSearchResultEntry ) sysRoot.lookup( "ou=test5,ou=system" ) ).getEntry();
+ resusitated = ( ( SearchResultEntry ) sysRoot.lookup( "ou=test5,ou=system" ) ).getEntry();
assertNotNull( resusitated );
description = resusitated.get( "description" );
assertNull( description );
@@ -393,7 +393,7 @@ public class DefaultChangeLogIT extends
// now we revert and make sure the old values are as they were
service.revert( t3.getRevision() );
- resusitated = ( ( InternalSearchResultEntry ) sysRoot.lookup( "ou=test5,ou=system" ) ).getEntry();
+ resusitated = ( ( SearchResultEntry ) sysRoot.lookup( "ou=test5,ou=system" ) ).getEntry();
assertNotNull( resusitated );
description = resusitated.get( "description" );
assertNotNull( description );
@@ -414,14 +414,14 @@ public class DefaultChangeLogIT extends
private void assertNotPresent( LdapConnection connection, String dn ) throws LdapException
{
- InternalSearchResultEntry se = ( InternalSearchResultEntry ) connection.lookup( dn );
+ SearchResultEntry se = ( SearchResultEntry ) connection.lookup( dn );
assertNull( se );
}
private void assertPresent( LdapConnection connection, String dn ) throws LdapException
{
- Entry entry = ( ( InternalSearchResultEntry ) connection.lookup( dn ) ).getEntry();
+ Entry entry = ( ( SearchResultEntry ) connection.lookup( dn ) ).getEntry();
assertNotNull( entry );
}
}
Modified: directory/apacheds/branches/apacheds-codec-merge/core-integ/src/test/java/org/apache/directory/server/core/collective/CollectiveAttributeServiceIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-codec-merge/core-integ/src/test/java/org/apache/directory/server/core/collective/CollectiveAttributeServiceIT.java?rev=985495&r1=985494&r2=985495&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-codec-merge/core-integ/src/test/java/org/apache/directory/server/core/collective/CollectiveAttributeServiceIT.java (original)
+++ directory/apacheds/branches/apacheds-codec-merge/core-integ/src/test/java/org/apache/directory/server/core/collective/CollectiveAttributeServiceIT.java Sat Aug 14 14:18:49 2010
@@ -44,10 +44,10 @@ import org.apache.directory.shared.ldap.
import org.apache.directory.shared.ldap.ldif.LdapLdifException;
import org.apache.directory.shared.ldap.ldif.LdifUtils;
import org.apache.directory.shared.ldap.message.ResultCodeEnum;
-import org.apache.directory.shared.ldap.message.internal.InternalAddResponse;
-import org.apache.directory.shared.ldap.message.internal.InternalModifyResponse;
-import org.apache.directory.shared.ldap.message.internal.InternalResponse;
-import org.apache.directory.shared.ldap.message.internal.InternalSearchResultEntry;
+import org.apache.directory.shared.ldap.message.internal.AddResponse;
+import org.apache.directory.shared.ldap.message.internal.ModifyResponse;
+import org.apache.directory.shared.ldap.message.internal.Response;
+import org.apache.directory.shared.ldap.message.internal.SearchResultEntry;
import org.apache.directory.shared.ldap.name.DN;
import org.junit.After;
import org.junit.Before;
@@ -117,16 +117,16 @@ public class CollectiveAttributeServiceI
{
Map<String, Entry> resultMap = new HashMap<String, Entry>();
- Cursor<InternalResponse> cursor = connection.search( "ou=system", "(objectClass=*)", SearchScope.SUBTREE, "+",
+ Cursor<Response> cursor = connection.search( "ou=system", "(objectClass=*)", SearchScope.SUBTREE, "+",
"*" );
while ( cursor.next() )
{
- InternalResponse result = cursor.get();
+ Response result = cursor.get();
- if ( result instanceof InternalSearchResultEntry )
+ if ( result instanceof SearchResultEntry )
{
- Entry entry = ( ( InternalSearchResultEntry ) result ).getEntry();
+ Entry entry = ( ( SearchResultEntry ) result ).getEntry();
resultMap.put( entry.getDn().getName(), entry );
}
}
@@ -139,15 +139,15 @@ public class CollectiveAttributeServiceI
{
Map<String, Entry> resultMap = new HashMap<String, Entry>();
- Cursor<InternalResponse> cursor = connection.search( "ou=system", "(objectClass=*)", SearchScope.SUBTREE, "cn" );
+ Cursor<Response> cursor = connection.search( "ou=system", "(objectClass=*)", SearchScope.SUBTREE, "cn" );
while ( cursor.next() )
{
- InternalResponse result = cursor.get();
+ Response result = cursor.get();
- if ( result instanceof InternalSearchResultEntry )
+ if ( result instanceof SearchResultEntry )
{
- Entry entry = ( ( InternalSearchResultEntry ) result ).getEntry();
+ Entry entry = ( ( SearchResultEntry ) result ).getEntry();
resultMap.put( entry.getDn().getName(), entry );
}
}
@@ -160,16 +160,16 @@ public class CollectiveAttributeServiceI
{
Map<String, Entry> resultMap = new HashMap<String, Entry>();
- Cursor<InternalResponse> cursor = connection.search( "ou=system", "(objectClass=*)", SearchScope.SUBTREE,
+ Cursor<Response> cursor = connection.search( "ou=system", "(objectClass=*)", SearchScope.SUBTREE,
"c-ou", "c-st" );
while ( cursor.next() )
{
- InternalResponse result = cursor.get();
+ Response result = cursor.get();
- if ( result instanceof InternalSearchResultEntry )
+ if ( result instanceof SearchResultEntry )
{
- Entry entry = ( ( InternalSearchResultEntry ) result ).getEntry();
+ Entry entry = ( ( SearchResultEntry ) result ).getEntry();
resultMap.put( entry.getDn().getName(), entry );
}
}
@@ -206,8 +206,8 @@ public class CollectiveAttributeServiceI
// test an entry that should show the collective attribute c-ou
// -------------------------------------------------------------------
- InternalResponse response = connection.lookup( "ou=services,ou=configuration,ou=system" );
- Entry entry = ( ( InternalSearchResultEntry ) response ).getEntry();
+ Response response = connection.lookup( "ou=services,ou=configuration,ou=system" );
+ Entry entry = ( ( SearchResultEntry ) response ).getEntry();
EntryAttribute c_ou = entry.get( "c-ou" );
assertNotNull( "a collective c-ou attribute should be present", c_ou );
assertEquals( "configuration", c_ou.getString() );
@@ -217,7 +217,7 @@ public class CollectiveAttributeServiceI
// -------------------------------------------------------------------
response = connection.lookup( "ou=users,ou=system" );
- entry = ( ( InternalSearchResultEntry ) response ).getEntry();
+ entry = ( ( SearchResultEntry ) response ).getEntry();
c_ou = entry.get( "c-ou" );
assertNull( "the c-ou collective attribute should not be present", c_ou );
@@ -230,7 +230,7 @@ public class CollectiveAttributeServiceI
// entry should not show the c-ou collective attribute anymore
response = connection.lookup( "ou=services,ou=configuration,ou=system" );
- entry = ( ( InternalSearchResultEntry ) response ).getEntry();
+ entry = ( ( SearchResultEntry ) response ).getEntry();
c_ou = entry.get( "c-ou" );
if ( c_ou != null )
@@ -243,7 +243,7 @@ public class CollectiveAttributeServiceI
connection.add( subentry2 );
response = connection.lookup( "ou=services,ou=configuration,ou=system" );
- entry = ( ( InternalSearchResultEntry ) response ).getEntry();
+ entry = ( ( SearchResultEntry ) response ).getEntry();
c_ou = entry.get( "c-ou" );
if ( c_ou != null )
@@ -253,7 +253,7 @@ public class CollectiveAttributeServiceI
// entries without the collectiveExclusion should still show both values of c-ou
response = connection.lookup( "ou=interceptors,ou=configuration,ou=system" );
- entry = ( ( InternalSearchResultEntry ) response ).getEntry();
+ entry = ( ( SearchResultEntry ) response ).getEntry();
c_ou = entry.get( "c-ou" );
assertNotNull( "a collective c-ou attribute should be present", c_ou );
@@ -262,7 +262,7 @@ public class CollectiveAttributeServiceI
// request the collective attribute specifically
response = connection.lookup( "ou=interceptors,ou=configuration,ou=system", "c-ou" );
- entry = ( ( InternalSearchResultEntry ) response ).getEntry();
+ entry = ( ( SearchResultEntry ) response ).getEntry();
c_ou = entry.get( "c-ou" );
assertNotNull( "a collective c-ou attribute should be present", c_ou );
@@ -271,7 +271,7 @@ public class CollectiveAttributeServiceI
// unspecify the collective attribute in the returning attribute list
response = connection.lookup( "ou=interceptors,ou=configuration,ou=system", "objectClass" );
- entry = ( ( InternalSearchResultEntry ) response ).getEntry();
+ entry = ( ( SearchResultEntry ) response ).getEntry();
c_ou = entry.get( "c-ou" );
assertNull( "a collective c-ou attribute should not be present", c_ou );
@@ -283,7 +283,7 @@ public class CollectiveAttributeServiceI
// the new attribute c-st should appear in the node with the c-ou exclusion
response = connection.lookup( "ou=services,ou=configuration,ou=system" );
- entry = ( ( InternalSearchResultEntry ) response ).getEntry();
+ entry = ( ( SearchResultEntry ) response ).getEntry();
EntryAttribute c_st = entry.get( "c-st" );
assertNotNull( "a collective c-st attribute should be present", c_st );
@@ -291,7 +291,7 @@ public class CollectiveAttributeServiceI
// in node without exclusions both values of c-ou should appear with c-st value
response = connection.lookup( "ou=interceptors,ou=configuration,ou=system" );
- entry = ( ( InternalSearchResultEntry ) response ).getEntry();
+ entry = ( ( SearchResultEntry ) response ).getEntry();
c_ou = entry.get( "c-ou" );
assertNotNull( "a collective c-ou attribute should be present", c_ou );
@@ -311,7 +311,7 @@ public class CollectiveAttributeServiceI
// none of the attributes should appear any longer
response = connection.lookup( "ou=interceptors,ou=configuration,ou=system" );
- entry = ( ( InternalSearchResultEntry ) response ).getEntry();
+ entry = ( ( SearchResultEntry ) response ).getEntry();
c_ou = entry.get( "c-ou" );
if ( c_ou != null )
@@ -349,12 +349,12 @@ public class CollectiveAttributeServiceI
// -------------------------------------------------------------------
// Test searching for subtypes
// -------------------------------------------------------------------
- Cursor<InternalResponse> responses = connection.search( "ou=services,ou=configuration,ou=system",
+ Cursor<Response> responses = connection.search( "ou=services,ou=configuration,ou=system",
"(ObjectClass=*)", SearchScope.OBJECT, "ou" );
while ( responses.next() )
{
- InternalSearchResultEntry resultEntry = ( InternalSearchResultEntry ) responses.get();
+ SearchResultEntry resultEntry = ( SearchResultEntry ) responses.get();
entry = resultEntry.getEntry();
assertEquals( 2, entry.size() );
@@ -491,7 +491,7 @@ public class CollectiveAttributeServiceI
Entry entry = getTestEntry( "cn=Ersin Er,ou=system", "Ersin Er" );
entry.put( "c-l", "Turkiye" );
- InternalAddResponse response = connection.add( entry );
+ AddResponse response = connection.add( entry );
assertEquals( ResultCodeEnum.OBJECT_CLASS_VIOLATION, response.getLdapResult().getResultCode() );
}
@@ -503,7 +503,7 @@ public class CollectiveAttributeServiceI
Entry entry = getTestEntry( "cn=Ersin Er,ou=system", "Ersin Er" );
connection.add( entry );
- InternalModifyResponse response = connection.modify( "cn=Ersin Er,ou=system", new DefaultModification(
+ ModifyResponse response = connection.modify( "cn=Ersin Er,ou=system", new DefaultModification(
ModificationOperation.ADD_ATTRIBUTE, new DefaultEntryAttribute( "c-l", "Turkiye" ) ) );
assertEquals( ResultCodeEnum.OBJECT_CLASS_VIOLATION, response.getLdapResult().getResultCode() );
@@ -521,9 +521,9 @@ public class CollectiveAttributeServiceI
connection.add( subentry );
// request the collective attribute's super type specifically
- InternalResponse response = connection.lookup( "ou=interceptors,ou=configuration,ou=system", "ou" );
+ Response response = connection.lookup( "ou=interceptors,ou=configuration,ou=system", "ou" );
- Entry entry = ( ( InternalSearchResultEntry ) response ).getEntry();
+ Entry entry = ( ( SearchResultEntry ) response ).getEntry();
EntryAttribute c_ou = entry.get( "c-ou" );
assertNotNull( "a collective c-ou attribute should be present", c_ou );
Modified: directory/apacheds/branches/apacheds-codec-merge/core-integ/src/test/java/org/apache/directory/server/core/exception/ExceptionServiceIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-codec-merge/core-integ/src/test/java/org/apache/directory/server/core/exception/ExceptionServiceIT.java?rev=985495&r1=985494&r2=985495&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-codec-merge/core-integ/src/test/java/org/apache/directory/server/core/exception/ExceptionServiceIT.java (original)
+++ directory/apacheds/branches/apacheds-codec-merge/core-integ/src/test/java/org/apache/directory/server/core/exception/ExceptionServiceIT.java Sat Aug 14 14:18:49 2010
@@ -41,12 +41,12 @@ import org.apache.directory.shared.ldap.
import org.apache.directory.shared.ldap.entry.EntryAttribute;
import org.apache.directory.shared.ldap.filter.SearchScope;
import org.apache.directory.shared.ldap.message.ResultCodeEnum;
-import org.apache.directory.shared.ldap.message.internal.InternalAddResponse;
-import org.apache.directory.shared.ldap.message.internal.InternalDeleteResponse;
-import org.apache.directory.shared.ldap.message.internal.InternalModifyDnResponse;
-import org.apache.directory.shared.ldap.message.internal.InternalModifyResponse;
-import org.apache.directory.shared.ldap.message.internal.InternalResponse;
-import org.apache.directory.shared.ldap.message.internal.InternalSearchResultEntry;
+import org.apache.directory.shared.ldap.message.internal.AddResponse;
+import org.apache.directory.shared.ldap.message.internal.DeleteResponse;
+import org.apache.directory.shared.ldap.message.internal.ModifyDnResponse;
+import org.apache.directory.shared.ldap.message.internal.ModifyResponse;
+import org.apache.directory.shared.ldap.message.internal.Response;
+import org.apache.directory.shared.ldap.message.internal.SearchResultEntry;
import org.apache.directory.shared.ldap.name.DN;
import org.apache.directory.shared.ldap.name.RDN;
import org.junit.After;
@@ -64,13 +64,13 @@ import org.junit.runner.RunWith;
public class ExceptionServiceIT extends AbstractLdapTestUnit
{
- private InternalAddResponse createSubContext( String type, String value ) throws Exception
+ private AddResponse createSubContext( String type, String value ) throws Exception
{
return createSubContext( new DN( ServerDNConstants.SYSTEM_DN ), type, value );
}
- private InternalAddResponse createSubContext( DN parent, String type, String value ) throws Exception
+ private AddResponse createSubContext( DN parent, String type, String value ) throws Exception
{
DN dn = parent;
dn = dn.add( "ou=" + value );
@@ -80,7 +80,7 @@ public class ExceptionServiceIT extends
entry.add( SchemaConstants.CN_AT, value );
entry.add( SchemaConstants.SN_AT, value );
- InternalAddResponse resp = getAdminConnection( service ).add( entry );
+ AddResponse resp = getAdminConnection( service ).add( entry );
return resp;
}
@@ -105,7 +105,7 @@ public class ExceptionServiceIT extends
@Test
public void testFailSearchNoSuchObject() throws Exception
{
- Cursor<InternalResponse> cursor = getAdminConnection( service ).search( "ou=blah", "(objectClass=*)",
+ Cursor<Response> cursor = getAdminConnection( service ).search( "ou=blah", "(objectClass=*)",
SearchScope.ONELEVEL, "*" );
assertFalse( cursor.next() );
}
@@ -120,7 +120,7 @@ public class ExceptionServiceIT extends
@Test
public void testSearchControl() throws Exception
{
- Cursor<InternalResponse> cursor = getAdminConnection( service ).search( "ou=users,ou=system",
+ Cursor<Response> cursor = getAdminConnection( service ).search( "ou=users,ou=system",
"(objectClass=*)", SearchScope.ONELEVEL, "*" );
assertFalse( cursor.next() );
@@ -146,7 +146,7 @@ public class ExceptionServiceIT extends
entry.add( SchemaConstants.OU_AT, "users" );
connection.add( entry );
- InternalModifyDnResponse resp = connection.rename( entry.getDn(), new RDN( "ou=users" ) );
+ ModifyDnResponse resp = connection.rename( entry.getDn(), new RDN( "ou=users" ) );
assertEquals( ResultCodeEnum.ENTRY_ALREADY_EXISTS, resp.getLdapResult().getResultCode() );
Entry userzEntry = new DefaultEntry( new DN( "ou=userz,ou=groups,ou=system" ) );
@@ -155,7 +155,7 @@ public class ExceptionServiceIT extends
connection.add( userzEntry );
- InternalModifyDnResponse modResp = connection.rename( "ou=userz,ou=groups,ou=system", "ou=users", true );
+ ModifyDnResponse modResp = connection.rename( "ou=userz,ou=groups,ou=system", "ou=users", true );
assertEquals( ResultCodeEnum.ENTRY_ALREADY_EXISTS, modResp.getLdapResult().getResultCode() );
}
@@ -170,7 +170,7 @@ public class ExceptionServiceIT extends
{
LdapConnection connection = getAdminConnection( service );
- InternalModifyDnResponse resp = connection.rename( "ou=blah,ou=groups,ou=system", "ou=blah1" );
+ ModifyDnResponse resp = connection.rename( "ou=blah,ou=groups,ou=system", "ou=blah1" );
assertEquals( ResultCodeEnum.NO_SUCH_OBJECT, resp.getLdapResult().getResultCode() );
resp = connection.rename( "ou=blah,ou=groups,ou=system", "ou=blah1" );
@@ -190,10 +190,10 @@ public class ExceptionServiceIT extends
LdapConnection connection = getAdminConnection( service );
connection.move( "ou=users,ou=system", "ou=groups,ou=system" );
- Entry entry = ( ( InternalSearchResultEntry ) connection.lookup( "ou=users,ou=groups,ou=system" ) ).getEntry();
+ Entry entry = ( ( SearchResultEntry ) connection.lookup( "ou=users,ou=groups,ou=system" ) ).getEntry();
assertNotNull( entry );
- InternalResponse res = connection.lookup( "ou=users,ou=system" );
+ Response res = connection.lookup( "ou=users,ou=system" );
assertNull( res );
}
@@ -212,7 +212,7 @@ public class ExceptionServiceIT extends
{
LdapConnection connection = getAdminConnection( service );
- InternalModifyDnResponse resp = connection.rename( "ou=users,ou=system", "ou=groups" );
+ ModifyDnResponse resp = connection.rename( "ou=users,ou=system", "ou=groups" );
assertEquals( ResultCodeEnum.ENTRY_ALREADY_EXISTS, resp.getLdapResult().getResultCode() );
}
@@ -227,7 +227,7 @@ public class ExceptionServiceIT extends
{
LdapConnection connection = getAdminConnection( service );
- InternalModifyDnResponse resp = connection.rename( "ou=blah,ou=system", "ou=asdf" );
+ ModifyDnResponse resp = connection.rename( "ou=blah,ou=system", "ou=asdf" );
assertEquals( ResultCodeEnum.NO_SUCH_OBJECT, resp.getLdapResult().getResultCode() );
}
@@ -267,7 +267,7 @@ public class ExceptionServiceIT extends
ModifyRequest modReq = new ModifyRequest( new DN( "ou=blah,ou=system" ) );
modReq.add( SchemaConstants.OU_AT, "another-value" );
- InternalModifyResponse modResp = connection.modify( modReq );
+ ModifyResponse modResp = connection.modify( modReq );
assertEquals( ResultCodeEnum.NO_SUCH_OBJECT, modResp.getLdapResult().getResultCode() );
}
@@ -287,7 +287,7 @@ public class ExceptionServiceIT extends
modReq.add( SchemaConstants.OU_AT, "dummyValue" );
connection.modify( modReq );
- Entry entry = ( ( InternalSearchResultEntry ) connection.lookup( "ou=users,ou=system" ) ).getEntry();
+ Entry entry = ( ( SearchResultEntry ) connection.lookup( "ou=users,ou=system" ) ).getEntry();
EntryAttribute ou = entry.get( "ou" );
assertTrue( ou.contains( "users" ) );
assertTrue( ou.contains( "dummyValue" ) );
@@ -323,7 +323,7 @@ public class ExceptionServiceIT extends
{
LdapConnection connection = getAdminConnection( service );
- Entry entry = ( ( InternalSearchResultEntry ) connection.lookup( "ou=users,ou=system" ) ).getEntry();
+ Entry entry = ( ( SearchResultEntry ) connection.lookup( "ou=users,ou=system" ) ).getEntry();
assertNotNull( entry );
assertEquals( "users", entry.get( "ou" ).getString() );
}
@@ -404,7 +404,7 @@ public class ExceptionServiceIT extends
aliasChild.add( SchemaConstants.OBJECT_CLASS_AT, "organizationalUnit" );
aliasChild.add( SchemaConstants.OU_AT, "blah" );
- InternalAddResponse resp = connection.add( aliasChild );
+ AddResponse resp = connection.add( aliasChild );
assertEquals( ResultCodeEnum.ALIAS_PROBLEM, resp.getLdapResult().getResultCode() );
}
@@ -419,7 +419,7 @@ public class ExceptionServiceIT extends
{
createSubContext( "ou", "blah" );
- InternalAddResponse resp = createSubContext( "ou", "blah" );
+ AddResponse resp = createSubContext( "ou", "blah" );
assertEquals( ResultCodeEnum.ENTRY_ALREADY_EXISTS, resp.getLdapResult().getResultCode() );
}
@@ -434,9 +434,9 @@ public class ExceptionServiceIT extends
{
LdapConnection connection = getAdminConnection( service );
- InternalAddResponse resp = createSubContext( "ou", "blah" );
+ AddResponse resp = createSubContext( "ou", "blah" );
resp = createSubContext( new DN( "ou=blah,ou=system" ), "ou", "subctx" );
- Entry entry = ( ( InternalSearchResultEntry ) connection.lookup( "ou=subctx,ou=blah,ou=system" ) ).getEntry();
+ Entry entry = ( ( SearchResultEntry ) connection.lookup( "ou=subctx,ou=blah,ou=system" ) ).getEntry();
assertNotNull( entry );
}
@@ -455,10 +455,10 @@ public class ExceptionServiceIT extends
{
LdapConnection connection = getAdminConnection( service );
- InternalAddResponse resp = createSubContext( "ou", "blah" );
+ AddResponse resp = createSubContext( "ou", "blah" );
resp = createSubContext( new DN( "ou=blah,ou=system" ), "ou", "subctx" );
- InternalDeleteResponse delResp = connection.delete( "ou=blah,ou=system" );
+ DeleteResponse delResp = connection.delete( "ou=blah,ou=system" );
assertEquals( ResultCodeEnum.NOT_ALLOWED_ON_NON_LEAF, delResp.getLdapResult().getResultCode() );
}
@@ -474,7 +474,7 @@ public class ExceptionServiceIT extends
{
LdapConnection connection = getAdminConnection( service );
- InternalDeleteResponse delResp = connection.delete( "ou=blah,ou=system" );
+ DeleteResponse delResp = connection.delete( "ou=blah,ou=system" );
assertEquals( ResultCodeEnum.NO_SUCH_OBJECT, delResp.getLdapResult().getResultCode() );
}
@@ -489,9 +489,9 @@ public class ExceptionServiceIT extends
{
LdapConnection connection = getAdminConnection( service );
- InternalAddResponse resp = createSubContext( "ou", "blah" );
+ AddResponse resp = createSubContext( "ou", "blah" );
- Entry entry = ( ( InternalSearchResultEntry ) connection.lookup( "ou=blah,ou=system" ) ).getEntry();
+ Entry entry = ( ( SearchResultEntry ) connection.lookup( "ou=blah,ou=system" ) ).getEntry();
assertNotNull( entry );
connection.delete( entry.getDn() );
Modified: directory/apacheds/branches/apacheds-codec-merge/core-integ/src/test/java/org/apache/directory/server/core/operational/OperationalAttributeServiceIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-codec-merge/core-integ/src/test/java/org/apache/directory/server/core/operational/OperationalAttributeServiceIT.java?rev=985495&r1=985494&r2=985495&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-codec-merge/core-integ/src/test/java/org/apache/directory/server/core/operational/OperationalAttributeServiceIT.java (original)
+++ directory/apacheds/branches/apacheds-codec-merge/core-integ/src/test/java/org/apache/directory/server/core/operational/OperationalAttributeServiceIT.java Sat Aug 14 14:18:49 2010
@@ -44,9 +44,9 @@ import org.apache.directory.shared.ldap.
import org.apache.directory.shared.ldap.filter.SearchScope;
import org.apache.directory.shared.ldap.ldif.LdifUtils;
import org.apache.directory.shared.ldap.message.ResultCodeEnum;
-import org.apache.directory.shared.ldap.message.internal.InternalModifyResponse;
-import org.apache.directory.shared.ldap.message.internal.InternalResponse;
-import org.apache.directory.shared.ldap.message.internal.InternalSearchResultEntry;
+import org.apache.directory.shared.ldap.message.internal.ModifyResponse;
+import org.apache.directory.shared.ldap.message.internal.Response;
+import org.apache.directory.shared.ldap.message.internal.SearchResultEntry;
import org.apache.directory.shared.ldap.name.DN;
import org.apache.directory.shared.ldap.util.StringTools;
import org.junit.After;
@@ -97,7 +97,7 @@ public class OperationalAttributeService
connection.add( entry );
// test without turning on the property
- InternalSearchResultEntry response = ( InternalSearchResultEntry ) connection.lookup( "ou=test,ou=system" );
+ SearchResultEntry response = ( SearchResultEntry ) connection.lookup( "ou=test,ou=system" );
Entry result = response.getEntry();
EntryAttribute ou = result.get( "ou" );
Object value = ou.getString();
@@ -111,7 +111,7 @@ public class OperationalAttributeService
entry.setDn( new DN( "ou=anothertest,ou=system" ) );
entry.set( "ou", "anothertest" );
connection.add( entry );
- response = ( InternalSearchResultEntry ) connection.lookup( "ou=anothertest,ou=system" );
+ response = ( SearchResultEntry ) connection.lookup( "ou=anothertest,ou=system" );
ou = response.getEntry().get( "ou" );
value = ou.getString();
assertEquals( "anothertest", value );
@@ -134,7 +134,7 @@ public class OperationalAttributeService
connection.add( entry );
- InternalSearchResultEntry response = ( InternalSearchResultEntry ) connection.lookup( "ou=testing00,ou=system" );
+ SearchResultEntry response = ( SearchResultEntry ) connection.lookup( "ou=testing00,ou=system" );
assertNotNull( response );
entry = response.getEntry();
@@ -147,10 +147,10 @@ public class OperationalAttributeService
assertNull( entry.get( "createTimestamp" ) );
assertNull( entry.get( "creatorsName" ) );
- Cursor<InternalResponse> responses = connection.search( "ou=testing00,ou=system", "(ou=testing00)",
+ Cursor<Response> responses = connection.search( "ou=testing00,ou=system", "(ou=testing00)",
SearchScope.SUBTREE, "ou", "createTimestamp", "creatorsName" );
responses.next();
- InternalSearchResultEntry result = ( InternalSearchResultEntry ) responses.get();
+ SearchResultEntry result = ( SearchResultEntry ) responses.get();
assertNotNull( result.getEntry().get( "ou" ) );
assertNotNull( result.getEntry().get( "creatorsName" ) );
@@ -173,10 +173,10 @@ public class OperationalAttributeService
@Test
public void testSystemContextRoot() throws Exception
{
- Cursor<InternalResponse> responses = connection
+ Cursor<Response> responses = connection
.search( "ou=system", "(objectClass=*)", SearchScope.OBJECT, "*" );
responses.next();
- InternalSearchResultEntry result = ( InternalSearchResultEntry ) responses.get();
+ SearchResultEntry result = ( SearchResultEntry ) responses.get();
// test to make sure op attribute do not occur - this is the control
Entry entry = result.getEntry();
@@ -187,7 +187,7 @@ public class OperationalAttributeService
responses = connection.search( "ou=system", "(objectClass=*)", SearchScope.OBJECT, "creatorsName",
"createTimestamp" );
responses.next();
- result = ( InternalSearchResultEntry ) responses.get();
+ result = ( SearchResultEntry ) responses.get();
entry = result.getEntry();
assertNotNull( entry.get( "creatorsName" ) );
@@ -222,7 +222,7 @@ public class OperationalAttributeService
connection.add( entry );
- InternalSearchResultEntry response = ( InternalSearchResultEntry ) connection.lookup(
+ SearchResultEntry response = ( SearchResultEntry ) connection.lookup(
"uid=akarasulu,ou=users,ou=system", "creatorsName" );
Entry result = response.getEntry();
@@ -243,10 +243,10 @@ public class OperationalAttributeService
connection.modify( DN_KATE_BUSH, modifyOp );
- Cursor<InternalResponse> responses = connection.search( DN_KATE_BUSH, "(objectClass=*)", SearchScope.OBJECT,
+ Cursor<Response> responses = connection.search( DN_KATE_BUSH, "(objectClass=*)", SearchScope.OBJECT,
"modifiersName", "modifyTimestamp" );
responses.next();
- InternalSearchResultEntry result = ( InternalSearchResultEntry ) responses.get();
+ SearchResultEntry result = ( SearchResultEntry ) responses.get();
assertNotNull( result.getEntry().get( "modifiersName" ) );
assertNotNull( result.getEntry().get( "modifyTimestamp" ) );
@@ -269,10 +269,10 @@ public class OperationalAttributeService
connection.modify( DN_KATE_BUSH, modifyAddOp );
// Determine modifyTimestamp
- Cursor<InternalResponse> responses = connection.search( DN_KATE_BUSH, "(objectClass=*)", SearchScope.OBJECT,
+ Cursor<Response> responses = connection.search( DN_KATE_BUSH, "(objectClass=*)", SearchScope.OBJECT,
"modifyTimestamp" );
responses.next();
- InternalSearchResultEntry result = ( InternalSearchResultEntry ) responses.get();
+ SearchResultEntry result = ( SearchResultEntry ) responses.get();
EntryAttribute modifyTimestamp = result.getEntry().get( "modifyTimestamp" );
assertNotNull( modifyTimestamp );
@@ -290,7 +290,7 @@ public class OperationalAttributeService
// Determine modifyTimestamp after modification
responses = connection.search( DN_KATE_BUSH, "(objectClass=*)", SearchScope.OBJECT, "modifyTimestamp" );
responses.next();
- result = ( InternalSearchResultEntry ) responses.get();
+ result = ( SearchResultEntry ) responses.get();
modifyTimestamp = result.getEntry().get( "modifyTimestamp" );
assertNotNull( modifyTimestamp );
@@ -327,7 +327,7 @@ public class OperationalAttributeService
Modification modifyOp = new DefaultModification( ModificationOperation.REMOVE_ATTRIBUTE,
new DefaultEntryAttribute( "creatorsName" ) );
- InternalModifyResponse response = connection.modify( DN_KATE_BUSH, modifyOp );
+ ModifyResponse response = connection.modify( DN_KATE_BUSH, modifyOp );
assertEquals( ResultCodeEnum.INSUFFICIENT_ACCESS_RIGHTS, response.getLdapResult().getResultCode() );
}
@@ -344,7 +344,7 @@ public class OperationalAttributeService
Modification modifyOp = new DefaultModification( ModificationOperation.REPLACE_ATTRIBUTE,
new DefaultEntryAttribute( "creatorsName", "cn=Tori Amos,dc=example,dc=com" ) );
- InternalModifyResponse response = connection.modify( DN_KATE_BUSH, modifyOp );
+ ModifyResponse response = connection.modify( DN_KATE_BUSH, modifyOp );
assertEquals( ResultCodeEnum.INSUFFICIENT_ACCESS_RIGHTS, response.getLdapResult().getResultCode() );
}
Modified: directory/apacheds/branches/apacheds-codec-merge/core-integ/src/test/java/org/apache/directory/server/core/operations/bind/SimpleBindIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-codec-merge/core-integ/src/test/java/org/apache/directory/server/core/operations/bind/SimpleBindIT.java?rev=985495&r1=985494&r2=985495&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-codec-merge/core-integ/src/test/java/org/apache/directory/server/core/operations/bind/SimpleBindIT.java (original)
+++ directory/apacheds/branches/apacheds-codec-merge/core-integ/src/test/java/org/apache/directory/server/core/operations/bind/SimpleBindIT.java Sat Aug 14 14:18:49 2010
@@ -49,7 +49,7 @@ import org.apache.directory.server.core.
import org.apache.directory.shared.ldap.constants.JndiPropertyConstants;
import org.apache.directory.shared.ldap.message.AliasDerefMode;
import org.apache.directory.shared.ldap.message.ResultCodeEnum;
-import org.apache.directory.shared.ldap.message.internal.InternalBindResponse;
+import org.apache.directory.shared.ldap.message.internal.BindResponse;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -373,7 +373,7 @@ public class SimpleBindIT extends Abstra
connection = IntegrationUtils.getConnectionAs( service, "uid=admin,ou=system", "secret" );
- InternalBindResponse bindResp = connection.bind( "uid=admin,ou=system", null );
+ BindResponse bindResp = connection.bind( "uid=admin,ou=system", null );
assertEquals( ResultCodeEnum.UNWILLING_TO_PERFORM, bindResp.getLdapResult().getResultCode() );
}
Modified: directory/apacheds/branches/apacheds-codec-merge/core-integ/src/test/java/org/apache/directory/server/core/operations/compare/ComparePerfIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-codec-merge/core-integ/src/test/java/org/apache/directory/server/core/operations/compare/ComparePerfIT.java?rev=985495&r1=985494&r2=985495&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-codec-merge/core-integ/src/test/java/org/apache/directory/server/core/operations/compare/ComparePerfIT.java (original)
+++ directory/apacheds/branches/apacheds-codec-merge/core-integ/src/test/java/org/apache/directory/server/core/operations/compare/ComparePerfIT.java Sat Aug 14 14:18:49 2010
@@ -30,7 +30,7 @@ import org.apache.directory.server.core.
import org.apache.directory.server.core.integ.IntegrationUtils;
import org.apache.directory.shared.ldap.entry.DefaultEntry;
import org.apache.directory.shared.ldap.entry.Entry;
-import org.apache.directory.shared.ldap.message.internal.InternalCompareResponse;
+import org.apache.directory.shared.ldap.message.internal.CompareResponse;
import org.apache.directory.shared.ldap.name.DN;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -87,7 +87,7 @@ public class ComparePerfIT extends Abstr
t00 = System.currentTimeMillis();
}
- InternalCompareResponse response = connection.compare( dn, "sn", "TEST" );
+ CompareResponse response = connection.compare( dn, "sn", "TEST" );
//assertEquals( ResultCodeEnum.COMPARE_TRUE, response.getLdapResult().getResultCode() );
}
Modified: directory/apacheds/branches/apacheds-codec-merge/core-integ/src/test/java/org/apache/directory/server/core/operations/lookup/LookupIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-codec-merge/core-integ/src/test/java/org/apache/directory/server/core/operations/lookup/LookupIT.java?rev=985495&r1=985494&r2=985495&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-codec-merge/core-integ/src/test/java/org/apache/directory/server/core/operations/lookup/LookupIT.java (original)
+++ directory/apacheds/branches/apacheds-codec-merge/core-integ/src/test/java/org/apache/directory/server/core/operations/lookup/LookupIT.java Sat Aug 14 14:18:49 2010
@@ -31,7 +31,7 @@ import org.apache.directory.server.core.
import org.apache.directory.server.core.integ.FrameworkRunner;
import org.apache.directory.server.core.integ.IntegrationUtils;
import org.apache.directory.shared.ldap.entry.Entry;
-import org.apache.directory.shared.ldap.message.internal.InternalSearchResultEntry;
+import org.apache.directory.shared.ldap.message.internal.SearchResultEntry;
import org.junit.After;
import org.junit.Before;
import org.junit.Ignore;
@@ -75,7 +75,7 @@ public class LookupIT extends AbstractLd
@Test
public void testLookupStar() throws Exception
{
- InternalSearchResultEntry result = ( InternalSearchResultEntry ) connection.lookup( "cn=test,ou=system", "*" );
+ SearchResultEntry result = ( SearchResultEntry ) connection.lookup( "cn=test,ou=system", "*" );
Entry entry = result.getEntry();
assertNotNull( entry );
@@ -98,7 +98,7 @@ public class LookupIT extends AbstractLd
public void testLookupPlus() throws Exception
{
service.setDenormalizeOpAttrsEnabled( true );
- InternalSearchResultEntry result = ( InternalSearchResultEntry ) connection.lookup( "cn=test,ou=system", "+" );
+ SearchResultEntry result = ( SearchResultEntry ) connection.lookup( "cn=test,ou=system", "+" );
Entry entry = result.getEntry();
assertNotNull( entry );
@@ -125,7 +125,7 @@ public class LookupIT extends AbstractLd
@Test
public void testLookupEmptyAtrid() throws Exception
{
- InternalSearchResultEntry result = ( InternalSearchResultEntry ) connection.lookup( "cn=test,ou=system",
+ SearchResultEntry result = ( SearchResultEntry ) connection.lookup( "cn=test,ou=system",
( String[] ) null );
Entry entry = result.getEntry();
@@ -147,7 +147,7 @@ public class LookupIT extends AbstractLd
@Test
public void testLookup() throws Exception
{
- InternalSearchResultEntry result = ( InternalSearchResultEntry ) connection.lookup( "cn=test,ou=system" );
+ SearchResultEntry result = ( SearchResultEntry ) connection.lookup( "cn=test,ou=system" );
Entry entry = result.getEntry();
assertNotNull( entry );
@@ -169,7 +169,7 @@ public class LookupIT extends AbstractLd
@Ignore
public void testLookupWithAttrs() throws Exception
{
- InternalSearchResultEntry result = ( InternalSearchResultEntry ) connection
+ SearchResultEntry result = ( SearchResultEntry ) connection
.lookup( "cn=test,ou=system", "name" );
Entry entry = result.getEntry();
Modified: directory/apacheds/branches/apacheds-codec-merge/core-integ/src/test/java/org/apache/directory/server/core/operations/lookup/LookupPerfIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-codec-merge/core-integ/src/test/java/org/apache/directory/server/core/operations/lookup/LookupPerfIT.java?rev=985495&r1=985494&r2=985495&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-codec-merge/core-integ/src/test/java/org/apache/directory/server/core/operations/lookup/LookupPerfIT.java (original)
+++ directory/apacheds/branches/apacheds-codec-merge/core-integ/src/test/java/org/apache/directory/server/core/operations/lookup/LookupPerfIT.java Sat Aug 14 14:18:49 2010
@@ -31,8 +31,8 @@ import org.apache.directory.server.core.
import org.apache.directory.server.core.integ.FrameworkRunner;
import org.apache.directory.server.core.integ.IntegrationUtils;
import org.apache.directory.shared.ldap.entry.Entry;
-import org.apache.directory.shared.ldap.message.internal.InternalResponse;
-import org.apache.directory.shared.ldap.message.internal.InternalSearchResultEntry;
+import org.apache.directory.shared.ldap.message.internal.Response;
+import org.apache.directory.shared.ldap.message.internal.SearchResultEntry;
import org.apache.directory.shared.ldap.name.DN;
import org.junit.Before;
import org.junit.Ignore;
@@ -61,12 +61,12 @@ public class LookupPerfIT extends Abstra
{
LdapConnection connection = IntegrationUtils.getAdminConnection( service );
- InternalResponse response = connection.lookup( "cn=test,ou=system", "+" );
+ Response response = connection.lookup( "cn=test,ou=system", "+" );
assertNotNull( response );
- assertTrue( response instanceof InternalSearchResultEntry );
+ assertTrue( response instanceof SearchResultEntry );
- InternalSearchResultEntry result = ( InternalSearchResultEntry ) response;
+ SearchResultEntry result = ( SearchResultEntry ) response;
assertNotNull( result );
@@ -131,12 +131,12 @@ public class LookupPerfIT extends Abstra
+ " grantsAndDenials { grantRead, grantReturnDN, grantBrowse } " + " } " + " } " + " } "
+ "}" );
- InternalResponse response = connection.lookup( "cn=test,ou=system", "+" );
+ Response response = connection.lookup( "cn=test,ou=system", "+" );
assertNotNull( response );
- assertTrue( response instanceof InternalSearchResultEntry );
+ assertTrue( response instanceof SearchResultEntry );
- InternalSearchResultEntry result = ( InternalSearchResultEntry ) response;
+ SearchResultEntry result = ( SearchResultEntry ) response;
assertNotNull( result );
Modified: directory/apacheds/branches/apacheds-codec-merge/core-integ/src/test/java/org/apache/directory/server/core/operations/moveAndRename/MoveAndRenamePerfIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-codec-merge/core-integ/src/test/java/org/apache/directory/server/core/operations/moveAndRename/MoveAndRenamePerfIT.java?rev=985495&r1=985494&r2=985495&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-codec-merge/core-integ/src/test/java/org/apache/directory/server/core/operations/moveAndRename/MoveAndRenamePerfIT.java (original)
+++ directory/apacheds/branches/apacheds-codec-merge/core-integ/src/test/java/org/apache/directory/server/core/operations/moveAndRename/MoveAndRenamePerfIT.java Sat Aug 14 14:18:49 2010
@@ -33,7 +33,7 @@ import org.apache.directory.server.core.
import org.apache.directory.server.core.integ.IntegrationUtils;
import org.apache.directory.shared.ldap.entry.DefaultEntry;
import org.apache.directory.shared.ldap.entry.Entry;
-import org.apache.directory.shared.ldap.message.internal.InternalResponse;
+import org.apache.directory.shared.ldap.message.internal.Response;
import org.apache.directory.shared.ldap.name.DN;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -95,8 +95,8 @@ public class MoveAndRenamePerfIT extends
connection.moveAndRename( oldDn, newDn );
- InternalResponse oldEntry = connection.lookup( oldDn.getName() );
- InternalResponse newEntry = connection.lookup( newDn.getName() );
+ Response oldEntry = connection.lookup( oldDn.getName() );
+ Response newEntry = connection.lookup( newDn.getName() );
assertNull( oldEntry );
assertNotNull( newEntry );
Modified: directory/apacheds/branches/apacheds-codec-merge/core-integ/src/test/java/org/apache/directory/server/core/operations/search/SearchBinaryIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-codec-merge/core-integ/src/test/java/org/apache/directory/server/core/operations/search/SearchBinaryIT.java?rev=985495&r1=985494&r2=985495&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-codec-merge/core-integ/src/test/java/org/apache/directory/server/core/operations/search/SearchBinaryIT.java (original)
+++ directory/apacheds/branches/apacheds-codec-merge/core-integ/src/test/java/org/apache/directory/server/core/operations/search/SearchBinaryIT.java Sat Aug 14 14:18:49 2010
@@ -33,7 +33,7 @@ import org.apache.directory.server.core.
import org.apache.directory.server.core.integ.IntegrationUtils;
import org.apache.directory.shared.ldap.cursor.Cursor;
import org.apache.directory.shared.ldap.filter.SearchScope;
-import org.apache.directory.shared.ldap.message.internal.InternalResponse;
+import org.apache.directory.shared.ldap.message.internal.Response;
import org.junit.Ignore;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -79,7 +79,7 @@ public class SearchBinaryIT extends Abst
LdapConnection connection = IntegrationUtils.getAdminConnection( service );
// Do a search with a filter based on certificate, get back all the entries
- Cursor<InternalResponse> responses = connection.search( "ou=system", "(userCertificate=*)",
+ Cursor<Response> responses = connection.search( "ou=system", "(userCertificate=*)",
SearchScope.SUBTREE, "*" );
int i = 0;
@@ -155,7 +155,7 @@ public class SearchBinaryIT extends Abst
LdapConnection connection = IntegrationUtils.getAdminConnection( service );
// Check that searching for an entry using a valid SUBSTR filter works
- Cursor<InternalResponse> responses = connection.search( "ou=system", "(binaryAttribute=\\01\\02*)",
+ Cursor<Response> responses = connection.search( "ou=system", "(binaryAttribute=\\01\\02*)",
SearchScope.SUBTREE, "*" );
int i = 0;
Modified: directory/apacheds/branches/apacheds-codec-merge/core-integ/src/test/java/org/apache/directory/server/core/operations/search/SearchIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-codec-merge/core-integ/src/test/java/org/apache/directory/server/core/operations/search/SearchIT.java?rev=985495&r1=985494&r2=985495&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-codec-merge/core-integ/src/test/java/org/apache/directory/server/core/operations/search/SearchIT.java (original)
+++ directory/apacheds/branches/apacheds-codec-merge/core-integ/src/test/java/org/apache/directory/server/core/operations/search/SearchIT.java Sat Aug 14 14:18:49 2010
@@ -66,8 +66,8 @@ import org.apache.directory.shared.ldap.
import org.apache.directory.shared.ldap.filter.SearchScope;
import org.apache.directory.shared.ldap.ldif.LdifUtils;
import org.apache.directory.shared.ldap.message.AliasDerefMode;
-import org.apache.directory.shared.ldap.message.internal.InternalResponse;
-import org.apache.directory.shared.ldap.message.internal.InternalSearchResultEntry;
+import org.apache.directory.shared.ldap.message.internal.Response;
+import org.apache.directory.shared.ldap.message.internal.SearchResultEntry;
import org.apache.directory.shared.ldap.name.DN;
import org.apache.directory.shared.ldap.schema.AttributeType;
import org.junit.Before;
@@ -1783,8 +1783,8 @@ public class SearchIT extends AbstractLd
connection.add( entry2 );
- entry = ( ( InternalSearchResultEntry ) connection.lookup( dn.getName(), "+" ) ).getEntry();
- entry2 = ( ( InternalSearchResultEntry ) connection.lookup( dn2.getName(), "+" ) ).getEntry();
+ entry = ( ( SearchResultEntry ) connection.lookup( dn.getName(), "+" ) ).getEntry();
+ entry2 = ( ( SearchResultEntry ) connection.lookup( dn2.getName(), "+" ) ).getEntry();
String lowerCsn = entry.get( SchemaConstants.ENTRY_CSN_AT ).getString();
String higherCsn = entry2.get( SchemaConstants.ENTRY_CSN_AT ).getString();
@@ -1827,11 +1827,11 @@ public class SearchIT extends AbstractLd
Entry loadedEntry = null;
Set<String> csnSet = new HashSet<String>( expectedCsns.length );
- Cursor<InternalResponse> cursor = connection.search( "ou=system", filter.toString(), SearchScope.ONELEVEL, "*",
+ Cursor<Response> cursor = connection.search( "ou=system", filter.toString(), SearchScope.ONELEVEL, "*",
"+" );
while ( cursor.next() )
{
- loadedEntry = ( ( InternalSearchResultEntry ) cursor.get() ).getEntry();
+ loadedEntry = ( ( SearchResultEntry ) cursor.get() ).getEntry();
csnSet.add( loadedEntry.get( SchemaConstants.ENTRY_CSN_AT ).getString() );
}
cursor.close();
Modified: directory/apacheds/branches/apacheds-codec-merge/core-integ/src/test/java/org/apache/directory/server/core/operations/search/SearchPerfIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-codec-merge/core-integ/src/test/java/org/apache/directory/server/core/operations/search/SearchPerfIT.java?rev=985495&r1=985494&r2=985495&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-codec-merge/core-integ/src/test/java/org/apache/directory/server/core/operations/search/SearchPerfIT.java (original)
+++ directory/apacheds/branches/apacheds-codec-merge/core-integ/src/test/java/org/apache/directory/server/core/operations/search/SearchPerfIT.java Sat Aug 14 14:18:49 2010
@@ -29,7 +29,7 @@ import org.apache.directory.server.core.
import org.apache.directory.server.core.integ.IntegrationUtils;
import org.apache.directory.shared.ldap.cursor.Cursor;
import org.apache.directory.shared.ldap.filter.SearchScope;
-import org.apache.directory.shared.ldap.message.internal.InternalResponse;
+import org.apache.directory.shared.ldap.message.internal.Response;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -51,14 +51,14 @@ public class SearchPerfIT extends Abstra
{
LdapConnection connection = IntegrationUtils.getAdminConnection( service );
- Cursor<InternalResponse> cursor = connection.search( "uid=admin,ou=system", "(ObjectClass=*)",
+ Cursor<Response> cursor = connection.search( "uid=admin,ou=system", "(ObjectClass=*)",
SearchScope.OBJECT, "*" );
int i = 0;
while ( cursor.next() )
{
- InternalResponse response = cursor.get();
+ Response response = cursor.get();
++i;
}
Modified: directory/apacheds/branches/apacheds-codec-merge/core-integ/src/test/java/org/apache/directory/server/core/schema/SubschemaSubentryIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-codec-merge/core-integ/src/test/java/org/apache/directory/server/core/schema/SubschemaSubentryIT.java?rev=985495&r1=985494&r2=985495&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-codec-merge/core-integ/src/test/java/org/apache/directory/server/core/schema/SubschemaSubentryIT.java (original)
+++ directory/apacheds/branches/apacheds-codec-merge/core-integ/src/test/java/org/apache/directory/server/core/schema/SubschemaSubentryIT.java Sat Aug 14 14:18:49 2010
@@ -67,7 +67,7 @@ import org.apache.directory.server.core.
import org.apache.directory.shared.ldap.entry.Entry;
import org.apache.directory.shared.ldap.jndi.JndiUtils;
import org.apache.directory.shared.ldap.message.ResultCodeEnum;
-import org.apache.directory.shared.ldap.message.internal.InternalModifyResponse;
+import org.apache.directory.shared.ldap.message.internal.ModifyResponse;
import org.apache.directory.shared.ldap.name.DN;
import org.apache.directory.shared.ldap.schema.AttributeType;
import org.apache.directory.shared.ldap.schema.LdapSyntax;
@@ -131,7 +131,7 @@ public class SubschemaSubentryIT extends
ModifyRequest modRequest = new ModifyRequest( new DN( GLOBAL_SUBSCHEMA_DN ) );
modRequest.add( "attributeTypes", "( 2.5.4.58 NAME 'attributeCertificateAttribute' "
+ " DESC 'attribute certificate use ;binary' SYNTAX 1.3.6.1.4.1.1466.115.121.1.8 )" );
- InternalModifyResponse response = conn.modify( modRequest );
+ ModifyResponse response = conn.modify( modRequest );
assertEquals( ResultCodeEnum.SUCCESS, response.getLdapResult().getResultCode() );
}