Return-Path: Delivered-To: apmail-directory-commits-archive@www.apache.org Received: (qmail 34794 invoked from network); 23 Jan 2011 20:12:33 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 23 Jan 2011 20:12:33 -0000 Received: (qmail 44262 invoked by uid 500); 23 Jan 2011 20:12:33 -0000 Delivered-To: apmail-directory-commits-archive@directory.apache.org Received: (qmail 44230 invoked by uid 500); 23 Jan 2011 20:12:33 -0000 Mailing-List: contact commits-help@directory.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@directory.apache.org Delivered-To: mailing list commits@directory.apache.org Received: (qmail 44223 invoked by uid 99); 23 Jan 2011 20:12:33 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 23 Jan 2011 20:12:33 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 23 Jan 2011 20:12:22 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 22FA82388A9F; Sun, 23 Jan 2011 20:11:59 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1062511 [3/15] - in /directory: apacheds/trunk/core-annotations/src/main/java/org/apache/directory/server/core/factory/ apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/ apacheds/trunk/core-api/src/main/java/org/apach... Date: Sun, 23 Jan 2011 20:11:43 -0000 To: commits@directory.apache.org From: akarasulu@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20110123201159.22FA82388A9F@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Modified: directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/SyntaxCheckerSynchronizer.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/SyntaxCheckerSynchronizer.java?rev=1062511&r1=1062510&r2=1062511&view=diff ============================================================================== --- directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/SyntaxCheckerSynchronizer.java (original) +++ directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/SyntaxCheckerSynchronizer.java Sun Jan 23 20:11:02 2011 @@ -25,11 +25,11 @@ import org.apache.directory.server.i18n. import org.apache.directory.shared.ldap.constants.MetaSchemaConstants; import org.apache.directory.shared.ldap.constants.SchemaConstants; import org.apache.directory.shared.ldap.entry.Entry; -import org.apache.directory.shared.ldap.exception.LdapException; -import org.apache.directory.shared.ldap.exception.LdapInvalidDnException; -import org.apache.directory.shared.ldap.exception.LdapSchemaViolationException; -import org.apache.directory.shared.ldap.exception.LdapUnwillingToPerformException; -import org.apache.directory.shared.ldap.message.ResultCodeEnum; +import org.apache.directory.shared.ldap.model.exception.LdapException; +import org.apache.directory.shared.ldap.model.exception.LdapInvalidDnException; +import org.apache.directory.shared.ldap.model.exception.LdapSchemaViolationException; +import org.apache.directory.shared.ldap.model.exception.LdapUnwillingToPerformException; +import org.apache.directory.shared.ldap.model.message.ResultCodeEnum; import org.apache.directory.shared.ldap.name.Dn; import org.apache.directory.shared.ldap.name.Rdn; import org.apache.directory.shared.ldap.schema.SchemaManager; Modified: directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/SyntaxSynchronizer.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/SyntaxSynchronizer.java?rev=1062511&r1=1062510&r2=1062511&view=diff ============================================================================== --- directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/SyntaxSynchronizer.java (original) +++ directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/SyntaxSynchronizer.java Sun Jan 23 20:11:02 2011 @@ -28,10 +28,10 @@ import org.apache.directory.server.i18n. import org.apache.directory.shared.ldap.constants.MetaSchemaConstants; import org.apache.directory.shared.ldap.constants.SchemaConstants; import org.apache.directory.shared.ldap.entry.Entry; -import org.apache.directory.shared.ldap.exception.LdapException; -import org.apache.directory.shared.ldap.exception.LdapInvalidDnException; -import org.apache.directory.shared.ldap.exception.LdapUnwillingToPerformException; -import org.apache.directory.shared.ldap.message.ResultCodeEnum; +import org.apache.directory.shared.ldap.model.exception.LdapException; +import org.apache.directory.shared.ldap.model.exception.LdapInvalidDnException; +import org.apache.directory.shared.ldap.model.exception.LdapUnwillingToPerformException; +import org.apache.directory.shared.ldap.model.message.ResultCodeEnum; import org.apache.directory.shared.ldap.name.Dn; import org.apache.directory.shared.ldap.name.Rdn; import org.apache.directory.shared.ldap.schema.AttributeType; Modified: directory/apacheds/trunk/core-api/src/test/java/org/apache/directory/server/core/MockCoreSession.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-api/src/test/java/org/apache/directory/server/core/MockCoreSession.java?rev=1062511&r1=1062510&r2=1062511&view=diff ============================================================================== --- directory/apacheds/trunk/core-api/src/test/java/org/apache/directory/server/core/MockCoreSession.java (original) +++ directory/apacheds/trunk/core-api/src/test/java/org/apache/directory/server/core/MockCoreSession.java Sun Jan 23 20:11:02 2011 @@ -51,19 +51,16 @@ import org.apache.directory.shared.ldap. import org.apache.directory.shared.ldap.entry.Modification; import org.apache.directory.shared.ldap.entry.StringValue; import org.apache.directory.shared.ldap.entry.Value; -import org.apache.directory.shared.ldap.exception.LdapException; -import org.apache.directory.shared.ldap.exception.LdapInvalidSearchFilterException; +import org.apache.directory.shared.ldap.model.exception.LdapException; +import org.apache.directory.shared.ldap.model.exception.LdapInvalidSearchFilterException; import org.apache.directory.shared.ldap.filter.ExprNode; import org.apache.directory.shared.ldap.filter.FilterParser; import org.apache.directory.shared.ldap.filter.SearchScope; -import org.apache.directory.shared.ldap.message.AddRequest; -import org.apache.directory.shared.ldap.message.AliasDerefMode; -import org.apache.directory.shared.ldap.message.CompareRequest; -import org.apache.directory.shared.ldap.message.DeleteRequest; -import org.apache.directory.shared.ldap.message.ModifyDnRequest; -import org.apache.directory.shared.ldap.message.ModifyRequest; -import org.apache.directory.shared.ldap.message.SearchRequest; -import org.apache.directory.shared.ldap.message.UnbindRequest; +import org.apache.directory.shared.ldap.model.message.AddRequest; +import org.apache.directory.shared.ldap.model.message.*; +import org.apache.directory.shared.ldap.model.message.DeleteRequest; +import org.apache.directory.shared.ldap.model.message.ModifyDnRequest; +import org.apache.directory.shared.ldap.model.message.SearchRequest; import org.apache.directory.shared.ldap.message.control.Control; import org.apache.directory.shared.ldap.name.Dn; import org.apache.directory.shared.ldap.name.Rdn; @@ -436,7 +433,7 @@ public class MockCoreSession implements /* (non-Javadoc) - * @see org.apache.directory.server.core.CoreSession#list(org.apache.directory.shared.ldap.name.Dn, org.apache.directory.shared.ldap.message.AliasDerefMode, java.util.Set) + * @see org.apache.directory.server.core.CoreSession#list(org.apache.directory.shared.ldap.name.Dn, org.apache.directory.shared.ldap.model.message.AliasDerefMode, java.util.Set) */ public EntryFilteringCursor list( Dn dn, AliasDerefMode aliasDerefMode, Set returningAttributes ) throws LdapException @@ -451,7 +448,7 @@ public class MockCoreSession implements /* (non-Javadoc) - * @see org.apache.directory.server.core.CoreSession#list(org.apache.directory.shared.ldap.name.Dn, org.apache.directory.shared.ldap.message.AliasDerefMode, java.util.Set, int, int) + * @see org.apache.directory.server.core.CoreSession#list(org.apache.directory.shared.ldap.name.Dn, org.apache.directory.shared.ldap.model.message.AliasDerefMode, java.util.Set, int, int) */ public EntryFilteringCursor list( Dn dn, AliasDerefMode aliasDerefMode, Set returningAttributes, long sizeLimit, int timeLimit ) throws LdapException @@ -754,7 +751,7 @@ public class MockCoreSession implements /* (non-Javadoc) - * @see org.apache.directory.server.core.CoreSession#search(org.apache.directory.shared.ldap.name.Dn, org.apache.directory.shared.ldap.filter.SearchScope, org.apache.directory.shared.ldap.filter.ExprNode, org.apache.directory.shared.ldap.message.AliasDerefMode, java.util.Set) + * @see org.apache.directory.server.core.CoreSession#search(org.apache.directory.shared.ldap.name.Dn, org.apache.directory.shared.ldap.filter.SearchScope, org.apache.directory.shared.ldap.filter.ExprNode, org.apache.directory.shared.ldap.model.message.AliasDerefMode, java.util.Set) */ public EntryFilteringCursor search( Dn dn, SearchScope scope, ExprNode filter, AliasDerefMode aliasDerefMode, Set returningAttributes ) throws LdapException Modified: directory/apacheds/trunk/core-api/src/test/java/org/apache/directory/server/core/MockDirectoryService.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-api/src/test/java/org/apache/directory/server/core/MockDirectoryService.java?rev=1062511&r1=1062510&r2=1062511&view=diff ============================================================================== --- directory/apacheds/trunk/core-api/src/test/java/org/apache/directory/server/core/MockDirectoryService.java (original) +++ directory/apacheds/trunk/core-api/src/test/java/org/apache/directory/server/core/MockDirectoryService.java Sun Jan 23 20:11:02 2011 @@ -42,7 +42,7 @@ import org.apache.directory.server.core. import org.apache.directory.server.core.schema.SchemaService; import org.apache.directory.shared.ldap.csn.Csn; import org.apache.directory.shared.ldap.entry.Entry; -import org.apache.directory.shared.ldap.exception.LdapException; +import org.apache.directory.shared.ldap.model.exception.LdapException; import org.apache.directory.shared.ldap.ldif.LdifEntry; import org.apache.directory.shared.ldap.name.Dn; import org.apache.directory.shared.ldap.schema.SchemaManager; Modified: directory/apacheds/trunk/core-api/src/test/java/org/apache/directory/server/core/MockInterceptor.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-api/src/test/java/org/apache/directory/server/core/MockInterceptor.java?rev=1062511&r1=1062510&r2=1062511&view=diff ============================================================================== --- directory/apacheds/trunk/core-api/src/test/java/org/apache/directory/server/core/MockInterceptor.java (original) +++ directory/apacheds/trunk/core-api/src/test/java/org/apache/directory/server/core/MockInterceptor.java Sun Jan 23 20:11:02 2011 @@ -40,7 +40,7 @@ import org.apache.directory.server.core. import org.apache.directory.server.core.interceptor.context.SearchOperationContext; import org.apache.directory.server.core.interceptor.context.UnbindOperationContext; import org.apache.directory.shared.ldap.entry.Entry; -import org.apache.directory.shared.ldap.exception.LdapException; +import org.apache.directory.shared.ldap.model.exception.LdapException; public class MockInterceptor implements Interceptor Modified: directory/apacheds/trunk/core-api/src/test/java/org/apache/directory/server/core/MockOperation.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-api/src/test/java/org/apache/directory/server/core/MockOperation.java?rev=1062511&r1=1062510&r2=1062511&view=diff ============================================================================== --- directory/apacheds/trunk/core-api/src/test/java/org/apache/directory/server/core/MockOperation.java (original) +++ directory/apacheds/trunk/core-api/src/test/java/org/apache/directory/server/core/MockOperation.java Sun Jan 23 20:11:02 2011 @@ -31,7 +31,7 @@ import org.apache.directory.server.core. import org.apache.directory.shared.ldap.constants.AuthenticationLevel; import org.apache.directory.shared.ldap.entry.Entry; import org.apache.directory.shared.ldap.entry.Modification; -import org.apache.directory.shared.ldap.exception.LdapException; +import org.apache.directory.shared.ldap.model.exception.LdapException; import org.apache.directory.shared.ldap.message.control.Control; import org.apache.directory.shared.ldap.name.Dn; Modified: directory/apacheds/trunk/core-api/src/test/java/org/apache/directory/server/core/MockOperationManager.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-api/src/test/java/org/apache/directory/server/core/MockOperationManager.java?rev=1062511&r1=1062510&r2=1062511&view=diff ============================================================================== --- directory/apacheds/trunk/core-api/src/test/java/org/apache/directory/server/core/MockOperationManager.java (original) +++ directory/apacheds/trunk/core-api/src/test/java/org/apache/directory/server/core/MockOperationManager.java Sun Jan 23 20:11:02 2011 @@ -37,7 +37,7 @@ import org.apache.directory.server.core. import org.apache.directory.server.core.interceptor.context.SearchOperationContext; import org.apache.directory.server.core.interceptor.context.UnbindOperationContext; import org.apache.directory.shared.ldap.entry.Entry; -import org.apache.directory.shared.ldap.exception.LdapException; +import org.apache.directory.shared.ldap.model.exception.LdapException; public class MockOperationManager implements OperationManager { Modified: directory/apacheds/trunk/core-api/src/test/java/org/apache/directory/server/core/entry/SchemaAwareEntryAttributeTest.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-api/src/test/java/org/apache/directory/server/core/entry/SchemaAwareEntryAttributeTest.java?rev=1062511&r1=1062510&r2=1062511&view=diff ============================================================================== --- directory/apacheds/trunk/core-api/src/test/java/org/apache/directory/server/core/entry/SchemaAwareEntryAttributeTest.java (original) +++ directory/apacheds/trunk/core-api/src/test/java/org/apache/directory/server/core/entry/SchemaAwareEntryAttributeTest.java Sun Jan 23 20:11:02 2011 @@ -49,8 +49,8 @@ import org.apache.directory.shared.ldap. import org.apache.directory.shared.ldap.entry.EntryAttribute; import org.apache.directory.shared.ldap.entry.StringValue; import org.apache.directory.shared.ldap.entry.Value; -import org.apache.directory.shared.ldap.exception.LdapException; -import org.apache.directory.shared.ldap.exception.LdapInvalidAttributeValueException; +import org.apache.directory.shared.ldap.model.exception.LdapException; +import org.apache.directory.shared.ldap.model.exception.LdapInvalidAttributeValueException; import org.apache.directory.shared.ldap.schema.AttributeType; import org.apache.directory.shared.ldap.schema.SchemaManager; import org.apache.directory.shared.ldap.schemaextractor.SchemaLdifExtractor; Modified: directory/apacheds/trunk/core-api/src/test/java/org/apache/directory/server/core/entry/SchemaAwareEntryTest.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-api/src/test/java/org/apache/directory/server/core/entry/SchemaAwareEntryTest.java?rev=1062511&r1=1062510&r2=1062511&view=diff ============================================================================== --- directory/apacheds/trunk/core-api/src/test/java/org/apache/directory/server/core/entry/SchemaAwareEntryTest.java (original) +++ directory/apacheds/trunk/core-api/src/test/java/org/apache/directory/server/core/entry/SchemaAwareEntryTest.java Sun Jan 23 20:11:02 2011 @@ -50,9 +50,9 @@ import org.apache.directory.shared.ldap. import org.apache.directory.shared.ldap.entry.EntryAttribute; import org.apache.directory.shared.ldap.entry.StringValue; import org.apache.directory.shared.ldap.entry.Value; -import org.apache.directory.shared.ldap.exception.LdapException; -import org.apache.directory.shared.ldap.exception.LdapInvalidDnException; -import org.apache.directory.shared.ldap.exception.LdapNoSuchAttributeException; +import org.apache.directory.shared.ldap.model.exception.LdapException; +import org.apache.directory.shared.ldap.model.exception.LdapInvalidDnException; +import org.apache.directory.shared.ldap.model.exception.LdapNoSuchAttributeException; import org.apache.directory.shared.ldap.name.Dn; import org.apache.directory.shared.ldap.schema.AttributeType; import org.apache.directory.shared.ldap.schema.SchemaManager; Modified: directory/apacheds/trunk/core-api/src/test/java/org/apache/directory/server/core/entry/SchemaAwareModificationTest.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-api/src/test/java/org/apache/directory/server/core/entry/SchemaAwareModificationTest.java?rev=1062511&r1=1062510&r2=1062511&view=diff ============================================================================== --- directory/apacheds/trunk/core-api/src/test/java/org/apache/directory/server/core/entry/SchemaAwareModificationTest.java (original) +++ directory/apacheds/trunk/core-api/src/test/java/org/apache/directory/server/core/entry/SchemaAwareModificationTest.java Sun Jan 23 20:11:02 2011 @@ -41,7 +41,7 @@ import org.apache.directory.shared.ldap. import org.apache.directory.shared.ldap.entry.EntryAttribute; import org.apache.directory.shared.ldap.entry.Modification; import org.apache.directory.shared.ldap.entry.ModificationOperation; -import org.apache.directory.shared.ldap.exception.LdapException; +import org.apache.directory.shared.ldap.model.exception.LdapException; import org.apache.directory.shared.ldap.schema.AttributeType; import org.apache.directory.shared.ldap.schema.SchemaManager; import org.apache.directory.shared.ldap.schemaextractor.SchemaLdifExtractor; Modified: directory/apacheds/trunk/core-integ/src/main/java/org/apache/directory/server/core/integ/IntegrationUtils.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-integ/src/main/java/org/apache/directory/server/core/integ/IntegrationUtils.java?rev=1062511&r1=1062510&r2=1062511&view=diff ============================================================================== --- directory/apacheds/trunk/core-integ/src/main/java/org/apache/directory/server/core/integ/IntegrationUtils.java (original) +++ directory/apacheds/trunk/core-integ/src/main/java/org/apache/directory/server/core/integ/IntegrationUtils.java Sun Jan 23 20:11:02 2011 @@ -49,7 +49,7 @@ import org.apache.directory.shared.ldap. import org.apache.directory.shared.ldap.entry.DefaultEntry; import org.apache.directory.shared.ldap.entry.DefaultEntryAttribute; import org.apache.directory.shared.ldap.entry.EntryAttribute; -import org.apache.directory.shared.ldap.exception.LdapException; +import org.apache.directory.shared.ldap.model.exception.LdapException; import org.apache.directory.shared.ldap.ldif.ChangeType; import org.apache.directory.shared.ldap.ldif.LdifEntry; import org.apache.directory.shared.ldap.ldif.LdifReader; Modified: directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/admin/AdministrativePointServiceIT.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/admin/AdministrativePointServiceIT.java?rev=1062511&r1=1062510&r2=1062511&view=diff ============================================================================== --- directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/admin/AdministrativePointServiceIT.java (original) +++ directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/admin/AdministrativePointServiceIT.java Sun Jan 23 20:11:02 2011 @@ -36,10 +36,10 @@ 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.ldif.LdifUtils; -import org.apache.directory.shared.ldap.message.AddResponse; -import org.apache.directory.shared.ldap.message.ModifyDnResponse; -import org.apache.directory.shared.ldap.message.ModifyResponse; -import org.apache.directory.shared.ldap.message.ResultCodeEnum; +import org.apache.directory.shared.ldap.model.message.AddResponse; +import org.apache.directory.shared.ldap.model.message.ModifyDnResponse; +import org.apache.directory.shared.ldap.model.message.ModifyResponse; +import org.apache.directory.shared.ldap.model.message.ResultCodeEnum; import org.junit.After; import org.junit.Before; import org.junit.Ignore; Modified: directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/authn/SimpleAuthenticationIT.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/authn/SimpleAuthenticationIT.java?rev=1062511&r1=1062510&r2=1062511&view=diff ============================================================================== --- directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/authn/SimpleAuthenticationIT.java (original) +++ directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/authn/SimpleAuthenticationIT.java Sun Jan 23 20:11:02 2011 @@ -35,10 +35,10 @@ import org.apache.directory.server.core. import org.apache.directory.server.core.integ.IntegrationUtils; import org.apache.directory.shared.ldap.entry.Entry; import org.apache.directory.shared.ldap.entry.EntryAttribute; -import org.apache.directory.shared.ldap.message.BindResponse; -import org.apache.directory.shared.ldap.message.ModifyRequest; +import org.apache.directory.shared.ldap.model.message.BindResponse; +import org.apache.directory.shared.ldap.model.message.ModifyRequest; import org.apache.directory.shared.ldap.message.ModifyRequestImpl; -import org.apache.directory.shared.ldap.message.ResultCodeEnum; +import org.apache.directory.shared.ldap.model.message.ResultCodeEnum; import org.apache.directory.shared.ldap.name.Dn; import org.apache.directory.shared.util.Strings; import org.junit.After; Modified: directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/authn/ppolicy/PasswordPolicyTest.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/authn/ppolicy/PasswordPolicyTest.java?rev=1062511&r1=1062510&r2=1062511&view=diff ============================================================================== --- directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/authn/ppolicy/PasswordPolicyTest.java (original) +++ directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/authn/ppolicy/PasswordPolicyTest.java Sun Jan 23 20:11:02 2011 @@ -50,16 +50,15 @@ 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.entry.EntryAttribute; -import org.apache.directory.shared.ldap.exception.LdapException; +import org.apache.directory.shared.ldap.model.exception.LdapException; import org.apache.directory.shared.ldap.ldif.LdifUtils; -import org.apache.directory.shared.ldap.message.AddRequest; +import org.apache.directory.shared.ldap.model.message.AddRequest; import org.apache.directory.shared.ldap.message.AddRequestImpl; -import org.apache.directory.shared.ldap.message.AddResponse; -import org.apache.directory.shared.ldap.message.ModifyRequest; +import org.apache.directory.shared.ldap.model.message.*; +import org.apache.directory.shared.ldap.model.message.ModifyRequest; import org.apache.directory.shared.ldap.message.ModifyRequestImpl; -import org.apache.directory.shared.ldap.message.ModifyResponse; -import org.apache.directory.shared.ldap.message.Response; -import org.apache.directory.shared.ldap.message.ResultCodeEnum; +import org.apache.directory.shared.ldap.model.message.Response; +import org.apache.directory.shared.ldap.model.message.ModifyResponse; import org.apache.directory.shared.ldap.message.control.Control; import org.apache.directory.shared.ldap.name.Dn; import org.junit.After; Modified: directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/authz/AddAuthorizationIT.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/authz/AddAuthorizationIT.java?rev=1062511&r1=1062510&r2=1062511&view=diff ============================================================================== --- directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/authz/AddAuthorizationIT.java (original) +++ directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/authz/AddAuthorizationIT.java Sun Jan 23 20:11:02 2011 @@ -33,9 +33,9 @@ import org.apache.directory.server.core. import org.apache.directory.server.core.integ.FrameworkRunner; import org.apache.directory.shared.ldap.entry.DefaultEntry; import org.apache.directory.shared.ldap.entry.Entry; -import org.apache.directory.shared.ldap.exception.LdapException; -import org.apache.directory.shared.ldap.message.AddResponse; -import org.apache.directory.shared.ldap.message.ResultCodeEnum; +import org.apache.directory.shared.ldap.model.exception.LdapException; +import org.apache.directory.shared.ldap.model.message.AddResponse; +import org.apache.directory.shared.ldap.model.message.ResultCodeEnum; import org.apache.directory.shared.ldap.name.Dn; import org.junit.After; import org.junit.Before; Modified: directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/authz/AuthorizationServiceAsAdminIT.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/authz/AuthorizationServiceAsAdminIT.java?rev=1062511&r1=1062510&r2=1062511&view=diff ============================================================================== --- directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/authz/AuthorizationServiceAsAdminIT.java (original) +++ directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/authz/AuthorizationServiceAsAdminIT.java Sun Jan 23 20:11:02 2011 @@ -37,13 +37,10 @@ import org.apache.directory.shared.ldap. import org.apache.directory.shared.ldap.cursor.Cursor; import org.apache.directory.shared.ldap.entry.Entry; import org.apache.directory.shared.ldap.filter.SearchScope; -import org.apache.directory.shared.ldap.message.DeleteResponse; -import org.apache.directory.shared.ldap.message.ModifyDnResponse; -import org.apache.directory.shared.ldap.message.ModifyRequest; +import org.apache.directory.shared.ldap.model.message.DeleteResponse; +import org.apache.directory.shared.ldap.model.message.*; import org.apache.directory.shared.ldap.message.ModifyRequestImpl; -import org.apache.directory.shared.ldap.message.Response; -import org.apache.directory.shared.ldap.message.ResultCodeEnum; -import org.apache.directory.shared.ldap.message.SearchResultEntry; +import org.apache.directory.shared.ldap.model.message.SearchResultEntry; import org.apache.directory.shared.ldap.name.Dn; import org.apache.directory.shared.ldap.name.Rdn; import org.apache.directory.shared.util.Strings; Modified: directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/authz/AuthorizationServiceAsNonAdminIT.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/authz/AuthorizationServiceAsNonAdminIT.java?rev=1062511&r1=1062510&r2=1062511&view=diff ============================================================================== --- directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/authz/AuthorizationServiceAsNonAdminIT.java (original) +++ directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/authz/AuthorizationServiceAsNonAdminIT.java Sun Jan 23 20:11:02 2011 @@ -42,12 +42,12 @@ import org.apache.directory.shared.ldap. import org.apache.directory.shared.ldap.entry.EntryAttribute; import org.apache.directory.shared.ldap.entry.Modification; import org.apache.directory.shared.ldap.entry.ModificationOperation; -import org.apache.directory.shared.ldap.exception.LdapNoPermissionException; +import org.apache.directory.shared.ldap.model.exception.LdapNoPermissionException; import org.apache.directory.shared.ldap.filter.ExprNode; import org.apache.directory.shared.ldap.filter.FilterParser; import org.apache.directory.shared.ldap.filter.SearchScope; import org.apache.directory.shared.ldap.ldif.LdifEntry; -import org.apache.directory.shared.ldap.message.AliasDerefMode; +import org.apache.directory.shared.ldap.model.message.AliasDerefMode; import org.apache.directory.shared.ldap.name.Dn; import org.apache.directory.shared.ldap.name.Rdn; import org.junit.Test; Modified: directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/authz/AutzIntegUtils.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/authz/AutzIntegUtils.java?rev=1062511&r1=1062510&r2=1062511&view=diff ============================================================================== --- directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/authz/AutzIntegUtils.java (original) +++ directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/authz/AutzIntegUtils.java Sun Jan 23 20:11:02 2011 @@ -26,10 +26,10 @@ import org.apache.directory.server.core. import org.apache.directory.shared.ldap.entry.DefaultEntry; import org.apache.directory.shared.ldap.entry.Entry; import org.apache.directory.shared.ldap.entry.EntryAttribute; -import org.apache.directory.shared.ldap.message.AddResponse; -import org.apache.directory.shared.ldap.message.ModifyRequest; +import org.apache.directory.shared.ldap.model.message.AddResponse; +import org.apache.directory.shared.ldap.model.message.ModifyRequest; import org.apache.directory.shared.ldap.message.ModifyRequestImpl; -import org.apache.directory.shared.ldap.message.ResultCodeEnum; +import org.apache.directory.shared.ldap.model.message.ResultCodeEnum; import org.apache.directory.shared.ldap.name.Dn; Modified: directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/authz/CompareAuthorizationIT.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/authz/CompareAuthorizationIT.java?rev=1062511&r1=1062510&r2=1062511&view=diff ============================================================================== --- directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/authz/CompareAuthorizationIT.java (original) +++ directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/authz/CompareAuthorizationIT.java Sun Jan 23 20:11:02 2011 @@ -37,8 +37,8 @@ import org.apache.directory.server.core. import org.apache.directory.shared.ldap.constants.SchemaConstants; import org.apache.directory.shared.ldap.entry.DefaultEntry; import org.apache.directory.shared.ldap.entry.Entry; -import org.apache.directory.shared.ldap.message.CompareResponse; -import org.apache.directory.shared.ldap.message.ResultCodeEnum; +import org.apache.directory.shared.ldap.model.message.CompareResponse; +import org.apache.directory.shared.ldap.model.message.ResultCodeEnum; import org.apache.directory.shared.ldap.name.Dn; import org.junit.After; import org.junit.Before; Modified: directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/authz/DeleteAuthorizationIT.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/authz/DeleteAuthorizationIT.java?rev=1062511&r1=1062510&r2=1062511&view=diff ============================================================================== --- directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/authz/DeleteAuthorizationIT.java (original) +++ directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/authz/DeleteAuthorizationIT.java Sun Jan 23 20:11:02 2011 @@ -36,8 +36,8 @@ import org.apache.directory.server.core. import org.apache.directory.shared.ldap.constants.SchemaConstants; import org.apache.directory.shared.ldap.entry.DefaultEntry; import org.apache.directory.shared.ldap.entry.Entry; -import org.apache.directory.shared.ldap.message.DeleteResponse; -import org.apache.directory.shared.ldap.message.ResultCodeEnum; +import org.apache.directory.shared.ldap.model.message.DeleteResponse; +import org.apache.directory.shared.ldap.model.message.ResultCodeEnum; import org.apache.directory.shared.ldap.name.Dn; import org.junit.After; import org.junit.Before; Modified: directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/authz/GeneralAuthorizationIT.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/authz/GeneralAuthorizationIT.java?rev=1062511&r1=1062510&r2=1062511&view=diff ============================================================================== --- directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/authz/GeneralAuthorizationIT.java (original) +++ directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/authz/GeneralAuthorizationIT.java Sun Jan 23 20:11:02 2011 @@ -27,7 +27,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.ResultCodeEnum; +import org.apache.directory.shared.ldap.model.message.ResultCodeEnum; import org.junit.After; import org.junit.Before; import org.junit.Test; Modified: directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/authz/LookupAuthorizationIT.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/authz/LookupAuthorizationIT.java?rev=1062511&r1=1062510&r2=1062511&view=diff ============================================================================== --- directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/authz/LookupAuthorizationIT.java (original) +++ directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/authz/LookupAuthorizationIT.java Sun Jan 23 20:11:02 2011 @@ -30,7 +30,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.shared.ldap.entry.Entry; -import org.apache.directory.shared.ldap.exception.LdapNoPermissionException; +import org.apache.directory.shared.ldap.model.exception.LdapNoPermissionException; import org.apache.directory.shared.ldap.name.Dn; import org.junit.Before; import org.junit.Test; Modified: directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/authz/ModifyAuthorizationIT.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/authz/ModifyAuthorizationIT.java?rev=1062511&r1=1062510&r2=1062511&view=diff ============================================================================== --- directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/authz/ModifyAuthorizationIT.java (original) +++ directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/authz/ModifyAuthorizationIT.java Sun Jan 23 20:11:02 2011 @@ -44,10 +44,10 @@ import org.apache.directory.shared.ldap. import org.apache.directory.shared.ldap.entry.EntryAttribute; import org.apache.directory.shared.ldap.entry.Modification; import org.apache.directory.shared.ldap.entry.ModificationOperation; -import org.apache.directory.shared.ldap.message.ModifyRequest; +import org.apache.directory.shared.ldap.model.message.ModifyRequest; import org.apache.directory.shared.ldap.message.ModifyRequestImpl; -import org.apache.directory.shared.ldap.message.ModifyResponse; -import org.apache.directory.shared.ldap.message.ResultCodeEnum; +import org.apache.directory.shared.ldap.model.message.ModifyResponse; +import org.apache.directory.shared.ldap.model.message.ResultCodeEnum; import org.apache.directory.shared.ldap.name.Dn; import org.junit.After; import org.junit.Before; Modified: directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/authz/MoveRenameAuthorizationIT.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/authz/MoveRenameAuthorizationIT.java?rev=1062511&r1=1062510&r2=1062511&view=diff ============================================================================== --- directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/authz/MoveRenameAuthorizationIT.java (original) +++ directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/authz/MoveRenameAuthorizationIT.java Sun Jan 23 20:11:02 2011 @@ -39,8 +39,8 @@ import org.apache.directory.server.core. import org.apache.directory.shared.ldap.constants.SchemaConstants; import org.apache.directory.shared.ldap.entry.DefaultEntry; import org.apache.directory.shared.ldap.entry.Entry; -import org.apache.directory.shared.ldap.message.ModifyDnResponse; -import org.apache.directory.shared.ldap.message.ResultCodeEnum; +import org.apache.directory.shared.ldap.model.message.ModifyDnResponse; +import org.apache.directory.shared.ldap.model.message.ResultCodeEnum; import org.apache.directory.shared.ldap.name.Dn; import org.junit.After; import org.junit.Before; Modified: directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/authz/SearchAuthorizationIT.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/authz/SearchAuthorizationIT.java?rev=1062511&r1=1062510&r2=1062511&view=diff ============================================================================== --- directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/authz/SearchAuthorizationIT.java (original) +++ directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/authz/SearchAuthorizationIT.java Sun Jan 23 20:11:02 2011 @@ -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.Response; -import org.apache.directory.shared.ldap.message.SearchResultEntry; +import org.apache.directory.shared.ldap.model.message.Response; +import org.apache.directory.shared.ldap.model.message.SearchResultEntry; import org.apache.directory.shared.ldap.name.Dn; import org.junit.After; import org.junit.Before; @@ -892,7 +892,7 @@ public class SearchAuthorizationIT exten list = userCtx.search( dn.getName(), "(objectClass=*)", SearchScope.OBJECT, "*" ); if ( list.next() ) { - result = ( SearchResultEntry ) list.get(); + result = (SearchResultEntry) list.get(); } list.close(); Modified: directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/changelog/DefaultChangeLogIT.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/changelog/DefaultChangeLogIT.java?rev=1062511&r1=1062510&r2=1062511&view=diff ============================================================================== --- directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/changelog/DefaultChangeLogIT.java (original) +++ directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/changelog/DefaultChangeLogIT.java Sun Jan 23 20:11:02 2011 @@ -37,8 +37,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.entry.EntryAttribute; -import org.apache.directory.shared.ldap.exception.LdapException; -import org.apache.directory.shared.ldap.message.ModifyRequest; +import org.apache.directory.shared.ldap.model.exception.LdapException; +import org.apache.directory.shared.ldap.model.message.ModifyRequest; import org.apache.directory.shared.ldap.message.ModifyRequestImpl; import org.apache.directory.shared.ldap.name.Dn; import org.junit.After; Modified: directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/collective/CollectiveAttributeServiceIT.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/collective/CollectiveAttributeServiceIT.java?rev=1062511&r1=1062510&r2=1062511&view=diff ============================================================================== --- directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/collective/CollectiveAttributeServiceIT.java (original) +++ directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/collective/CollectiveAttributeServiceIT.java Sun Jan 23 20:11:02 2011 @@ -40,15 +40,15 @@ import org.apache.directory.shared.ldap. import org.apache.directory.shared.ldap.entry.EntryAttribute; import org.apache.directory.shared.ldap.entry.Modification; import org.apache.directory.shared.ldap.entry.ModificationOperation; -import org.apache.directory.shared.ldap.exception.LdapException; +import org.apache.directory.shared.ldap.model.exception.LdapException; import org.apache.directory.shared.ldap.filter.SearchScope; import org.apache.directory.shared.ldap.ldif.LdapLdifException; import org.apache.directory.shared.ldap.ldif.LdifUtils; -import org.apache.directory.shared.ldap.message.AddResponse; -import org.apache.directory.shared.ldap.message.ModifyResponse; -import org.apache.directory.shared.ldap.message.Response; -import org.apache.directory.shared.ldap.message.ResultCodeEnum; -import org.apache.directory.shared.ldap.message.SearchResultEntry; +import org.apache.directory.shared.ldap.model.message.AddResponse; +import org.apache.directory.shared.ldap.model.message.ModifyResponse; +import org.apache.directory.shared.ldap.model.message.Response; +import org.apache.directory.shared.ldap.model.message.ResultCodeEnum; +import org.apache.directory.shared.ldap.model.message.SearchResultEntry; import org.apache.directory.shared.ldap.name.Dn; import org.junit.After; import org.junit.Before; @@ -129,7 +129,7 @@ public class CollectiveAttributeServiceI if ( result instanceof SearchResultEntry ) { - Entry entry = ( ( SearchResultEntry ) result ).getEntry(); + Entry entry = ( (SearchResultEntry) result ).getEntry(); resultMap.put( entry.getDn().getName(), entry ); } } Modified: directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/exception/ExceptionServiceIT.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/exception/ExceptionServiceIT.java?rev=1062511&r1=1062510&r2=1062511&view=diff ============================================================================== --- directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/exception/ExceptionServiceIT.java (original) +++ directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/exception/ExceptionServiceIT.java Sun Jan 23 20:11:02 2011 @@ -39,14 +39,11 @@ 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.filter.SearchScope; -import org.apache.directory.shared.ldap.message.AddResponse; -import org.apache.directory.shared.ldap.message.DeleteResponse; -import org.apache.directory.shared.ldap.message.ModifyDnResponse; -import org.apache.directory.shared.ldap.message.ModifyRequest; +import org.apache.directory.shared.ldap.model.message.*; +import org.apache.directory.shared.ldap.model.message.ModifyDnResponse; import org.apache.directory.shared.ldap.message.ModifyRequestImpl; -import org.apache.directory.shared.ldap.message.ModifyResponse; -import org.apache.directory.shared.ldap.message.Response; -import org.apache.directory.shared.ldap.message.ResultCodeEnum; +import org.apache.directory.shared.ldap.model.message.ModifyResponse; +import org.apache.directory.shared.ldap.model.message.Response; import org.apache.directory.shared.ldap.name.Dn; import org.apache.directory.shared.ldap.name.Rdn; import org.junit.After; Modified: directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/jndi/ReferralIT.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/jndi/ReferralIT.java?rev=1062511&r1=1062510&r2=1062511&view=diff ============================================================================== --- directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/jndi/ReferralIT.java (original) +++ directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/jndi/ReferralIT.java Sun Jan 23 20:11:02 2011 @@ -56,7 +56,7 @@ import org.apache.directory.server.core. import org.apache.directory.shared.ldap.constants.SchemaConstants; import org.apache.directory.shared.ldap.entry.DefaultEntry; import org.apache.directory.shared.ldap.entry.Entry; -import org.apache.directory.shared.ldap.exception.LdapPartialResultException; +import org.apache.directory.shared.ldap.model.exception.LdapPartialResultException; import org.apache.directory.shared.ldap.ldif.LdifEntry; import org.apache.directory.shared.ldap.name.Dn; import org.junit.Test; Modified: directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/jndi/UniqueMemberIT.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/jndi/UniqueMemberIT.java?rev=1062511&r1=1062510&r2=1062511&view=diff ============================================================================== --- directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/jndi/UniqueMemberIT.java (original) +++ directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/jndi/UniqueMemberIT.java Sun Jan 23 20:11:02 2011 @@ -45,7 +45,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.shared.ldap.constants.JndiPropertyConstants; -import org.apache.directory.shared.ldap.message.AliasDerefMode; +import org.apache.directory.shared.ldap.model.message.AliasDerefMode; import org.junit.Test; import org.junit.runner.RunWith; Modified: directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/jndi/referral/AddReferralIT.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/jndi/referral/AddReferralIT.java?rev=1062511&r1=1062510&r2=1062511&view=diff ============================================================================== --- directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/jndi/referral/AddReferralIT.java (original) +++ directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/jndi/referral/AddReferralIT.java Sun Jan 23 20:11:02 2011 @@ -46,8 +46,8 @@ import org.apache.directory.server.core. import org.apache.directory.server.core.integ.FrameworkRunner; import org.apache.directory.shared.ldap.entry.DefaultEntry; import org.apache.directory.shared.ldap.entry.Entry; -import org.apache.directory.shared.ldap.exception.LdapPartialResultException; -import org.apache.directory.shared.ldap.exception.LdapReferralException; +import org.apache.directory.shared.ldap.model.exception.LdapPartialResultException; +import org.apache.directory.shared.ldap.model.exception.LdapReferralException; import org.apache.directory.shared.ldap.name.Dn; import org.junit.Before; import org.junit.Test; Modified: directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/jndi/referral/CompareReferralIT.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/jndi/referral/CompareReferralIT.java?rev=1062511&r1=1062510&r2=1062511&view=diff ============================================================================== --- directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/jndi/referral/CompareReferralIT.java (original) +++ directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/jndi/referral/CompareReferralIT.java Sun Jan 23 20:11:02 2011 @@ -48,8 +48,8 @@ import org.apache.directory.server.core. import org.apache.directory.server.core.integ.FrameworkRunner; import org.apache.directory.shared.ldap.entry.DefaultEntry; import org.apache.directory.shared.ldap.entry.Entry; -import org.apache.directory.shared.ldap.exception.LdapPartialResultException; -import org.apache.directory.shared.ldap.exception.LdapReferralException; +import org.apache.directory.shared.ldap.model.exception.LdapPartialResultException; +import org.apache.directory.shared.ldap.model.exception.LdapReferralException; import org.apache.directory.shared.ldap.name.Dn; import org.junit.Before; import org.junit.Test; Modified: directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/jndi/referral/DeleteReferralIT.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/jndi/referral/DeleteReferralIT.java?rev=1062511&r1=1062510&r2=1062511&view=diff ============================================================================== --- directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/jndi/referral/DeleteReferralIT.java (original) +++ directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/jndi/referral/DeleteReferralIT.java Sun Jan 23 20:11:02 2011 @@ -42,8 +42,8 @@ import org.apache.directory.server.core. import org.apache.directory.server.core.integ.FrameworkRunner; import org.apache.directory.shared.ldap.entry.DefaultEntry; import org.apache.directory.shared.ldap.entry.Entry; -import org.apache.directory.shared.ldap.exception.LdapNoSuchObjectException; -import org.apache.directory.shared.ldap.exception.LdapReferralException; +import org.apache.directory.shared.ldap.model.exception.LdapNoSuchObjectException; +import org.apache.directory.shared.ldap.model.exception.LdapReferralException; import org.apache.directory.shared.ldap.name.Dn; import org.junit.Before; import org.junit.Test; Modified: directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/jndi/referral/ModifyReferralIT.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/jndi/referral/ModifyReferralIT.java?rev=1062511&r1=1062510&r2=1062511&view=diff ============================================================================== --- directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/jndi/referral/ModifyReferralIT.java (original) +++ directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/jndi/referral/ModifyReferralIT.java Sun Jan 23 20:11:02 2011 @@ -54,8 +54,8 @@ 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.entry.Entry; -import org.apache.directory.shared.ldap.exception.LdapNoSuchObjectException; -import org.apache.directory.shared.ldap.exception.LdapReferralException; +import org.apache.directory.shared.ldap.model.exception.LdapNoSuchObjectException; +import org.apache.directory.shared.ldap.model.exception.LdapReferralException; import org.apache.directory.shared.ldap.name.Dn; import org.junit.Before; import org.junit.Test; Modified: directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/jndi/referral/MoveAndRenameReferralIT.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/jndi/referral/MoveAndRenameReferralIT.java?rev=1062511&r1=1062510&r2=1062511&view=diff ============================================================================== --- directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/jndi/referral/MoveAndRenameReferralIT.java (original) +++ directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/jndi/referral/MoveAndRenameReferralIT.java Sun Jan 23 20:11:02 2011 @@ -46,8 +46,8 @@ import org.apache.directory.server.core. import org.apache.directory.server.core.integ.FrameworkRunner; import org.apache.directory.shared.ldap.entry.DefaultEntry; import org.apache.directory.shared.ldap.entry.Entry; -import org.apache.directory.shared.ldap.exception.LdapPartialResultException; -import org.apache.directory.shared.ldap.exception.LdapReferralException; +import org.apache.directory.shared.ldap.model.exception.LdapPartialResultException; +import org.apache.directory.shared.ldap.model.exception.LdapReferralException; import org.apache.directory.shared.ldap.name.Dn; import org.apache.directory.shared.ldap.name.Rdn; import org.junit.Before; Modified: directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/jndi/referral/MoveReferralIT.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/jndi/referral/MoveReferralIT.java?rev=1062511&r1=1062510&r2=1062511&view=diff ============================================================================== --- directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/jndi/referral/MoveReferralIT.java (original) +++ directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/jndi/referral/MoveReferralIT.java Sun Jan 23 20:11:02 2011 @@ -45,8 +45,8 @@ import org.apache.directory.server.core. import org.apache.directory.server.core.integ.FrameworkRunner; import org.apache.directory.shared.ldap.entry.DefaultEntry; import org.apache.directory.shared.ldap.entry.Entry; -import org.apache.directory.shared.ldap.exception.LdapPartialResultException; -import org.apache.directory.shared.ldap.exception.LdapReferralException; +import org.apache.directory.shared.ldap.model.exception.LdapPartialResultException; +import org.apache.directory.shared.ldap.model.exception.LdapReferralException; import org.apache.directory.shared.ldap.name.Dn; import org.junit.Before; import org.junit.Test; Modified: directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/jndi/referral/RenameReferralIT.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/jndi/referral/RenameReferralIT.java?rev=1062511&r1=1062510&r2=1062511&view=diff ============================================================================== --- directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/jndi/referral/RenameReferralIT.java (original) +++ directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/jndi/referral/RenameReferralIT.java Sun Jan 23 20:11:02 2011 @@ -44,7 +44,7 @@ import org.apache.directory.server.core. import org.apache.directory.server.core.integ.FrameworkRunner; import org.apache.directory.shared.ldap.entry.DefaultEntry; import org.apache.directory.shared.ldap.entry.Entry; -import org.apache.directory.shared.ldap.exception.LdapReferralException; +import org.apache.directory.shared.ldap.model.exception.LdapReferralException; import org.apache.directory.shared.ldap.name.Dn; import org.apache.directory.shared.ldap.name.Rdn; import org.junit.Before; Modified: directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/jndi/referral/RenameReferralIgnoreIT.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/jndi/referral/RenameReferralIgnoreIT.java?rev=1062511&r1=1062510&r2=1062511&view=diff ============================================================================== --- directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/jndi/referral/RenameReferralIgnoreIT.java (original) +++ directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/jndi/referral/RenameReferralIgnoreIT.java Sun Jan 23 20:11:02 2011 @@ -40,9 +40,9 @@ import org.apache.directory.server.core. import org.apache.directory.server.core.integ.FrameworkRunner; import org.apache.directory.shared.ldap.entry.DefaultEntry; import org.apache.directory.shared.ldap.entry.Entry; -import org.apache.directory.shared.ldap.exception.LdapEntryAlreadyExistsException; -import org.apache.directory.shared.ldap.exception.LdapNoSuchObjectException; -import org.apache.directory.shared.ldap.exception.LdapPartialResultException; +import org.apache.directory.shared.ldap.model.exception.LdapEntryAlreadyExistsException; +import org.apache.directory.shared.ldap.model.exception.LdapNoSuchObjectException; +import org.apache.directory.shared.ldap.model.exception.LdapPartialResultException; import org.apache.directory.shared.ldap.name.Dn; import org.apache.directory.shared.ldap.name.Rdn; import org.junit.Before; Modified: directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/jndi/referral/SearchReferralIT.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/jndi/referral/SearchReferralIT.java?rev=1062511&r1=1062510&r2=1062511&view=diff ============================================================================== --- directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/jndi/referral/SearchReferralIT.java (original) +++ directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/jndi/referral/SearchReferralIT.java Sun Jan 23 20:11:02 2011 @@ -48,8 +48,8 @@ import org.apache.directory.server.core. import org.apache.directory.server.core.integ.FrameworkRunner; import org.apache.directory.shared.ldap.entry.DefaultEntry; import org.apache.directory.shared.ldap.entry.Entry; -import org.apache.directory.shared.ldap.exception.LdapPartialResultException; -import org.apache.directory.shared.ldap.exception.LdapReferralException; +import org.apache.directory.shared.ldap.model.exception.LdapPartialResultException; +import org.apache.directory.shared.ldap.model.exception.LdapReferralException; import org.apache.directory.shared.ldap.name.Dn; import org.junit.Before; import org.junit.Test; Modified: directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/operational/OperationalAttributeServiceIT.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/operational/OperationalAttributeServiceIT.java?rev=1062511&r1=1062510&r2=1062511&view=diff ============================================================================== --- directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/operational/OperationalAttributeServiceIT.java (original) +++ directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/operational/OperationalAttributeServiceIT.java Sun Jan 23 20:11:02 2011 @@ -42,10 +42,10 @@ import org.apache.directory.shared.ldap. import org.apache.directory.shared.ldap.entry.ModificationOperation; import org.apache.directory.shared.ldap.filter.SearchScope; import org.apache.directory.shared.ldap.ldif.LdifUtils; -import org.apache.directory.shared.ldap.message.ModifyResponse; -import org.apache.directory.shared.ldap.message.Response; -import org.apache.directory.shared.ldap.message.ResultCodeEnum; -import org.apache.directory.shared.ldap.message.SearchResultEntry; +import org.apache.directory.shared.ldap.model.message.ModifyResponse; +import org.apache.directory.shared.ldap.model.message.Response; +import org.apache.directory.shared.ldap.model.message.ResultCodeEnum; +import org.apache.directory.shared.ldap.model.message.SearchResultEntry; import org.apache.directory.shared.ldap.name.Dn; import org.apache.directory.shared.util.Strings; import org.junit.After; @@ -179,7 +179,7 @@ public class OperationalAttributeService Cursor responses = connection .search( "ou=system", "(objectClass=*)", SearchScope.OBJECT, "*" ); responses.next(); - SearchResultEntry result = ( SearchResultEntry ) responses.get(); + SearchResultEntry result = (SearchResultEntry) responses.get(); // test to make sure op attribute do not occur - this is the control Entry entry = result.getEntry(); Modified: directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/operations/bind/SimpleBindIT.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/operations/bind/SimpleBindIT.java?rev=1062511&r1=1062510&r2=1062511&view=diff ============================================================================== --- directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/operations/bind/SimpleBindIT.java (original) +++ directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/operations/bind/SimpleBindIT.java Sun Jan 23 20:11:02 2011 @@ -48,9 +48,9 @@ import org.apache.directory.server.core. import org.apache.directory.server.core.integ.IntegrationUtils; import org.apache.directory.server.core.jndi.CoreContextFactory; import org.apache.directory.shared.ldap.constants.JndiPropertyConstants; -import org.apache.directory.shared.ldap.message.AliasDerefMode; -import org.apache.directory.shared.ldap.message.BindResponse; -import org.apache.directory.shared.ldap.message.ResultCodeEnum; +import org.apache.directory.shared.ldap.model.message.AliasDerefMode; +import org.apache.directory.shared.ldap.model.message.BindResponse; +import org.apache.directory.shared.ldap.model.message.ResultCodeEnum; import org.junit.Test; import org.junit.runner.RunWith; Modified: directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/operations/compare/ComparePerfIT.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/operations/compare/ComparePerfIT.java?rev=1062511&r1=1062510&r2=1062511&view=diff ============================================================================== --- directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/operations/compare/ComparePerfIT.java (original) +++ directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/operations/compare/ComparePerfIT.java Sun Jan 23 20:11:02 2011 @@ -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.CompareResponse; +import org.apache.directory.shared.ldap.model.message.CompareResponse; import org.apache.directory.shared.ldap.name.Dn; import org.junit.Test; import org.junit.runner.RunWith; Modified: directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/operations/lookup/LookupIT.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/operations/lookup/LookupIT.java?rev=1062511&r1=1062510&r2=1062511&view=diff ============================================================================== --- directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/operations/lookup/LookupIT.java (original) +++ directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/operations/lookup/LookupIT.java Sun Jan 23 20:11:02 2011 @@ -35,7 +35,7 @@ import org.apache.directory.server.core. import org.apache.directory.shared.ldap.cursor.SearchCursor; import org.apache.directory.shared.ldap.entry.Entry; import org.apache.directory.shared.ldap.filter.SearchScope; -import org.apache.directory.shared.ldap.message.SearchResultEntry; +import org.apache.directory.shared.ldap.model.message.SearchResultEntry; import org.junit.After; import org.junit.Before; import org.junit.Ignore; Modified: directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/operations/modify/ModifyPerfIT.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/operations/modify/ModifyPerfIT.java?rev=1062511&r1=1062510&r2=1062511&view=diff ============================================================================== --- directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/operations/modify/ModifyPerfIT.java (original) +++ directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/operations/modify/ModifyPerfIT.java Sun Jan 23 20:11:02 2011 @@ -35,7 +35,7 @@ import org.apache.directory.shared.ldap. import org.apache.directory.shared.ldap.entry.EntryAttribute; import org.apache.directory.shared.ldap.entry.Modification; import org.apache.directory.shared.ldap.entry.ModificationOperation; -import org.apache.directory.shared.ldap.message.ModifyRequest; +import org.apache.directory.shared.ldap.model.message.ModifyRequest; import org.apache.directory.shared.ldap.message.ModifyRequestImpl; import org.apache.directory.shared.ldap.name.Dn; import org.junit.Test; Modified: directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/operations/search/AliasSearchIT.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/operations/search/AliasSearchIT.java?rev=1062511&r1=1062510&r2=1062511&view=diff ============================================================================== --- directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/operations/search/AliasSearchIT.java (original) +++ directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/operations/search/AliasSearchIT.java Sun Jan 23 20:11:02 2011 @@ -33,11 +33,11 @@ import org.apache.directory.server.core. import org.apache.directory.server.core.filtering.EntryFilteringCursor; import org.apache.directory.server.core.integ.AbstractLdapTestUnit; import org.apache.directory.server.core.integ.FrameworkRunner; -import org.apache.directory.shared.ldap.exception.LdapNoSuchObjectException; +import org.apache.directory.shared.ldap.model.exception.LdapNoSuchObjectException; import org.apache.directory.shared.ldap.filter.ExprNode; import org.apache.directory.shared.ldap.filter.FilterParser; import org.apache.directory.shared.ldap.filter.SearchScope; -import org.apache.directory.shared.ldap.message.AliasDerefMode; +import org.apache.directory.shared.ldap.model.message.AliasDerefMode; import org.apache.directory.shared.ldap.name.Dn; import org.junit.Ignore; import org.junit.Test; Modified: directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/operations/search/DIRSERVER759IT.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/operations/search/DIRSERVER759IT.java?rev=1062511&r1=1062510&r2=1062511&view=diff ============================================================================== --- directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/operations/search/DIRSERVER759IT.java (original) +++ directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/operations/search/DIRSERVER759IT.java Sun Jan 23 20:11:02 2011 @@ -39,7 +39,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.shared.ldap.constants.JndiPropertyConstants; -import org.apache.directory.shared.ldap.message.AliasDerefMode; +import org.apache.directory.shared.ldap.model.message.AliasDerefMode; import org.junit.Test; import org.junit.runner.RunWith; Modified: directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/operations/search/SearchBinaryIT.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/operations/search/SearchBinaryIT.java?rev=1062511&r1=1062510&r2=1062511&view=diff ============================================================================== --- directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/operations/search/SearchBinaryIT.java (original) +++ directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/operations/search/SearchBinaryIT.java Sun Jan 23 20:11:02 2011 @@ -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.Response; +import org.apache.directory.shared.ldap.model.message.Response; import org.junit.Ignore; import org.junit.Test; import org.junit.runner.RunWith; Modified: directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/operations/search/SearchIT.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/operations/search/SearchIT.java?rev=1062511&r1=1062510&r2=1062511&view=diff ============================================================================== --- directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/operations/search/SearchIT.java (original) +++ directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/operations/search/SearchIT.java Sun Jan 23 20:11:02 2011 @@ -59,15 +59,15 @@ import org.apache.directory.shared.ldap. import org.apache.directory.shared.ldap.entry.Entry; import org.apache.directory.shared.ldap.entry.StringValue; import org.apache.directory.shared.ldap.entry.Value; -import org.apache.directory.shared.ldap.exception.LdapException; +import org.apache.directory.shared.ldap.model.exception.LdapException; import org.apache.directory.shared.ldap.filter.ExprNode; import org.apache.directory.shared.ldap.filter.GreaterEqNode; import org.apache.directory.shared.ldap.filter.LessEqNode; 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.Response; -import org.apache.directory.shared.ldap.message.SearchResultEntry; +import org.apache.directory.shared.ldap.model.message.AliasDerefMode; +import org.apache.directory.shared.ldap.model.message.Response; +import org.apache.directory.shared.ldap.model.message.SearchResultEntry; import org.apache.directory.shared.ldap.name.Dn; import org.apache.directory.shared.ldap.schema.AttributeType; import org.junit.Before; Modified: directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/operations/search/SearchPerfIT.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/operations/search/SearchPerfIT.java?rev=1062511&r1=1062510&r2=1062511&view=diff ============================================================================== --- directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/operations/search/SearchPerfIT.java (original) +++ directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/operations/search/SearchPerfIT.java Sun Jan 23 20:11:02 2011 @@ -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.Response; +import org.apache.directory.shared.ldap.model.message.Response; import org.junit.Test; import org.junit.runner.RunWith; Modified: directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaAttributeTypeHandlerIT.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaAttributeTypeHandlerIT.java?rev=1062511&r1=1062510&r2=1062511&view=diff ============================================================================== --- directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaAttributeTypeHandlerIT.java (original) +++ directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaAttributeTypeHandlerIT.java Sun Jan 23 20:11:02 2011 @@ -39,10 +39,10 @@ import javax.naming.ldap.LdapContext; import org.apache.directory.server.core.annotations.CreateDS; import org.apache.directory.server.core.integ.FrameworkRunner; import org.apache.directory.shared.ldap.constants.SchemaConstants; -import org.apache.directory.shared.ldap.exception.LdapInvalidDnException; -import org.apache.directory.shared.ldap.exception.LdapUnwillingToPerformException; +import org.apache.directory.shared.ldap.model.exception.LdapInvalidDnException; +import org.apache.directory.shared.ldap.model.exception.LdapUnwillingToPerformException; import org.apache.directory.shared.ldap.ldif.LdifUtils; -import org.apache.directory.shared.ldap.message.ResultCodeEnum; +import org.apache.directory.shared.ldap.model.message.ResultCodeEnum; import org.apache.directory.shared.ldap.name.Dn; import org.apache.directory.shared.ldap.schema.AttributeType; import org.apache.directory.shared.ldap.util.JndiUtils; Modified: directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaComparatorHandlerIT.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaComparatorHandlerIT.java?rev=1062511&r1=1062510&r2=1062511&view=diff ============================================================================== --- directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaComparatorHandlerIT.java (original) +++ directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaComparatorHandlerIT.java Sun Jan 23 20:11:02 2011 @@ -41,11 +41,11 @@ import javax.naming.directory.Modificati import org.apache.directory.server.core.annotations.CreateDS; import org.apache.directory.server.core.integ.FrameworkRunner; import org.apache.directory.shared.ldap.constants.SchemaConstants; -import org.apache.directory.shared.ldap.exception.LdapException; -import org.apache.directory.shared.ldap.exception.LdapInvalidDnException; -import org.apache.directory.shared.ldap.exception.LdapUnwillingToPerformException; +import org.apache.directory.shared.ldap.model.exception.LdapException; +import org.apache.directory.shared.ldap.model.exception.LdapInvalidDnException; +import org.apache.directory.shared.ldap.model.exception.LdapUnwillingToPerformException; import org.apache.directory.shared.ldap.ldif.LdifUtils; -import org.apache.directory.shared.ldap.message.ResultCodeEnum; +import org.apache.directory.shared.ldap.model.message.ResultCodeEnum; import org.apache.directory.shared.ldap.name.Dn; import org.apache.directory.shared.ldap.schema.MatchingRule; import org.apache.directory.shared.ldap.schema.SchemaManager; Modified: directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaMatchingRuleHandlerIT.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaMatchingRuleHandlerIT.java?rev=1062511&r1=1062510&r2=1062511&view=diff ============================================================================== --- directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaMatchingRuleHandlerIT.java (original) +++ directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaMatchingRuleHandlerIT.java Sun Jan 23 20:11:02 2011 @@ -37,10 +37,10 @@ import javax.naming.directory.Modificati import org.apache.directory.server.core.annotations.CreateDS; import org.apache.directory.server.core.integ.FrameworkRunner; import org.apache.directory.shared.ldap.constants.SchemaConstants; -import org.apache.directory.shared.ldap.exception.LdapException; -import org.apache.directory.shared.ldap.exception.LdapInvalidDnException; +import org.apache.directory.shared.ldap.model.exception.LdapException; +import org.apache.directory.shared.ldap.model.exception.LdapInvalidDnException; import org.apache.directory.shared.ldap.ldif.LdifUtils; -import org.apache.directory.shared.ldap.message.ResultCodeEnum; +import org.apache.directory.shared.ldap.model.message.ResultCodeEnum; import org.apache.directory.shared.ldap.name.Dn; import org.apache.directory.shared.ldap.schema.MatchingRule; import org.apache.directory.shared.ldap.schema.SchemaManager; Modified: directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaNormalizerHandlerIT.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaNormalizerHandlerIT.java?rev=1062511&r1=1062510&r2=1062511&view=diff ============================================================================== --- directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaNormalizerHandlerIT.java (original) +++ directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaNormalizerHandlerIT.java Sun Jan 23 20:11:02 2011 @@ -41,10 +41,10 @@ import javax.naming.directory.Modificati import org.apache.directory.server.core.annotations.CreateDS; import org.apache.directory.server.core.integ.FrameworkRunner; import org.apache.directory.shared.ldap.constants.SchemaConstants; -import org.apache.directory.shared.ldap.exception.LdapException; -import org.apache.directory.shared.ldap.exception.LdapInvalidDnException; +import org.apache.directory.shared.ldap.model.exception.LdapException; +import org.apache.directory.shared.ldap.model.exception.LdapInvalidDnException; import org.apache.directory.shared.ldap.ldif.LdifUtils; -import org.apache.directory.shared.ldap.message.ResultCodeEnum; +import org.apache.directory.shared.ldap.model.message.ResultCodeEnum; import org.apache.directory.shared.ldap.name.Dn; import org.apache.directory.shared.ldap.schema.MatchingRule; import org.apache.directory.shared.ldap.schema.SchemaManager; Modified: directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaObjectClassHandlerIT.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaObjectClassHandlerIT.java?rev=1062511&r1=1062510&r2=1062511&view=diff ============================================================================== --- directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaObjectClassHandlerIT.java (original) +++ directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaObjectClassHandlerIT.java Sun Jan 23 20:11:02 2011 @@ -39,7 +39,7 @@ import javax.naming.directory.Modificati import org.apache.directory.server.core.annotations.CreateDS; import org.apache.directory.server.core.integ.FrameworkRunner; -import org.apache.directory.shared.ldap.exception.LdapException; +import org.apache.directory.shared.ldap.model.exception.LdapException; import org.apache.directory.shared.ldap.ldif.LdifUtils; import org.apache.directory.shared.ldap.name.Dn; import org.apache.directory.shared.ldap.schema.ObjectClass; Modified: directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaSyntaxCheckerHandlerIT.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaSyntaxCheckerHandlerIT.java?rev=1062511&r1=1062510&r2=1062511&view=diff ============================================================================== --- directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaSyntaxCheckerHandlerIT.java (original) +++ directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaSyntaxCheckerHandlerIT.java Sun Jan 23 20:11:02 2011 @@ -41,7 +41,7 @@ import javax.naming.directory.Modificati import org.apache.directory.server.core.annotations.CreateDS; import org.apache.directory.server.core.integ.FrameworkRunner; -import org.apache.directory.shared.ldap.exception.LdapException; +import org.apache.directory.shared.ldap.model.exception.LdapException; import org.apache.directory.shared.ldap.ldif.LdifUtils; import org.apache.directory.shared.ldap.name.Dn; import org.apache.directory.shared.ldap.schema.LdapSyntax; Modified: directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaSyntaxHandlerIT.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaSyntaxHandlerIT.java?rev=1062511&r1=1062510&r2=1062511&view=diff ============================================================================== --- directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaSyntaxHandlerIT.java (original) +++ directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaSyntaxHandlerIT.java Sun Jan 23 20:11:02 2011 @@ -44,11 +44,11 @@ import javax.naming.directory.SearchResu import org.apache.directory.server.core.annotations.CreateDS; import org.apache.directory.server.core.integ.FrameworkRunner; -import org.apache.directory.shared.ldap.exception.LdapException; -import org.apache.directory.shared.ldap.exception.LdapInvalidDnException; -import org.apache.directory.shared.ldap.exception.LdapUnwillingToPerformException; +import org.apache.directory.shared.ldap.model.exception.LdapException; +import org.apache.directory.shared.ldap.model.exception.LdapInvalidDnException; +import org.apache.directory.shared.ldap.model.exception.LdapUnwillingToPerformException; import org.apache.directory.shared.ldap.ldif.LdifUtils; -import org.apache.directory.shared.ldap.message.ResultCodeEnum; +import org.apache.directory.shared.ldap.model.message.ResultCodeEnum; import org.apache.directory.shared.ldap.name.Dn; import org.apache.directory.shared.ldap.schema.LdapSyntax; import org.apache.directory.shared.ldap.schema.SchemaManager; Modified: directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/schema/ObjectClassCreateIT.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/schema/ObjectClassCreateIT.java?rev=1062511&r1=1062510&r2=1062511&view=diff ============================================================================== --- directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/schema/ObjectClassCreateIT.java (original) +++ directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/schema/ObjectClassCreateIT.java Sun Jan 23 20:11:02 2011 @@ -41,7 +41,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.shared.ldap.constants.MetaSchemaConstants; -import org.apache.directory.shared.ldap.exception.LdapInvalidDnException; +import org.apache.directory.shared.ldap.model.exception.LdapInvalidDnException; import org.apache.directory.shared.ldap.name.Dn; import org.apache.directory.shared.ldap.util.JndiUtils; import org.junit.Test; Modified: directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/schema/SchemaServiceIT.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/schema/SchemaServiceIT.java?rev=1062511&r1=1062510&r2=1062511&view=diff ============================================================================== --- directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/schema/SchemaServiceIT.java (original) +++ directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/schema/SchemaServiceIT.java Sun Jan 23 20:11:02 2011 @@ -49,7 +49,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.shared.ldap.entry.DefaultEntry; -import org.apache.directory.shared.ldap.exception.LdapOtherException; +import org.apache.directory.shared.ldap.model.exception.LdapOtherException; import org.apache.directory.shared.ldap.ldif.LdifEntry; import org.apache.directory.shared.ldap.ldif.LdifReader; import org.junit.Test; Modified: directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/schema/SubschemaSubentryIT.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/schema/SubschemaSubentryIT.java?rev=1062511&r1=1062510&r2=1062511&view=diff ============================================================================== --- directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/schema/SubschemaSubentryIT.java (original) +++ directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/schema/SubschemaSubentryIT.java Sun Jan 23 20:11:02 2011 @@ -64,10 +64,10 @@ 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.shared.ldap.entry.Entry; -import org.apache.directory.shared.ldap.message.ModifyRequest; +import org.apache.directory.shared.ldap.model.message.ModifyRequest; import org.apache.directory.shared.ldap.message.ModifyRequestImpl; -import org.apache.directory.shared.ldap.message.ModifyResponse; -import org.apache.directory.shared.ldap.message.ResultCodeEnum; +import org.apache.directory.shared.ldap.model.message.ModifyResponse; +import org.apache.directory.shared.ldap.model.message.ResultCodeEnum; import org.apache.directory.shared.ldap.name.Dn; import org.apache.directory.shared.ldap.schema.AttributeType; import org.apache.directory.shared.ldap.schema.LdapSyntax;