Return-Path: Delivered-To: apmail-directory-commits-archive@www.apache.org Received: (qmail 34617 invoked from network); 23 Jan 2011 20:12:23 -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:23 -0000 Received: (qmail 44038 invoked by uid 500); 23 Jan 2011 20:12:23 -0000 Delivered-To: apmail-directory-commits-archive@directory.apache.org Received: (qmail 43908 invoked by uid 500); 23 Jan 2011 20:12:23 -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 43900 invoked by uid 99); 23 Jan 2011 20:12:23 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 23 Jan 2011 20:12:23 +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:19 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 36C3C2388BFF; 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 [5/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.36C3C2388BFF@eris.apache.org> Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/DefaultSchemaService.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/DefaultSchemaService.java?rev=1062511&r1=1062510&r2=1062511&view=diff ============================================================================== --- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/DefaultSchemaService.java (original) +++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/DefaultSchemaService.java Sun Jan 23 20:11:02 2011 @@ -30,7 +30,7 @@ import org.apache.directory.shared.ldap. import org.apache.directory.shared.ldap.entry.DefaultEntryAttribute; 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.name.Dn; import org.apache.directory.shared.ldap.schema.AttributeType; import org.apache.directory.shared.ldap.schema.DITContentRule; Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/PartitionSchemaLoader.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/PartitionSchemaLoader.java?rev=1062511&r1=1062510&r2=1062511&view=diff ============================================================================== --- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/PartitionSchemaLoader.java (original) +++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/PartitionSchemaLoader.java Sun Jan 23 20:11:02 2011 @@ -37,9 +37,9 @@ import org.apache.directory.server.i18n. import org.apache.directory.shared.ldap.constants.SchemaConstants; 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.exception.LdapInvalidDnException; -import org.apache.directory.shared.ldap.exception.LdapOtherException; +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.LdapOtherException; import org.apache.directory.shared.ldap.filter.ExprNode; import org.apache.directory.shared.ldap.filter.FilterParser; import org.apache.directory.shared.ldap.filter.SearchScope; Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/SchemaInterceptor.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/SchemaInterceptor.java?rev=1062511&r1=1062510&r2=1062511&view=diff ============================================================================== --- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/SchemaInterceptor.java (original) +++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/SchemaInterceptor.java Sun Jan 23 20:11:02 2011 @@ -63,13 +63,12 @@ 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.LdapAttributeInUseException; -import org.apache.directory.shared.ldap.exception.LdapException; -import org.apache.directory.shared.ldap.exception.LdapInvalidAttributeTypeException; -import org.apache.directory.shared.ldap.exception.LdapInvalidAttributeValueException; -import org.apache.directory.shared.ldap.exception.LdapNoPermissionException; -import org.apache.directory.shared.ldap.exception.LdapNoSuchAttributeException; -import org.apache.directory.shared.ldap.exception.LdapSchemaViolationException; +import org.apache.directory.shared.ldap.model.exception.LdapAttributeInUseException; +import org.apache.directory.shared.ldap.model.exception.*; +import org.apache.directory.shared.ldap.model.exception.LdapInvalidAttributeTypeException; +import org.apache.directory.shared.ldap.model.exception.LdapNoPermissionException; +import org.apache.directory.shared.ldap.model.exception.LdapNoSuchAttributeException; +import org.apache.directory.shared.ldap.model.exception.LdapSchemaViolationException; import org.apache.directory.shared.ldap.filter.ApproximateNode; import org.apache.directory.shared.ldap.filter.AssertionNode; import org.apache.directory.shared.ldap.filter.BranchNode; @@ -82,7 +81,8 @@ import org.apache.directory.shared.ldap. import org.apache.directory.shared.ldap.filter.ScopeNode; import org.apache.directory.shared.ldap.filter.SimpleNode; import org.apache.directory.shared.ldap.filter.SubstringNode; -import org.apache.directory.shared.ldap.message.ResultCodeEnum; +import org.apache.directory.shared.ldap.model.message.ResultCodeEnum; +import org.apache.directory.shared.ldap.model.exception.LdapException; import org.apache.directory.shared.ldap.name.Ava; import org.apache.directory.shared.ldap.name.Dn; import org.apache.directory.shared.ldap.name.Rdn; Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/SchemaLdifToPartitionExtractor.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/SchemaLdifToPartitionExtractor.java?rev=1062511&r1=1062510&r2=1062511&view=diff ============================================================================== --- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/SchemaLdifToPartitionExtractor.java (original) +++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/SchemaLdifToPartitionExtractor.java Sun Jan 23 20:11:02 2011 @@ -40,7 +40,7 @@ import org.apache.directory.shared.ldap. import org.apache.directory.shared.ldap.csn.CsnFactory; 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.model.exception.LdapException; import org.apache.directory.shared.ldap.ldif.LdapLdifException; import org.apache.directory.shared.ldap.ldif.LdifEntry; import org.apache.directory.shared.ldap.ldif.LdifReader; Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/SchemaSubentryManager.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/SchemaSubentryManager.java?rev=1062511&r1=1062510&r2=1062511&view=diff ============================================================================== --- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/SchemaSubentryManager.java (original) +++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/SchemaSubentryManager.java Sun Jan 23 20:11:02 2011 @@ -31,9 +31,9 @@ import org.apache.directory.server.i18n. import org.apache.directory.shared.ldap.constants.SchemaConstants; import org.apache.directory.shared.ldap.entry.EntryAttribute; import org.apache.directory.shared.ldap.entry.Modification; -import org.apache.directory.shared.ldap.exception.LdapException; -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.LdapUnwillingToPerformException; +import org.apache.directory.shared.ldap.model.message.ResultCodeEnum; import org.apache.directory.shared.ldap.schema.AttributeType; import org.apache.directory.shared.ldap.schema.DITContentRule; import org.apache.directory.shared.ldap.schema.DITStructureRule; @@ -181,7 +181,7 @@ public class SchemaSubentryManager break; } - throw new LdapUnwillingToPerformException( ResultCodeEnum.UNWILLING_TO_PERFORM, + throw new LdapUnwillingToPerformException( ResultCodeEnum.UNWILLING_TO_PERFORM, I18n.err( I18n.ERR_283 ) ); default: Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/SchemaSubentryModifier.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/SchemaSubentryModifier.java?rev=1062511&r1=1062510&r2=1062511&view=diff ============================================================================== --- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/SchemaSubentryModifier.java (original) +++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/SchemaSubentryModifier.java Sun Jan 23 20:11:02 2011 @@ -35,8 +35,8 @@ import org.apache.directory.shared.ldap. 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.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.name.Dn; import org.apache.directory.shared.ldap.schema.AttributeType; import org.apache.directory.shared.ldap.schema.DITContentRule; Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/security/TlsKeyGenerator.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/security/TlsKeyGenerator.java?rev=1062511&r1=1062510&r2=1062511&view=diff ============================================================================== --- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/security/TlsKeyGenerator.java (original) +++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/security/TlsKeyGenerator.java Sun Jan 23 20:11:02 2011 @@ -46,7 +46,7 @@ import org.apache.directory.server.i18n. import org.apache.directory.shared.ldap.constants.SchemaConstants; 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.bouncycastle.jce.provider.BouncyCastleProvider; import org.bouncycastle.x509.X509V1CertificateGenerator; import org.slf4j.Logger; @@ -106,7 +106,7 @@ public class TlsKeyGenerator * * @param entry the TLS key/cert entry * @return the X509 certificate associated with that entry - * @throws LdapException if there are problems accessing or decoding + * @throws org.apache.directory.shared.ldap.model.exception.LdapException if there are problems accessing or decoding */ public static X509Certificate getCertificate( Entry entry ) throws LdapException { Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/sp/LdapClassLoader.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/sp/LdapClassLoader.java?rev=1062511&r1=1062510&r2=1062511&view=diff ============================================================================== --- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/sp/LdapClassLoader.java (original) +++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/sp/LdapClassLoader.java Sun Jan 23 20:11:02 2011 @@ -33,12 +33,12 @@ 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.model.exception.LdapException; import org.apache.directory.shared.ldap.filter.AndNode; import org.apache.directory.shared.ldap.filter.BranchNode; import org.apache.directory.shared.ldap.filter.EqualityNode; 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.apache.directory.shared.ldap.schema.AttributeType; import org.slf4j.Logger; Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/sp/StoredProcEngine.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/sp/StoredProcEngine.java?rev=1062511&r1=1062510&r2=1062511&view=diff ============================================================================== --- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/sp/StoredProcEngine.java (original) +++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/sp/StoredProcEngine.java Sun Jan 23 20:11:02 2011 @@ -22,7 +22,7 @@ package org.apache.directory.server.core import org.apache.directory.server.core.CoreSession; 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; /** @@ -55,7 +55,7 @@ public interface StoredProcEngine * @param fullSPName A fully qualified name of the stored procedure including its unit name. * @param spArgs A list or arguments to be passed to the stored procedure. It should be an empty array if there aren't any parameters defined. * @return The value obtained from invoked procedure. The client should know what will return exactly so that it can downcast to the appropriate type. - * @throws LdapException If an error occurs during invocation. + * @throws org.apache.directory.shared.ldap.model.exception.LdapException If an error occurs during invocation. */ public Object invokeProcedure( CoreSession session, String fullSPName, Object[] spArgs ) throws LdapException; Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/sp/StoredProcExecutionManager.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/sp/StoredProcExecutionManager.java?rev=1062511&r1=1062510&r2=1062511&view=diff ============================================================================== --- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/sp/StoredProcExecutionManager.java (original) +++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/sp/StoredProcExecutionManager.java Sun Jan 23 20:11:02 2011 @@ -33,11 +33,11 @@ import org.apache.directory.server.i18n. import org.apache.directory.shared.ldap.constants.SchemaConstants; import org.apache.directory.shared.ldap.entry.Entry; import org.apache.directory.shared.ldap.entry.StringValue; -import org.apache.directory.shared.ldap.exception.LdapException; +import org.apache.directory.shared.ldap.model.exception.LdapException; import org.apache.directory.shared.ldap.filter.EqualityNode; import org.apache.directory.shared.ldap.filter.ExprNode; 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.apache.directory.shared.ldap.schema.AttributeType; import org.apache.directory.shared.ldap.schema.AttributeTypeOptions; @@ -109,7 +109,7 @@ public class StoredProcExecutionManager * * @param spUnitEntry The entry which a {@link StoredProcEngine} type will be mathched with respect to the language identifier. * @return A {@link StoredProcEngine} associated with spUnitEntry. - * @throws LdapException If no {@link StoredProcEngine} that can be associated with the language identifier in spUnitEntry can be found. + * @throws org.apache.directory.shared.ldap.model.exception.LdapException If no {@link StoredProcEngine} that can be associated with the language identifier in spUnitEntry can be found. */ public StoredProcEngine getStoredProcEngineInstance( ClonedServerEntry spUnitEntry ) throws LdapException { Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/sp/java/JavaStoredProcEngine.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/sp/java/JavaStoredProcEngine.java?rev=1062511&r1=1062510&r2=1062511&view=diff ============================================================================== --- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/sp/java/JavaStoredProcEngine.java (original) +++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/sp/java/JavaStoredProcEngine.java Sun Jan 23 20:11:02 2011 @@ -32,7 +32,7 @@ import org.apache.directory.server.core. import org.apache.directory.server.core.sp.StoredProcUtils; 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.util.MethodUtils; Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/sp/java/LdapJavaStoredProcClassLoader.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/sp/java/LdapJavaStoredProcClassLoader.java?rev=1062511&r1=1062510&r2=1062511&view=diff ============================================================================== --- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/sp/java/LdapJavaStoredProcClassLoader.java (original) +++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/sp/java/LdapJavaStoredProcClassLoader.java Sun Jan 23 20:11:02 2011 @@ -22,7 +22,7 @@ package org.apache.directory.server.core 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; /** Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/subtree/RefinementEvaluator.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/subtree/RefinementEvaluator.java?rev=1062511&r1=1062510&r2=1062511&view=diff ============================================================================== --- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/subtree/RefinementEvaluator.java (original) +++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/subtree/RefinementEvaluator.java Sun Jan 23 20:11:02 2011 @@ -23,7 +23,7 @@ package org.apache.directory.server.core import org.apache.directory.server.i18n.I18n; import org.apache.directory.shared.ldap.constants.SchemaConstants; 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.filter.AndNode; import org.apache.directory.shared.ldap.filter.BranchNode; import org.apache.directory.shared.ldap.filter.ExprNode; Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/subtree/RefinementLeafEvaluator.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/subtree/RefinementLeafEvaluator.java?rev=1062511&r1=1062510&r2=1062511&view=diff ============================================================================== --- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/subtree/RefinementLeafEvaluator.java (original) +++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/subtree/RefinementLeafEvaluator.java Sun Jan 23 20:11:02 2011 @@ -25,7 +25,7 @@ import java.util.Iterator; import org.apache.directory.server.i18n.I18n; import org.apache.directory.shared.ldap.constants.SchemaConstants; 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.filter.EqualityNode; import org.apache.directory.shared.ldap.filter.SimpleNode; import org.apache.directory.shared.ldap.schema.AttributeType; Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/subtree/SubentryInterceptor.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/subtree/SubentryInterceptor.java?rev=1062511&r1=1062510&r2=1062511&view=diff ============================================================================== --- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/subtree/SubentryInterceptor.java (original) +++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/subtree/SubentryInterceptor.java Sun Jan 23 20:11:02 2011 @@ -63,19 +63,19 @@ import org.apache.directory.shared.ldap. import org.apache.directory.shared.ldap.entry.ModificationOperation; 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.exception.LdapNoSuchAttributeException; -import org.apache.directory.shared.ldap.exception.LdapOperationErrorException; -import org.apache.directory.shared.ldap.exception.LdapOperationException; -import org.apache.directory.shared.ldap.exception.LdapOtherException; -import org.apache.directory.shared.ldap.exception.LdapSchemaViolationException; +import org.apache.directory.shared.ldap.model.exception.*; +import org.apache.directory.shared.ldap.model.exception.LdapInvalidAttributeValueException; +import org.apache.directory.shared.ldap.model.exception.LdapOperationErrorException; +import org.apache.directory.shared.ldap.model.exception.LdapOperationException; +import org.apache.directory.shared.ldap.model.exception.LdapOtherException; +import org.apache.directory.shared.ldap.model.exception.LdapSchemaViolationException; import org.apache.directory.shared.ldap.filter.EqualityNode; import org.apache.directory.shared.ldap.filter.ExprNode; import org.apache.directory.shared.ldap.filter.PresenceNode; import org.apache.directory.shared.ldap.filter.SearchScope; -import org.apache.directory.shared.ldap.message.AliasDerefMode; -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.ResultCodeEnum; +import org.apache.directory.shared.ldap.model.exception.LdapException; import org.apache.directory.shared.ldap.name.Dn; import org.apache.directory.shared.ldap.schema.AttributeType; import org.apache.directory.shared.ldap.subtree.AdministrativeRole; Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/subtree/SubtreeEvaluator.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/subtree/SubtreeEvaluator.java?rev=1062511&r1=1062510&r2=1062511&view=diff ============================================================================== --- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/subtree/SubtreeEvaluator.java (original) +++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/subtree/SubtreeEvaluator.java Sun Jan 23 20:11:02 2011 @@ -23,7 +23,7 @@ package org.apache.directory.server.core import org.apache.directory.server.core.event.Evaluator; import org.apache.directory.server.core.event.ExpressionEvaluator; 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.name.Dn; import org.apache.directory.shared.ldap.schema.SchemaManager; import org.apache.directory.shared.ldap.subtree.SubtreeSpecification; Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/trigger/AbstractStoredProcedureParameterInjector.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/trigger/AbstractStoredProcedureParameterInjector.java?rev=1062511&r1=1062510&r2=1062511&view=diff ============================================================================== --- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/trigger/AbstractStoredProcedureParameterInjector.java (original) +++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/trigger/AbstractStoredProcedureParameterInjector.java Sun Jan 23 20:11:02 2011 @@ -29,8 +29,8 @@ import java.util.Map; import org.apache.directory.server.core.interceptor.context.OperationContext; import org.apache.directory.server.core.partition.ByPassConstants; -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.name.Dn; import org.apache.directory.shared.ldap.trigger.StoredProcedureParameter; import org.apache.directory.shared.ldap.trigger.StoredProcedureParameter.Generic_LDAP_CONTEXT; Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/trigger/AddStoredProcedureParameterInjector.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/trigger/AddStoredProcedureParameterInjector.java?rev=1062511&r1=1062510&r2=1062511&view=diff ============================================================================== --- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/trigger/AddStoredProcedureParameterInjector.java (original) +++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/trigger/AddStoredProcedureParameterInjector.java Sun Jan 23 20:11:02 2011 @@ -24,8 +24,8 @@ import java.util.Map; import org.apache.directory.server.core.interceptor.context.OperationContext; 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.model.exception.LdapException; +import org.apache.directory.shared.ldap.model.exception.LdapInvalidDnException; import org.apache.directory.shared.ldap.name.Dn; import org.apache.directory.shared.ldap.trigger.StoredProcedureParameter; Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/trigger/DeleteStoredProcedureParameterInjector.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/trigger/DeleteStoredProcedureParameterInjector.java?rev=1062511&r1=1062510&r2=1062511&view=diff ============================================================================== --- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/trigger/DeleteStoredProcedureParameterInjector.java (original) +++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/trigger/DeleteStoredProcedureParameterInjector.java Sun Jan 23 20:11:02 2011 @@ -25,7 +25,7 @@ import java.util.Map; import org.apache.directory.server.core.interceptor.context.OperationContext; import org.apache.directory.server.core.partition.ByPassConstants; 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.name.Dn; import org.apache.directory.shared.ldap.trigger.StoredProcedureParameter; Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/trigger/ModifyDNStoredProcedureParameterInjector.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/trigger/ModifyDNStoredProcedureParameterInjector.java?rev=1062511&r1=1062510&r2=1062511&view=diff ============================================================================== --- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/trigger/ModifyDNStoredProcedureParameterInjector.java (original) +++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/trigger/ModifyDNStoredProcedureParameterInjector.java Sun Jan 23 20:11:02 2011 @@ -23,7 +23,7 @@ package org.apache.directory.server.core import java.util.Map; import org.apache.directory.server.core.interceptor.context.OperationContext; -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.name.Rdn; import org.apache.directory.shared.ldap.trigger.StoredProcedureParameter; Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/trigger/ModifyStoredProcedureParameterInjector.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/trigger/ModifyStoredProcedureParameterInjector.java?rev=1062511&r1=1062510&r2=1062511&view=diff ============================================================================== --- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/trigger/ModifyStoredProcedureParameterInjector.java (original) +++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/trigger/ModifyStoredProcedureParameterInjector.java Sun Jan 23 20:11:02 2011 @@ -29,8 +29,8 @@ import org.apache.directory.server.core. import org.apache.directory.server.core.partition.ByPassConstants; 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.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.name.Dn; import org.apache.directory.shared.ldap.trigger.StoredProcedureParameter; Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/trigger/SimpleTriggerExecutionAuthorizer.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/trigger/SimpleTriggerExecutionAuthorizer.java?rev=1062511&r1=1062510&r2=1062511&view=diff ============================================================================== --- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/trigger/SimpleTriggerExecutionAuthorizer.java (original) +++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/trigger/SimpleTriggerExecutionAuthorizer.java Sun Jan 23 20:11:02 2011 @@ -22,8 +22,8 @@ package org.apache.directory.server.core import org.apache.directory.server.constants.ServerDNConstants; import org.apache.directory.server.core.interceptor.context.OperationContext; -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.name.Dn; Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/trigger/StoredProcedureParameterInjector.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/trigger/StoredProcedureParameterInjector.java?rev=1062511&r1=1062510&r2=1062511&view=diff ============================================================================== --- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/trigger/StoredProcedureParameterInjector.java (original) +++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/trigger/StoredProcedureParameterInjector.java Sun Jan 23 20:11:02 2011 @@ -23,7 +23,7 @@ package org.apache.directory.server.core import java.util.List; import org.apache.directory.server.core.interceptor.context.OperationContext; -import org.apache.directory.shared.ldap.exception.LdapException; +import org.apache.directory.shared.ldap.model.exception.LdapException; import org.apache.directory.shared.ldap.trigger.StoredProcedureParameter; Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/trigger/TriggerExecutionAuthorizer.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/trigger/TriggerExecutionAuthorizer.java?rev=1062511&r1=1062510&r2=1062511&view=diff ============================================================================== --- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/trigger/TriggerExecutionAuthorizer.java (original) +++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/trigger/TriggerExecutionAuthorizer.java Sun Jan 23 20:11:02 2011 @@ -21,7 +21,7 @@ package org.apache.directory.server.core import org.apache.directory.server.core.interceptor.context.OperationContext; -import org.apache.directory.shared.ldap.exception.LdapException; +import org.apache.directory.shared.ldap.model.exception.LdapException; public interface TriggerExecutionAuthorizer Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/trigger/TriggerInterceptor.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/trigger/TriggerInterceptor.java?rev=1062511&r1=1062510&r2=1062511&view=diff ============================================================================== --- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/trigger/TriggerInterceptor.java (original) +++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/trigger/TriggerInterceptor.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.Entry; import org.apache.directory.shared.ldap.entry.EntryAttribute; import org.apache.directory.shared.ldap.entry.Value; -import org.apache.directory.shared.ldap.exception.LdapException; -import org.apache.directory.shared.ldap.exception.LdapOperationErrorException; -import org.apache.directory.shared.ldap.exception.LdapOtherException; +import org.apache.directory.shared.ldap.model.exception.LdapException; +import org.apache.directory.shared.ldap.model.exception.LdapOperationErrorException; +import org.apache.directory.shared.ldap.model.exception.LdapOtherException; import org.apache.directory.shared.ldap.name.Dn; import org.apache.directory.shared.ldap.name.Rdn; import org.apache.directory.shared.ldap.schema.NormalizerMappingResolver; Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/trigger/TriggerSpecCache.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/trigger/TriggerSpecCache.java?rev=1062511&r1=1062510&r2=1062511&view=diff ============================================================================== --- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/trigger/TriggerSpecCache.java (original) +++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/trigger/TriggerSpecCache.java Sun Jan 23 20:11:02 2011 @@ -49,11 +49,11 @@ 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.LdapOperationException; +import org.apache.directory.shared.ldap.model.exception.LdapException; +import org.apache.directory.shared.ldap.model.exception.LdapOperationException; import org.apache.directory.shared.ldap.filter.EqualityNode; import org.apache.directory.shared.ldap.filter.ExprNode; -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.schema.AttributeType; import org.apache.directory.shared.ldap.schema.NormalizerMappingResolver; Modified: directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/authz/support/DummyAttributeTypeRegistry.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/authz/support/DummyAttributeTypeRegistry.java?rev=1062511&r1=1062510&r2=1062511&view=diff ============================================================================== --- directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/authz/support/DummyAttributeTypeRegistry.java (original) +++ directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/authz/support/DummyAttributeTypeRegistry.java Sun Jan 23 20:11:02 2011 @@ -25,7 +25,7 @@ import java.util.Iterator; import java.util.Map; import java.util.Set; -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.LdapSyntax; import org.apache.directory.shared.ldap.schema.MatchingRule; Modified: directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/authz/support/DummyOidRegistry.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/authz/support/DummyOidRegistry.java?rev=1062511&r1=1062510&r2=1062511&view=diff ============================================================================== --- directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/authz/support/DummyOidRegistry.java (original) +++ directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/authz/support/DummyOidRegistry.java Sun Jan 23 20:11:02 2011 @@ -25,7 +25,7 @@ import java.util.Iterator; import java.util.List; import java.util.Map; -import org.apache.directory.shared.ldap.exception.LdapException; +import org.apache.directory.shared.ldap.model.exception.LdapException; import org.apache.directory.shared.ldap.schema.registries.OidRegistry; Modified: directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/authz/support/RelatedUserClassFilterTest.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/authz/support/RelatedUserClassFilterTest.java?rev=1062511&r1=1062510&r2=1062511&view=diff ============================================================================== --- directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/authz/support/RelatedUserClassFilterTest.java (original) +++ directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/authz/support/RelatedUserClassFilterTest.java Sun Jan 23 20:11:02 2011 @@ -36,7 +36,7 @@ import org.apache.directory.shared.ldap. import org.apache.directory.shared.ldap.aci.ProtectedItem; import org.apache.directory.shared.ldap.aci.UserClass; import org.apache.directory.shared.ldap.constants.AuthenticationLevel; -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.schemamanager.impl.DefaultSchemaManager; import org.junit.BeforeClass; Modified: directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/changelog/MemoryChangeLogStoreTest.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/changelog/MemoryChangeLogStoreTest.java?rev=1062511&r1=1062510&r2=1062511&view=diff ============================================================================== --- directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/changelog/MemoryChangeLogStoreTest.java (original) +++ directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/changelog/MemoryChangeLogStoreTest.java Sun Jan 23 20:11:02 2011 @@ -37,7 +37,7 @@ import org.apache.directory.junit.tools. import org.apache.directory.server.core.LdapPrincipal; import org.apache.directory.shared.ldap.constants.AuthenticationLevel; import org.apache.directory.shared.ldap.constants.SchemaConstants; -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.LdifRevertor; Modified: directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/prefs/PreferencesUtilsTest.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/prefs/PreferencesUtilsTest.java?rev=1062511&r1=1062510&r2=1062511&view=diff ============================================================================== --- directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/prefs/PreferencesUtilsTest.java (original) +++ directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/prefs/PreferencesUtilsTest.java Sun Jan 23 20:11:02 2011 @@ -25,7 +25,7 @@ import static org.junit.Assert.assertEqu import org.apache.directory.junit.tools.Concurrent; import org.apache.directory.junit.tools.ConcurrentJunitRunner; import org.apache.directory.server.constants.ServerDNConstants; -import org.apache.directory.shared.ldap.exception.LdapException; +import org.apache.directory.shared.ldap.model.exception.LdapException; import org.apache.directory.shared.ldap.name.Dn; import org.junit.Test; import org.junit.runner.RunWith; Modified: directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/subtree/RefinementLeafEvaluatorTest.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/subtree/RefinementLeafEvaluatorTest.java?rev=1062511&r1=1062510&r2=1062511&view=diff ============================================================================== --- directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/subtree/RefinementLeafEvaluatorTest.java (original) +++ directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/subtree/RefinementLeafEvaluatorTest.java Sun Jan 23 20:11:02 2011 @@ -30,7 +30,7 @@ import org.apache.directory.shared.ldap. import org.apache.directory.shared.ldap.entry.DefaultEntryAttribute; import org.apache.directory.shared.ldap.entry.EntryAttribute; import org.apache.directory.shared.ldap.entry.StringValue; -import org.apache.directory.shared.ldap.exception.LdapException; +import org.apache.directory.shared.ldap.model.exception.LdapException; import org.apache.directory.shared.ldap.filter.EqualityNode; import org.apache.directory.shared.ldap.filter.GreaterEqNode; import org.apache.directory.shared.ldap.schema.AttributeType; Modified: directory/apacheds/trunk/http-directory-bridge/src/main/java/org/apache/directory/server/BindResponseHolder.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/http-directory-bridge/src/main/java/org/apache/directory/server/BindResponseHolder.java?rev=1062511&r1=1062510&r2=1062511&view=diff ============================================================================== --- directory/apacheds/trunk/http-directory-bridge/src/main/java/org/apache/directory/server/BindResponseHolder.java (original) +++ directory/apacheds/trunk/http-directory-bridge/src/main/java/org/apache/directory/server/BindResponseHolder.java Sun Jan 23 20:11:02 2011 @@ -22,7 +22,7 @@ package org.apache.directory.server; import org.apache.directory.ldap.client.api.LdapConnection; -import org.apache.directory.shared.ldap.message.BindResponse; +import org.apache.directory.shared.ldap.model.message.BindResponse; /** Modified: directory/apacheds/trunk/http-directory-bridge/src/main/java/org/apache/directory/server/HttpDirectoryService.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/http-directory-bridge/src/main/java/org/apache/directory/server/HttpDirectoryService.java?rev=1062511&r1=1062510&r2=1062511&view=diff ============================================================================== --- directory/apacheds/trunk/http-directory-bridge/src/main/java/org/apache/directory/server/HttpDirectoryService.java (original) +++ directory/apacheds/trunk/http-directory-bridge/src/main/java/org/apache/directory/server/HttpDirectoryService.java Sun Jan 23 20:11:02 2011 @@ -23,11 +23,11 @@ package org.apache.directory.server; import org.apache.directory.server.core.DirectoryService; import org.apache.directory.server.core.LdapCoreSessionConnection; -import org.apache.directory.shared.ldap.message.BindRequest; -import org.apache.directory.shared.ldap.message.BindResponse; +import org.apache.directory.shared.ldap.model.message.BindRequest; +import org.apache.directory.shared.ldap.model.message.BindResponse; import org.apache.directory.shared.ldap.message.BindResponseImpl; -import org.apache.directory.shared.ldap.message.LdapResult; -import org.apache.directory.shared.ldap.message.ResultCodeEnum; +import org.apache.directory.shared.ldap.model.message.LdapResult; +import org.apache.directory.shared.ldap.model.message.ResultCodeEnum; import org.apache.directory.shared.ldap.schema.SchemaManager; @@ -88,7 +88,7 @@ public class HttpDirectoryService LdapResult result = resp.getLdapResult(); result.setErrorMessage( e.getMessage() ); - result.setResultCode( ResultCodeEnum.getResultCode( e ) ); + result.setResultCode( ResultCodeEnum.getResultCode(e) ); holder = new BindResponseHolder( resp, null ); } Modified: directory/apacheds/trunk/interceptor-kerberos/src/main/java/org/apache/directory/server/core/kerberos/KeyDerivationInterceptor.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/interceptor-kerberos/src/main/java/org/apache/directory/server/core/kerberos/KeyDerivationInterceptor.java?rev=1062511&r1=1062510&r2=1062511&view=diff ============================================================================== --- directory/apacheds/trunk/interceptor-kerberos/src/main/java/org/apache/directory/server/core/kerberos/KeyDerivationInterceptor.java (original) +++ directory/apacheds/trunk/interceptor-kerberos/src/main/java/org/apache/directory/server/core/kerberos/KeyDerivationInterceptor.java Sun Jan 23 20:11:02 2011 @@ -67,8 +67,8 @@ import org.apache.directory.shared.ldap. import org.apache.directory.shared.ldap.entry.ModificationOperation; import org.apache.directory.shared.ldap.entry.StringValue; import org.apache.directory.shared.ldap.entry.Value; -import org.apache.directory.shared.ldap.exception.LdapAuthenticationException; -import org.apache.directory.shared.ldap.exception.LdapException; +import org.apache.directory.shared.ldap.model.exception.LdapAuthenticationException; +import org.apache.directory.shared.ldap.model.exception.LdapException; import org.apache.directory.shared.ldap.name.Dn; import org.apache.directory.shared.ldap.schema.SchemaManager; import org.apache.directory.shared.util.Strings; Modified: directory/apacheds/trunk/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmStoreTest.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmStoreTest.java?rev=1062511&r1=1062510&r2=1062511&view=diff ============================================================================== --- directory/apacheds/trunk/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmStoreTest.java (original) +++ directory/apacheds/trunk/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmStoreTest.java Sun Jan 23 20:11:02 2011 @@ -53,8 +53,8 @@ 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.LdapNoSuchObjectException; -import org.apache.directory.shared.ldap.exception.LdapSchemaViolationException; +import org.apache.directory.shared.ldap.model.exception.LdapNoSuchObjectException; +import org.apache.directory.shared.ldap.model.exception.LdapSchemaViolationException; 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/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/MockComparatorRegistry.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/MockComparatorRegistry.java?rev=1062511&r1=1062510&r2=1062511&view=diff ============================================================================== --- directory/apacheds/trunk/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/MockComparatorRegistry.java (original) +++ directory/apacheds/trunk/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/MockComparatorRegistry.java Sun Jan 23 20:11:02 2011 @@ -22,7 +22,7 @@ package org.apache.directory.server.core import java.util.Iterator; -import org.apache.directory.shared.ldap.exception.LdapException; +import org.apache.directory.shared.ldap.model.exception.LdapException; import org.apache.directory.shared.ldap.schema.LdapComparator; import org.apache.directory.shared.ldap.schema.parsers.LdapComparatorDescription; import org.apache.directory.shared.ldap.schema.registries.DefaultComparatorRegistry; Modified: directory/apacheds/trunk/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/tree/PartitionTreeTest.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/tree/PartitionTreeTest.java?rev=1062511&r1=1062510&r2=1062511&view=diff ============================================================================== --- directory/apacheds/trunk/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/tree/PartitionTreeTest.java (original) +++ directory/apacheds/trunk/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/tree/PartitionTreeTest.java Sun Jan 23 20:11:02 2011 @@ -26,7 +26,7 @@ import static org.junit.Assert.assertTru import org.apache.directory.server.core.partition.Partition; import org.apache.directory.server.core.partition.impl.btree.jdbm.JdbmPartition; -import org.apache.directory.shared.ldap.exception.LdapException; +import org.apache.directory.shared.ldap.model.exception.LdapException; import org.apache.directory.shared.ldap.name.Dn; import org.apache.directory.shared.ldap.name.Rdn; import org.apache.directory.shared.ldap.util.tree.DnNode; Modified: directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/server/kerberos/shared/store/PrincipalStoreEntryModifier.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/server/kerberos/shared/store/PrincipalStoreEntryModifier.java?rev=1062511&r1=1062510&r2=1062511&view=diff ============================================================================== --- directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/server/kerberos/shared/store/PrincipalStoreEntryModifier.java (original) +++ directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/server/kerberos/shared/store/PrincipalStoreEntryModifier.java Sun Jan 23 20:11:02 2011 @@ -36,7 +36,7 @@ import org.apache.directory.shared.kerbe 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.model.exception.LdapException; /** Modified: directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/server/kerberos/shared/store/operations/StoreUtils.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/server/kerberos/shared/store/operations/StoreUtils.java?rev=1062511&r1=1062510&r2=1062511&view=diff ============================================================================== --- directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/server/kerberos/shared/store/operations/StoreUtils.java (original) +++ directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/server/kerberos/shared/store/operations/StoreUtils.java Sun Jan 23 20:11:02 2011 @@ -35,7 +35,7 @@ import org.apache.directory.shared.ldap. import org.apache.directory.shared.ldap.filter.EqualityNode; import org.apache.directory.shared.ldap.filter.ExprNode; 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.apache.directory.shared.ldap.schema.AttributeType; import org.apache.directory.shared.ldap.schema.SchemaManager; Modified: directory/apacheds/trunk/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/LdapConnectionTest.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/LdapConnectionTest.java?rev=1062511&r1=1062510&r2=1062511&view=diff ============================================================================== --- directory/apacheds/trunk/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/LdapConnectionTest.java (original) +++ directory/apacheds/trunk/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/LdapConnectionTest.java Sun Jan 23 20:11:02 2011 @@ -42,13 +42,13 @@ 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.entry.StringValue; -import org.apache.directory.shared.ldap.exception.LdapException; +import org.apache.directory.shared.ldap.model.exception.LdapException; import org.apache.directory.shared.ldap.filter.EqualityNode; import org.apache.directory.shared.ldap.filter.SearchScope; -import org.apache.directory.shared.ldap.message.BindResponse; -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.BindResponse; +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.schema.SchemaManager; import org.junit.After; import org.junit.Before; @@ -174,7 +174,7 @@ public class LdapConnectionTest extends Cursor cursor = connection.search( ADMIN_DN, filter.toString(), SearchScope.SUBTREE, "+" ); cursor.next(); - Entry readEntry = ( ( SearchResultEntry ) cursor.get() ).getEntry(); + Entry readEntry = ( (SearchResultEntry) cursor.get() ).getEntry(); assertEquals( uuid, readEntry.get( SchemaConstants.ENTRY_UUID_AT ).getString() ); cursor.close(); Modified: directory/apacheds/trunk/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/LdapSSLConnectionTest.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/LdapSSLConnectionTest.java?rev=1062511&r1=1062510&r2=1062511&view=diff ============================================================================== --- directory/apacheds/trunk/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/LdapSSLConnectionTest.java (original) +++ directory/apacheds/trunk/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/LdapSSLConnectionTest.java Sun Jan 23 20:11:02 2011 @@ -43,7 +43,7 @@ import org.apache.directory.server.ldap. import org.apache.directory.server.ldap.handlers.bind.plain.PlainMechanismHandler; import org.apache.directory.server.ldap.handlers.extended.StartTlsHandler; import org.apache.directory.shared.ldap.constants.SupportedSaslMechanisms; -import org.apache.directory.shared.ldap.message.BindResponse; +import org.apache.directory.shared.ldap.model.message.BindResponse; import org.apache.directory.shared.ldap.name.Dn; import org.junit.Before; import org.junit.Test; Modified: directory/apacheds/trunk/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/ClientAbandonRequestTest.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/ClientAbandonRequestTest.java?rev=1062511&r1=1062510&r2=1062511&view=diff ============================================================================== --- directory/apacheds/trunk/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/ClientAbandonRequestTest.java (original) +++ directory/apacheds/trunk/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/ClientAbandonRequestTest.java Sun Jan 23 20:11:02 2011 @@ -38,11 +38,11 @@ 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.AliasDerefMode; -import org.apache.directory.shared.ldap.message.Response; -import org.apache.directory.shared.ldap.message.SearchRequest; +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.SearchRequest; import org.apache.directory.shared.ldap.message.SearchRequestImpl; -import org.apache.directory.shared.ldap.message.SearchResultDone; +import org.apache.directory.shared.ldap.model.message.SearchResultDone; import org.apache.directory.shared.ldap.name.Dn; import org.junit.After; import org.junit.Before; Modified: directory/apacheds/trunk/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/ClientAddRequestTest.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/ClientAddRequestTest.java?rev=1062511&r1=1062510&r2=1062511&view=diff ============================================================================== --- directory/apacheds/trunk/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/ClientAddRequestTest.java (original) +++ directory/apacheds/trunk/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/ClientAddRequestTest.java Sun Jan 23 20:11:02 2011 @@ -43,11 +43,11 @@ import org.apache.directory.shared.ldap. import org.apache.directory.shared.ldap.csn.CsnFactory; import org.apache.directory.shared.ldap.entry.DefaultEntry; import org.apache.directory.shared.ldap.entry.Entry; -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.BindResponse; -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.BindResponse; +import org.apache.directory.shared.ldap.model.message.ResultCodeEnum; import org.apache.directory.shared.ldap.name.Dn; import org.apache.directory.shared.util.DateUtils; import org.junit.After; Modified: directory/apacheds/trunk/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/ClientCompareRequestTest.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/ClientCompareRequestTest.java?rev=1062511&r1=1062510&r2=1062511&view=diff ============================================================================== --- directory/apacheds/trunk/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/ClientCompareRequestTest.java (original) +++ directory/apacheds/trunk/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/ClientCompareRequestTest.java Sun Jan 23 20:11:02 2011 @@ -37,10 +37,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.constants.SchemaConstants; -import org.apache.directory.shared.ldap.message.CompareRequest; +import org.apache.directory.shared.ldap.model.message.CompareRequest; import org.apache.directory.shared.ldap.message.CompareRequestImpl; -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/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/ClientDeleteRequestTest.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/ClientDeleteRequestTest.java?rev=1062511&r1=1062510&r2=1062511&view=diff ============================================================================== --- directory/apacheds/trunk/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/ClientDeleteRequestTest.java (original) +++ directory/apacheds/trunk/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/ClientDeleteRequestTest.java Sun Jan 23 20:11:02 2011 @@ -41,11 +41,11 @@ import org.apache.directory.server.core. import org.apache.directory.server.core.annotations.ApplyLdifs; import org.apache.directory.server.core.integ.AbstractLdapTestUnit; import org.apache.directory.server.core.integ.FrameworkRunner; -import org.apache.directory.shared.ldap.exception.LdapException; -import org.apache.directory.shared.ldap.message.DeleteRequest; +import org.apache.directory.shared.ldap.model.exception.LdapException; +import org.apache.directory.shared.ldap.model.message.DeleteRequest; import org.apache.directory.shared.ldap.message.DeleteRequestImpl; -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/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/ClientExtendedRequestTest.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/ClientExtendedRequestTest.java?rev=1062511&r1=1062510&r2=1062511&view=diff ============================================================================== --- directory/apacheds/trunk/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/ClientExtendedRequestTest.java (original) +++ directory/apacheds/trunk/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/ClientExtendedRequestTest.java Sun Jan 23 20:11:02 2011 @@ -39,10 +39,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.server.ldap.handlers.extended.StartTlsHandler; -import org.apache.directory.shared.ldap.message.ExtendedRequest; +import org.apache.directory.shared.ldap.model.message.ExtendedRequest; import org.apache.directory.shared.ldap.message.ExtendedRequestImpl; -import org.apache.directory.shared.ldap.message.ExtendedResponse; -import org.apache.directory.shared.ldap.message.ResultCodeEnum; +import org.apache.directory.shared.ldap.model.message.ExtendedResponse; +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; @@ -115,7 +115,7 @@ public class ClientExtendedRequestTest e try { - ExtendedResponse extendedResponse = ( ExtendedResponse ) extendedFuture.get( 1000, TimeUnit.MILLISECONDS ); + ExtendedResponse extendedResponse = (ExtendedResponse) extendedFuture.get( 1000, TimeUnit.MILLISECONDS ); assertNotNull( extendedResponse ); assertEquals( ResultCodeEnum.SUCCESS, extendedResponse.getLdapResult().getResultCode() ); Modified: directory/apacheds/trunk/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/ClientModifyDnRequestTest.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/ClientModifyDnRequestTest.java?rev=1062511&r1=1062510&r2=1062511&view=diff ============================================================================== --- directory/apacheds/trunk/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/ClientModifyDnRequestTest.java (original) +++ directory/apacheds/trunk/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/ClientModifyDnRequestTest.java Sun Jan 23 20:11:02 2011 @@ -39,9 +39,9 @@ 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.ModifyDnRequest; +import org.apache.directory.shared.ldap.model.message.ModifyDnRequest; import org.apache.directory.shared.ldap.message.ModifyDnRequestImpl; -import org.apache.directory.shared.ldap.message.ModifyDnResponse; +import org.apache.directory.shared.ldap.model.message.ModifyDnResponse; import org.apache.directory.shared.ldap.name.Dn; import org.apache.directory.shared.ldap.name.Rdn; import org.junit.After; Modified: directory/apacheds/trunk/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/ClientModifyRequestTest.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/ClientModifyRequestTest.java?rev=1062511&r1=1062510&r2=1062511&view=diff ============================================================================== --- directory/apacheds/trunk/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/ClientModifyRequestTest.java (original) +++ directory/apacheds/trunk/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/ClientModifyRequestTest.java Sun Jan 23 20:11:02 2011 @@ -45,10 +45,10 @@ 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.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.apache.directory.shared.util.DateUtils; import org.junit.After; Modified: directory/apacheds/trunk/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/bind/SimpleBindRequestTest.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/bind/SimpleBindRequestTest.java?rev=1062511&r1=1062510&r2=1062511&view=diff ============================================================================== --- directory/apacheds/trunk/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/bind/SimpleBindRequestTest.java (original) +++ directory/apacheds/trunk/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/bind/SimpleBindRequestTest.java Sun Jan 23 20:11:02 2011 @@ -41,12 +41,12 @@ import org.apache.directory.server.core. import org.apache.directory.server.core.interceptor.BaseInterceptor; import org.apache.directory.server.core.interceptor.NextInterceptor; import org.apache.directory.server.core.interceptor.context.BindOperationContext; -import org.apache.directory.shared.ldap.exception.LdapException; -import org.apache.directory.shared.ldap.message.BindRequest; +import org.apache.directory.shared.ldap.model.exception.LdapException; +import org.apache.directory.shared.ldap.model.message.BindRequest; import org.apache.directory.shared.ldap.message.BindRequestImpl; -import org.apache.directory.shared.ldap.message.BindResponse; -import org.apache.directory.shared.ldap.message.LdapResult; -import org.apache.directory.shared.ldap.message.ResultCodeEnum; +import org.apache.directory.shared.ldap.model.message.BindResponse; +import org.apache.directory.shared.ldap.model.message.LdapResult; +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/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/search/ClientSearchRequestTest.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/search/ClientSearchRequestTest.java?rev=1062511&r1=1062510&r2=1062511&view=diff ============================================================================== --- directory/apacheds/trunk/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/search/ClientSearchRequestTest.java (original) +++ directory/apacheds/trunk/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/search/ClientSearchRequestTest.java Sun Jan 23 20:11:02 2011 @@ -38,15 +38,15 @@ import org.apache.directory.server.core. import org.apache.directory.shared.ldap.cursor.Cursor; import org.apache.directory.shared.ldap.cursor.SearchCursor; 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.filter.SearchScope; -import org.apache.directory.shared.ldap.message.AliasDerefMode; -import org.apache.directory.shared.ldap.message.Response; -import org.apache.directory.shared.ldap.message.ResultCodeEnum; -import org.apache.directory.shared.ldap.message.SearchRequest; +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.ResultCodeEnum; +import org.apache.directory.shared.ldap.model.message.SearchRequest; import org.apache.directory.shared.ldap.message.SearchRequestImpl; -import org.apache.directory.shared.ldap.message.SearchResultDone; -import org.apache.directory.shared.ldap.message.SearchResultEntry; +import org.apache.directory.shared.ldap.model.message.SearchResultDone; +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; Modified: directory/apacheds/trunk/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/search/SearchRequestReturningAttributesTest.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/search/SearchRequestReturningAttributesTest.java?rev=1062511&r1=1062510&r2=1062511&view=diff ============================================================================== --- directory/apacheds/trunk/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/search/SearchRequestReturningAttributesTest.java (original) +++ directory/apacheds/trunk/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/search/SearchRequestReturningAttributesTest.java Sun Jan 23 20:11:02 2011 @@ -38,10 +38,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.Response; -import org.apache.directory.shared.ldap.message.SearchRequest; +import org.apache.directory.shared.ldap.model.message.Response; +import org.apache.directory.shared.ldap.model.message.SearchRequest; import org.apache.directory.shared.ldap.message.SearchRequestImpl; -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.junit.AfterClass; import org.junit.Before; @@ -440,7 +440,7 @@ public class SearchRequestReturningAttri assertEquals( 1, count ); assertNotNull( response ); assertTrue( response instanceof SearchResultEntry ); - SearchResultEntry resultEntry = ( SearchResultEntry ) response; + SearchResultEntry resultEntry = (SearchResultEntry) response; Entry entry = resultEntry.getEntry(); assertEquals( 0, entry.size() ); Modified: directory/apacheds/trunk/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/perf/TestClientApiPerf.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/perf/TestClientApiPerf.java?rev=1062511&r1=1062510&r2=1062511&view=diff ============================================================================== --- directory/apacheds/trunk/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/perf/TestClientApiPerf.java (original) +++ directory/apacheds/trunk/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/perf/TestClientApiPerf.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.cursor.Cursor; 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.junit.Test; import org.junit.runner.RunWith; Modified: directory/apacheds/trunk/ldif-partition/src/main/java/org/apache/directory/server/core/partition/ldif/AbstractLdifPartition.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/ldif-partition/src/main/java/org/apache/directory/server/core/partition/ldif/AbstractLdifPartition.java?rev=1062511&r1=1062510&r2=1062511&view=diff ============================================================================== --- directory/apacheds/trunk/ldif-partition/src/main/java/org/apache/directory/server/core/partition/ldif/AbstractLdifPartition.java (original) +++ directory/apacheds/trunk/ldif-partition/src/main/java/org/apache/directory/server/core/partition/ldif/AbstractLdifPartition.java Sun Jan 23 20:11:02 2011 @@ -33,8 +33,8 @@ import org.apache.directory.server.xdbm. import org.apache.directory.server.xdbm.IndexCursor; import org.apache.directory.shared.ldap.csn.CsnFactory; 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.model.exception.LdapException; +import org.apache.directory.shared.ldap.model.exception.LdapInvalidDnException; 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/ldif-partition/src/main/java/org/apache/directory/server/core/partition/ldif/LdifPartition.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/ldif-partition/src/main/java/org/apache/directory/server/core/partition/ldif/LdifPartition.java?rev=1062511&r1=1062510&r2=1062511&view=diff ============================================================================== --- directory/apacheds/trunk/ldif-partition/src/main/java/org/apache/directory/server/core/partition/ldif/LdifPartition.java (original) +++ directory/apacheds/trunk/ldif-partition/src/main/java/org/apache/directory/server/core/partition/ldif/LdifPartition.java Sun Jan 23 20:11:02 2011 @@ -42,9 +42,9 @@ import org.apache.directory.server.xdbm. 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.LdapException; -import org.apache.directory.shared.ldap.exception.LdapInvalidDnException; -import org.apache.directory.shared.ldap.exception.LdapOperationException; +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.LdapOperationException; import org.apache.directory.shared.ldap.ldif.LdapLdifException; import org.apache.directory.shared.ldap.ldif.LdifEntry; import org.apache.directory.shared.ldap.ldif.LdifReader; Modified: directory/apacheds/trunk/ldif-partition/src/main/java/org/apache/directory/server/core/partition/ldif/SingleFileLdifPartition.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/ldif-partition/src/main/java/org/apache/directory/server/core/partition/ldif/SingleFileLdifPartition.java?rev=1062511&r1=1062510&r2=1062511&view=diff ============================================================================== --- directory/apacheds/trunk/ldif-partition/src/main/java/org/apache/directory/server/core/partition/ldif/SingleFileLdifPartition.java (original) +++ directory/apacheds/trunk/ldif-partition/src/main/java/org/apache/directory/server/core/partition/ldif/SingleFileLdifPartition.java Sun Jan 23 20:11:02 2011 @@ -45,8 +45,8 @@ import org.apache.directory.server.xdbm. 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.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.LdifEntry; import org.apache.directory.shared.ldap.ldif.LdifReader; import org.apache.directory.shared.ldap.ldif.LdifUtils; Modified: directory/apacheds/trunk/ldif-partition/src/test/java/org/apache/directory/server/core/partition/LdifPartitionTest.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/ldif-partition/src/test/java/org/apache/directory/server/core/partition/LdifPartitionTest.java?rev=1062511&r1=1062510&r2=1062511&view=diff ============================================================================== --- directory/apacheds/trunk/ldif-partition/src/test/java/org/apache/directory/server/core/partition/LdifPartitionTest.java (original) +++ directory/apacheds/trunk/ldif-partition/src/test/java/org/apache/directory/server/core/partition/LdifPartitionTest.java Sun Jan 23 20:11:02 2011 @@ -52,7 +52,7 @@ import org.apache.directory.shared.ldap. import org.apache.directory.shared.ldap.csn.CsnFactory; 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.model.exception.LdapException; import org.apache.directory.shared.ldap.filter.ExprNode; import org.apache.directory.shared.ldap.filter.FilterParser; import org.apache.directory.shared.ldap.filter.SearchScope; Modified: directory/apacheds/trunk/ldif-partition/src/test/java/org/apache/directory/server/core/partition/SingleFileLdifPartitionTest.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/ldif-partition/src/test/java/org/apache/directory/server/core/partition/SingleFileLdifPartitionTest.java?rev=1062511&r1=1062510&r2=1062511&view=diff ============================================================================== --- directory/apacheds/trunk/ldif-partition/src/test/java/org/apache/directory/server/core/partition/SingleFileLdifPartitionTest.java (original) +++ directory/apacheds/trunk/ldif-partition/src/test/java/org/apache/directory/server/core/partition/SingleFileLdifPartitionTest.java Sun Jan 23 20:11:02 2011 @@ -62,7 +62,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.filter.ExprNode; import org.apache.directory.shared.ldap.filter.FilterParser; import org.apache.directory.shared.ldap.filter.SearchScope; Modified: directory/apacheds/trunk/protocol-dns/src/main/java/org/apache/directory/server/dns/store/jndi/MultiBaseSearch.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/protocol-dns/src/main/java/org/apache/directory/server/dns/store/jndi/MultiBaseSearch.java?rev=1062511&r1=1062510&r2=1062511&view=diff ============================================================================== --- directory/apacheds/trunk/protocol-dns/src/main/java/org/apache/directory/server/dns/store/jndi/MultiBaseSearch.java (original) +++ directory/apacheds/trunk/protocol-dns/src/main/java/org/apache/directory/server/dns/store/jndi/MultiBaseSearch.java Sun Jan 23 20:11:02 2011 @@ -39,7 +39,7 @@ import org.apache.directory.server.i18n. import org.apache.directory.server.protocol.shared.ServiceConfigurationException; import org.apache.directory.server.protocol.shared.catalog.Catalog; import org.apache.directory.server.protocol.shared.catalog.GetCatalog; -import org.apache.directory.shared.ldap.exception.LdapNoSuchObjectException; +import org.apache.directory.shared.ldap.model.exception.LdapNoSuchObjectException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; Modified: directory/apacheds/trunk/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/KdcServer.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/KdcServer.java?rev=1062511&r1=1062510&r2=1062511&view=diff ============================================================================== --- directory/apacheds/trunk/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/KdcServer.java (original) +++ directory/apacheds/trunk/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/KdcServer.java Sun Jan 23 20:11:02 2011 @@ -40,7 +40,7 @@ import org.apache.directory.server.proto import org.apache.directory.server.protocol.shared.transport.Transport; import org.apache.directory.server.protocol.shared.transport.UdpTransport; import org.apache.directory.shared.kerberos.codec.types.EncryptionType; -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.mina.core.filterchain.DefaultIoFilterChainBuilder; import org.apache.mina.core.filterchain.IoFilterChainBuilder; Modified: directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/ExtendedOperationHandler.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/ExtendedOperationHandler.java?rev=1062511&r1=1062510&r2=1062511&view=diff ============================================================================== --- directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/ExtendedOperationHandler.java (original) +++ directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/ExtendedOperationHandler.java Sun Jan 23 20:11:02 2011 @@ -22,7 +22,7 @@ package org.apache.directory.server.ldap import java.util.Set; -import org.apache.directory.shared.ldap.message.ExtendedRequest; +import org.apache.directory.shared.ldap.model.message.ExtendedRequest; /**