Return-Path: X-Original-To: apmail-directory-commits-archive@www.apache.org Delivered-To: apmail-directory-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id BAD8E10A3 for ; Fri, 22 Apr 2011 21:09:28 +0000 (UTC) Received: (qmail 13986 invoked by uid 500); 22 Apr 2011 21:09:28 -0000 Delivered-To: apmail-directory-commits-archive@directory.apache.org Received: (qmail 13932 invoked by uid 500); 22 Apr 2011 21:09:28 -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 13925 invoked by uid 99); 22 Apr 2011 21:09:28 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 22 Apr 2011 21:09:28 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.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; Fri, 22 Apr 2011 21:09:18 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 2F9EC23888EA; Fri, 22 Apr 2011 21:08:55 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1096040 [1/2] - in /directory/shared/trunk: dsml/engine/src/main/java/org/apache/directory/shared/dsmlv2/engine/ dsml/parser/src/main/java/org/apache/directory/shared/dsmlv2/reponse/ dsml/parser/src/test/java/org/apache/directory/shared/ds... Date: Fri, 22 Apr 2011 21:08:54 -0000 To: commits@directory.apache.org From: elecharny@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20110422210855.2F9EC23888EA@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: elecharny Date: Fri Apr 22 21:08:52 2011 New Revision: 1096040 URL: http://svn.apache.org/viewvc?rev=1096040&view=rev Log: o Changed the get/setErrorMessage to get/setDiagnisticMessage, as define din the RFC 4511 o Cleaned up LdapResult classes Modified: directory/shared/trunk/dsml/engine/src/main/java/org/apache/directory/shared/dsmlv2/engine/Dsmlv2Engine.java directory/shared/trunk/dsml/parser/src/main/java/org/apache/directory/shared/dsmlv2/reponse/Dsmlv2ResponseGrammar.java directory/shared/trunk/dsml/parser/src/main/java/org/apache/directory/shared/dsmlv2/reponse/LdapResultDsml.java directory/shared/trunk/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/addResponse/AddResponseTest.java directory/shared/trunk/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/authResponse/AuthResponseTest.java directory/shared/trunk/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/compareResponse/CompareResponseTest.java directory/shared/trunk/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/delResponse/DelResponseTest.java directory/shared/trunk/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/extendedResponse/ExtendedResponseTest.java directory/shared/trunk/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/modDNResponse/ModifyDNResponseTest.java directory/shared/trunk/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/modifyResponse/ModifyResponseTest.java directory/shared/trunk/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/searchResponse/searchResultDone/SearchResultDoneTest.java directory/shared/trunk/ldap/client/api/src/main/java/org/apache/directory/ldap/client/api/LdapNetworkConnection.java directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/actions/ldapResult/StoreErrorMessage.java directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/api/ResponseCarryingException.java directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/decorators/LdapResultDecorator.java directory/shared/trunk/ldap/codec/core/src/test/java/org/apache/directory/shared/ldap/codec/LdapResultTest.java directory/shared/trunk/ldap/codec/core/src/test/java/org/apache/directory/shared/ldap/codec/add/AddResponseTest.java directory/shared/trunk/ldap/codec/core/src/test/java/org/apache/directory/shared/ldap/codec/bind/BindResponseTest.java directory/shared/trunk/ldap/codec/core/src/test/java/org/apache/directory/shared/ldap/codec/compare/CompareResponseTest.java directory/shared/trunk/ldap/codec/core/src/test/java/org/apache/directory/shared/ldap/codec/del/DelResponseTest.java directory/shared/trunk/ldap/codec/core/src/test/java/org/apache/directory/shared/ldap/codec/extended/ExtendedResponseTest.java directory/shared/trunk/ldap/codec/core/src/test/java/org/apache/directory/shared/ldap/codec/modify/ModifyResponseTest.java directory/shared/trunk/ldap/codec/core/src/test/java/org/apache/directory/shared/ldap/codec/modifyDn/ModifyDNResponseTest.java directory/shared/trunk/ldap/codec/core/src/test/java/org/apache/directory/shared/ldap/codec/search/SearchResultDoneTest.java directory/shared/trunk/ldap/codec/standalone/src/test/java/org/apache/directory/shared/ldap/codec/LdapResultTest.java directory/shared/trunk/ldap/codec/standalone/src/test/java/org/apache/directory/shared/ldap/codec/add/AddResponseTest.java directory/shared/trunk/ldap/codec/standalone/src/test/java/org/apache/directory/shared/ldap/codec/bind/BindResponseTest.java directory/shared/trunk/ldap/codec/standalone/src/test/java/org/apache/directory/shared/ldap/codec/compare/CompareResponseTest.java directory/shared/trunk/ldap/codec/standalone/src/test/java/org/apache/directory/shared/ldap/codec/del/DelResponseTest.java directory/shared/trunk/ldap/codec/standalone/src/test/java/org/apache/directory/shared/ldap/codec/extended/ExtendedResponseTest.java directory/shared/trunk/ldap/codec/standalone/src/test/java/org/apache/directory/shared/ldap/codec/modify/ModifyResponseTest.java directory/shared/trunk/ldap/codec/standalone/src/test/java/org/apache/directory/shared/ldap/codec/modifyDn/ModifyDNResponseTest.java directory/shared/trunk/ldap/codec/standalone/src/test/java/org/apache/directory/shared/ldap/codec/search/SearchResultDoneTest.java directory/shared/trunk/ldap/extras/codec-api/src/main/java/org/apache/directory/shared/ldap/extras/extended/GracefulDisconnectResponseImpl.java directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/message/LdapResult.java directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/message/LdapResultImpl.java directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/message/extended/AddNoDResponse.java directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/message/extended/BindNoDResponse.java directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/message/extended/CompareNoDResponse.java directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/message/extended/DeleteNoDResponse.java directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/message/extended/ExtendedNoDResponse.java directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/message/extended/ModifyDnNoDResponse.java directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/message/extended/ModifyNoDResponse.java directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/message/extended/NoticeOfDisconnect.java directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/message/extended/SearchNoDResponse.java directory/shared/trunk/ldap/model/src/test/java/org/apache/directory/shared/ldap/model/message/AbstractResultResponseTest.java directory/shared/trunk/ldap/model/src/test/java/org/apache/directory/shared/ldap/model/message/BindResponseImplTest.java directory/shared/trunk/ldap/model/src/test/java/org/apache/directory/shared/ldap/model/message/LdapResultImplTest.java Modified: directory/shared/trunk/dsml/engine/src/main/java/org/apache/directory/shared/dsmlv2/engine/Dsmlv2Engine.java URL: http://svn.apache.org/viewvc/directory/shared/trunk/dsml/engine/src/main/java/org/apache/directory/shared/dsmlv2/engine/Dsmlv2Engine.java?rev=1096040&r1=1096039&r2=1096040&view=diff ============================================================================== --- directory/shared/trunk/dsml/engine/src/main/java/org/apache/directory/shared/dsmlv2/engine/Dsmlv2Engine.java (original) +++ directory/shared/trunk/dsml/engine/src/main/java/org/apache/directory/shared/dsmlv2/engine/Dsmlv2Engine.java Fri Apr 22 21:08:52 2011 @@ -786,7 +786,7 @@ public class Dsmlv2Engine if ( bindResponse.getLdapResult().getResultCode() != ResultCodeEnum.SUCCESS ) { - LOG.warn( "Error : {}", bindResponse.getLdapResult().getErrorMessage() ); + LOG.warn( "Error : {}", bindResponse.getLdapResult().getDiagnosticMessage() ); } } } Modified: directory/shared/trunk/dsml/parser/src/main/java/org/apache/directory/shared/dsmlv2/reponse/Dsmlv2ResponseGrammar.java URL: http://svn.apache.org/viewvc/directory/shared/trunk/dsml/parser/src/main/java/org/apache/directory/shared/dsmlv2/reponse/Dsmlv2ResponseGrammar.java?rev=1096040&r1=1096039&r2=1096040&view=diff ============================================================================== --- directory/shared/trunk/dsml/parser/src/main/java/org/apache/directory/shared/dsmlv2/reponse/Dsmlv2ResponseGrammar.java (original) +++ directory/shared/trunk/dsml/parser/src/main/java/org/apache/directory/shared/dsmlv2/reponse/Dsmlv2ResponseGrammar.java Fri Apr 22 21:08:52 2011 @@ -1476,7 +1476,7 @@ public final class Dsmlv2ResponseGrammar if ( !nextText.equals( "" ) ) { - ldapResult.setErrorMessage( nextText.trim() ); + ldapResult.setDiagnosticMessage( nextText.trim() ); } } catch ( IOException e ) Modified: directory/shared/trunk/dsml/parser/src/main/java/org/apache/directory/shared/dsmlv2/reponse/LdapResultDsml.java URL: http://svn.apache.org/viewvc/directory/shared/trunk/dsml/parser/src/main/java/org/apache/directory/shared/dsmlv2/reponse/LdapResultDsml.java?rev=1096040&r1=1096039&r2=1096040&view=diff ============================================================================== --- directory/shared/trunk/dsml/parser/src/main/java/org/apache/directory/shared/dsmlv2/reponse/LdapResultDsml.java (original) +++ directory/shared/trunk/dsml/parser/src/main/java/org/apache/directory/shared/dsmlv2/reponse/LdapResultDsml.java Fri Apr 22 21:08:52 2011 @@ -99,7 +99,7 @@ public class LdapResultDsml implements D resultCodeElement.addAttribute( "descr", result.getResultCode().getMessage() ); // ErrorMessage - String errorMessage = ( result.getErrorMessage() ); + String errorMessage = ( result.getDiagnosticMessage() ); if ( ( errorMessage != null ) && ( !errorMessage.equals( "" ) ) ) { Element errorMessageElement = root.addElement( "errorMessage" ); @@ -126,24 +126,20 @@ public class LdapResultDsml implements D /** - * Get the error message - * - * @return Returns the errorMessage. + * {@inheritDoc} */ - public String getErrorMessage() + public String getDiagnosticMessage() { - return result.getErrorMessage(); + return result.getDiagnosticMessage(); } /** - * Set the error message - * - * @param errorMessage The errorMessage to set. + * {@inheritDoc} */ - public void setErrorMessage( String errorMessage ) + public void setDiagnosticMessage( String diagnosticMessage ) { - result.setErrorMessage( errorMessage ); + result.setDiagnosticMessage( diagnosticMessage ); } Modified: directory/shared/trunk/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/addResponse/AddResponseTest.java URL: http://svn.apache.org/viewvc/directory/shared/trunk/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/addResponse/AddResponseTest.java?rev=1096040&r1=1096039&r2=1096040&view=diff ============================================================================== --- directory/shared/trunk/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/addResponse/AddResponseTest.java (original) +++ directory/shared/trunk/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/addResponse/AddResponseTest.java Fri Apr 22 21:08:52 2011 @@ -308,7 +308,7 @@ public class AddResponseTest extends Abs LdapResult ldapResult = addResponse.getLdapResult(); assertEquals( "Unrecognized extended operation EXTENSION_OID: 1.2.6.1.4.1.18060.1.1.1.100.2", ldapResult - .getErrorMessage() ); + .getDiagnosticMessage() ); } @@ -337,7 +337,7 @@ public class AddResponseTest extends Abs LdapResult ldapResult = addResponse.getLdapResult(); - assertNull( ldapResult.getErrorMessage() ); + assertNull( ldapResult.getDiagnosticMessage() ); } Modified: directory/shared/trunk/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/authResponse/AuthResponseTest.java URL: http://svn.apache.org/viewvc/directory/shared/trunk/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/authResponse/AuthResponseTest.java?rev=1096040&r1=1096039&r2=1096040&view=diff ============================================================================== --- directory/shared/trunk/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/authResponse/AuthResponseTest.java (original) +++ directory/shared/trunk/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/authResponse/AuthResponseTest.java Fri Apr 22 21:08:52 2011 @@ -309,7 +309,7 @@ public class AuthResponseTest extends Ab LdapResult ldapResult = bindResponse.getLdapResult(); assertEquals( "Unrecognized extended operation EXTENSION_OID: 1.2.6.1.4.1.18060.1.1.1.100.2", ldapResult - .getErrorMessage() ); + .getDiagnosticMessage() ); } @@ -338,7 +338,7 @@ public class AuthResponseTest extends Ab LdapResult ldapResult = bindResponse.getLdapResult(); - assertNull( ldapResult.getErrorMessage() ); + assertNull( ldapResult.getDiagnosticMessage() ); } Modified: directory/shared/trunk/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/compareResponse/CompareResponseTest.java URL: http://svn.apache.org/viewvc/directory/shared/trunk/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/compareResponse/CompareResponseTest.java?rev=1096040&r1=1096039&r2=1096040&view=diff ============================================================================== --- directory/shared/trunk/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/compareResponse/CompareResponseTest.java (original) +++ directory/shared/trunk/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/compareResponse/CompareResponseTest.java Fri Apr 22 21:08:52 2011 @@ -310,7 +310,7 @@ public class CompareResponseTest extends LdapResult ldapResult = compareResponse.getLdapResult(); assertEquals( "Unrecognized extended operation EXTENSION_OID: 1.2.6.1.4.1.18060.1.1.1.100.2", ldapResult - .getErrorMessage() ); + .getDiagnosticMessage() ); } @@ -339,7 +339,7 @@ public class CompareResponseTest extends LdapResult ldapResult = compareResponse.getLdapResult(); - assertNull( ldapResult.getErrorMessage() ); + assertNull( ldapResult.getDiagnosticMessage() ); } Modified: directory/shared/trunk/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/delResponse/DelResponseTest.java URL: http://svn.apache.org/viewvc/directory/shared/trunk/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/delResponse/DelResponseTest.java?rev=1096040&r1=1096039&r2=1096040&view=diff ============================================================================== --- directory/shared/trunk/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/delResponse/DelResponseTest.java (original) +++ directory/shared/trunk/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/delResponse/DelResponseTest.java Fri Apr 22 21:08:52 2011 @@ -308,7 +308,7 @@ public class DelResponseTest extends Abs LdapResult ldapResult = delResponse.getLdapResult(); assertEquals( "Unrecognized extended operation EXTENSION_OID: 1.2.6.1.4.1.18060.1.1.1.100.2", ldapResult - .getErrorMessage() ); + .getDiagnosticMessage() ); } @@ -337,7 +337,7 @@ public class DelResponseTest extends Abs LdapResult ldapResult = delResponse.getLdapResult(); - assertNull( ldapResult.getErrorMessage() ); + assertNull( ldapResult.getDiagnosticMessage() ); } Modified: directory/shared/trunk/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/extendedResponse/ExtendedResponseTest.java URL: http://svn.apache.org/viewvc/directory/shared/trunk/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/extendedResponse/ExtendedResponseTest.java?rev=1096040&r1=1096039&r2=1096040&view=diff ============================================================================== --- directory/shared/trunk/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/extendedResponse/ExtendedResponseTest.java (original) +++ directory/shared/trunk/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/extendedResponse/ExtendedResponseTest.java Fri Apr 22 21:08:52 2011 @@ -313,7 +313,7 @@ public class ExtendedResponseTest extend LdapResult ldapResult = extendedResponse.getLdapResult(); assertEquals( "Unrecognized extended operation EXTENSION_OID: 1.2.6.1.4.1.18060.1.1.1.100.2", ldapResult - .getErrorMessage() ); + .getDiagnosticMessage() ); } @@ -342,7 +342,7 @@ public class ExtendedResponseTest extend LdapResult ldapResult = extendedResponse.getLdapResult(); - assertNull( ldapResult.getErrorMessage() ); + assertNull( ldapResult.getDiagnosticMessage() ); } Modified: directory/shared/trunk/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/modDNResponse/ModifyDNResponseTest.java URL: http://svn.apache.org/viewvc/directory/shared/trunk/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/modDNResponse/ModifyDNResponseTest.java?rev=1096040&r1=1096039&r2=1096040&view=diff ============================================================================== --- directory/shared/trunk/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/modDNResponse/ModifyDNResponseTest.java (original) +++ directory/shared/trunk/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/modDNResponse/ModifyDNResponseTest.java Fri Apr 22 21:08:52 2011 @@ -310,7 +310,7 @@ public class ModifyDNResponseTest extend LdapResult ldapResult = modifyDNResponse.getLdapResult(); assertEquals( "Unrecognized extended operation EXTENSION_OID: 1.2.6.1.4.1.18060.1.1.1.100.2", ldapResult - .getErrorMessage() ); + .getDiagnosticMessage() ); } @@ -339,7 +339,7 @@ public class ModifyDNResponseTest extend LdapResult ldapResult = modifyDNResponse.getLdapResult(); - assertNull( ldapResult.getErrorMessage() ); + assertNull( ldapResult.getDiagnosticMessage() ); } Modified: directory/shared/trunk/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/modifyResponse/ModifyResponseTest.java URL: http://svn.apache.org/viewvc/directory/shared/trunk/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/modifyResponse/ModifyResponseTest.java?rev=1096040&r1=1096039&r2=1096040&view=diff ============================================================================== --- directory/shared/trunk/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/modifyResponse/ModifyResponseTest.java (original) +++ directory/shared/trunk/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/modifyResponse/ModifyResponseTest.java Fri Apr 22 21:08:52 2011 @@ -310,7 +310,7 @@ public class ModifyResponseTest extends LdapResult ldapResult = modifyResponse.getLdapResult(); assertEquals( "Unrecognized extended operation EXTENSION_OID: 1.2.6.1.4.1.18060.1.1.1.100.2", ldapResult - .getErrorMessage() ); + .getDiagnosticMessage() ); } @@ -339,7 +339,7 @@ public class ModifyResponseTest extends LdapResult ldapResult = modifyResponse.getLdapResult(); - assertNull( ldapResult.getErrorMessage() ); + assertNull( ldapResult.getDiagnosticMessage() ); } Modified: directory/shared/trunk/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/searchResponse/searchResultDone/SearchResultDoneTest.java URL: http://svn.apache.org/viewvc/directory/shared/trunk/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/searchResponse/searchResultDone/SearchResultDoneTest.java?rev=1096040&r1=1096039&r2=1096040&view=diff ============================================================================== --- directory/shared/trunk/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/searchResponse/searchResultDone/SearchResultDoneTest.java (original) +++ directory/shared/trunk/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/searchResponse/searchResultDone/SearchResultDoneTest.java Fri Apr 22 21:08:52 2011 @@ -319,7 +319,7 @@ public class SearchResultDoneTest extend LdapResult ldapResult = searchResultDone.getLdapResult(); assertEquals( "Unrecognized extended operation EXTENSION_OID: 1.2.6.1.4.1.18060.1.1.1.100.2", ldapResult - .getErrorMessage() ); + .getDiagnosticMessage() ); } @@ -349,7 +349,7 @@ public class SearchResultDoneTest extend LdapResult ldapResult = searchResultDone.getLdapResult(); - assertNull( ldapResult.getErrorMessage() ); + assertNull( ldapResult.getDiagnosticMessage() ); } Modified: directory/shared/trunk/ldap/client/api/src/main/java/org/apache/directory/ldap/client/api/LdapNetworkConnection.java URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/client/api/src/main/java/org/apache/directory/ldap/client/api/LdapNetworkConnection.java?rev=1096040&r1=1096039&r2=1096040&view=diff ============================================================================== --- directory/shared/trunk/ldap/client/api/src/main/java/org/apache/directory/ldap/client/api/LdapNetworkConnection.java (original) +++ directory/shared/trunk/ldap/client/api/src/main/java/org/apache/directory/ldap/client/api/LdapNetworkConnection.java Fri Apr 22 21:08:52 2011 @@ -2243,7 +2243,7 @@ public class LdapNetworkConnection exten if ( modifyResponse instanceof ModifyNoDResponse ) { // A NoticeOfDisconnect : deserves a special treatment - throw new LdapException( modifyResponse.getLdapResult().getErrorMessage() ); + throw new LdapException( modifyResponse.getLdapResult().getDiagnosticMessage() ); } // We have had an error @@ -3668,7 +3668,7 @@ public class LdapNetworkConnection exten } else { - throw new LdapOperationException( result.getResultCode(), result.getErrorMessage() ); + throw new LdapOperationException( result.getResultCode(), result.getDiagnosticMessage() ); } } catch ( LdapException e ) Modified: directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/actions/ldapResult/StoreErrorMessage.java URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/actions/ldapResult/StoreErrorMessage.java?rev=1096040&r1=1096039&r2=1096040&view=diff ============================================================================== --- directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/actions/ldapResult/StoreErrorMessage.java (original) +++ directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/actions/ldapResult/StoreErrorMessage.java Fri Apr 22 21:08:52 2011 @@ -84,7 +84,7 @@ public class StoreErrorMessage extends G ResultResponse response = ( ResultResponse ) container.getMessage(); LdapResult ldapResult = response.getLdapResult(); - ldapResult.setErrorMessage( errorMessage ); + ldapResult.setDiagnosticMessage( errorMessage ); // We can have an END transition container.setGrammarEndAllowed( true ); Modified: directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/api/ResponseCarryingException.java URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/api/ResponseCarryingException.java?rev=1096040&r1=1096039&r2=1096040&view=diff ============================================================================== --- directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/api/ResponseCarryingException.java (original) +++ directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/api/ResponseCarryingException.java Fri Apr 22 21:08:52 2011 @@ -68,7 +68,7 @@ public class ResponseCarryingException e { super( message, cause ); - response.getLdapResult().setErrorMessage( message ); + response.getLdapResult().setDiagnosticMessage( message ); response.getLdapResult().setResultCode( code ); response.getLdapResult().setMatchedDn( matchedDn ); Modified: directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/decorators/LdapResultDecorator.java URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/decorators/LdapResultDecorator.java?rev=1096040&r1=1096039&r2=1096040&view=diff ============================================================================== --- directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/decorators/LdapResultDecorator.java (original) +++ directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/decorators/LdapResultDecorator.java Fri Apr 22 21:08:52 2011 @@ -152,18 +152,18 @@ public class LdapResultDecorator impleme /** * {@inheritDoc} */ - public String getErrorMessage() + public String getDiagnosticMessage() { - return decoratedLdapResult.getErrorMessage(); + return decoratedLdapResult.getDiagnosticMessage(); } /** * {@inheritDoc} */ - public void setErrorMessage( String errorMessage ) + public void setDiagnosticMessage( String diagnosticMessage ) { - decoratedLdapResult.setErrorMessage( errorMessage ); + decoratedLdapResult.setDiagnosticMessage( diagnosticMessage ); } @@ -250,7 +250,7 @@ public class LdapResultDecorator impleme } // The errorMessage length - byte[] errorMessageBytes = Strings.getBytesUtf8( getErrorMessage() ); + byte[] errorMessageBytes = Strings.getBytesUtf8( getDiagnosticMessage() ); ldapResultLength += 1 + TLV.getNbBytes( errorMessageBytes.length ) + errorMessageBytes.length; setErrorMessageBytes( errorMessageBytes ); Modified: directory/shared/trunk/ldap/codec/core/src/test/java/org/apache/directory/shared/ldap/codec/LdapResultTest.java URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/codec/core/src/test/java/org/apache/directory/shared/ldap/codec/LdapResultTest.java?rev=1096040&r1=1096039&r2=1096040&view=diff ============================================================================== --- directory/shared/trunk/ldap/codec/core/src/test/java/org/apache/directory/shared/ldap/codec/LdapResultTest.java (original) +++ directory/shared/trunk/ldap/codec/core/src/test/java/org/apache/directory/shared/ldap/codec/LdapResultTest.java Fri Apr 22 21:08:52 2011 @@ -28,13 +28,10 @@ import static org.junit.Assert.fail; import java.nio.ByteBuffer; import java.util.Collection; -import com.mycila.junit.concurrent.Concurrency; -import com.mycila.junit.concurrent.ConcurrentJunitRunner; - import org.apache.directory.shared.asn1.DecoderException; import org.apache.directory.shared.asn1.EncoderException; -import org.apache.directory.shared.asn1.ber.Asn1Decoder; import org.apache.directory.shared.asn1.ber.Asn1Container; +import org.apache.directory.shared.asn1.ber.Asn1Decoder; import org.apache.directory.shared.ldap.codec.api.LdapMessageContainer; import org.apache.directory.shared.ldap.codec.api.MessageDecorator; import org.apache.directory.shared.ldap.codec.decorators.AddResponseDecorator; @@ -47,6 +44,9 @@ import org.apache.directory.shared.util. import org.junit.Test; import org.junit.runner.RunWith; +import com.mycila.junit.concurrent.Concurrency; +import com.mycila.junit.concurrent.ConcurrentJunitRunner; + /** * A test for LdapResults. We will use a AddResponse message to test the @@ -295,7 +295,7 @@ public class LdapResultTest extends Abst assertEquals( 1, addResponse.getMessageId() ); assertEquals( ResultCodeEnum.SUCCESS, addResponse.getLdapResult().getResultCode() ); assertEquals( "", addResponse.getLdapResult().getMatchedDn().getName() ); - assertEquals( "", addResponse.getLdapResult().getErrorMessage() ); + assertEquals( "", addResponse.getLdapResult().getDiagnosticMessage() ); try { @@ -358,7 +358,7 @@ public class LdapResultTest extends Abst assertEquals( 1, addResponse.getMessageId() ); assertEquals( ResultCodeEnum.REFERRAL, addResponse.getLdapResult().getResultCode() ); assertEquals( "", addResponse.getLdapResult().getMatchedDn().getName() ); - assertEquals( "", addResponse.getLdapResult().getErrorMessage() ); + assertEquals( "", addResponse.getLdapResult().getDiagnosticMessage() ); Referral referral = addResponse.getLdapResult().getReferral(); @@ -436,7 +436,7 @@ public class LdapResultTest extends Abst assertEquals( 1, addResponse.getMessageId() ); assertEquals( ResultCodeEnum.REFERRAL, addResponse.getLdapResult().getResultCode() ); assertEquals( "", addResponse.getLdapResult().getMatchedDn().getName() ); - assertEquals( "", addResponse.getLdapResult().getErrorMessage() ); + assertEquals( "", addResponse.getLdapResult().getDiagnosticMessage() ); Referral referral = addResponse.getLdapResult().getReferral(); @@ -513,7 +513,7 @@ public class LdapResultTest extends Abst assertEquals( 1, addResponse.getMessageId() ); assertEquals( ResultCodeEnum.REFERRAL, addResponse.getLdapResult().getResultCode() ); assertEquals( "", addResponse.getLdapResult().getMatchedDn().getName() ); - assertEquals( "", addResponse.getLdapResult().getErrorMessage() ); + assertEquals( "", addResponse.getLdapResult().getDiagnosticMessage() ); Referral referral = addResponse.getLdapResult().getReferral(); Modified: directory/shared/trunk/ldap/codec/core/src/test/java/org/apache/directory/shared/ldap/codec/add/AddResponseTest.java URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/codec/core/src/test/java/org/apache/directory/shared/ldap/codec/add/AddResponseTest.java?rev=1096040&r1=1096039&r2=1096040&view=diff ============================================================================== --- directory/shared/trunk/ldap/codec/core/src/test/java/org/apache/directory/shared/ldap/codec/add/AddResponseTest.java (original) +++ directory/shared/trunk/ldap/codec/core/src/test/java/org/apache/directory/shared/ldap/codec/add/AddResponseTest.java Fri Apr 22 21:08:52 2011 @@ -27,12 +27,10 @@ import static org.junit.Assert.fail; import java.nio.ByteBuffer; import java.util.Map; -import com.mycila.junit.concurrent.Concurrency; -import com.mycila.junit.concurrent.ConcurrentJunitRunner; import org.apache.directory.shared.asn1.DecoderException; import org.apache.directory.shared.asn1.EncoderException; -import org.apache.directory.shared.asn1.ber.Asn1Decoder; import org.apache.directory.shared.asn1.ber.Asn1Container; +import org.apache.directory.shared.asn1.ber.Asn1Decoder; import org.apache.directory.shared.ldap.codec.api.CodecControl; import org.apache.directory.shared.ldap.codec.api.LdapMessageContainer; import org.apache.directory.shared.ldap.codec.api.MessageDecorator; @@ -46,6 +44,9 @@ import org.apache.directory.shared.util. import org.junit.Test; import org.junit.runner.RunWith; +import com.mycila.junit.concurrent.Concurrency; +import com.mycila.junit.concurrent.ConcurrentJunitRunner; + /** * @author Apache Directory Project @@ -102,7 +103,7 @@ public class AddResponseTest extends Abs assertEquals( 1, addResponse.getMessageId() ); assertEquals( ResultCodeEnum.SUCCESS, addResponse.getLdapResult().getResultCode() ); assertEquals( "", addResponse.getLdapResult().getMatchedDn().getName() ); - assertEquals( "", addResponse.getLdapResult().getErrorMessage() ); + assertEquals( "", addResponse.getLdapResult().getDiagnosticMessage() ); try { @@ -218,7 +219,7 @@ public class AddResponseTest extends Abs assertEquals( 1, addResponse.getMessageId() ); assertEquals( ResultCodeEnum.SUCCESS, addResponse.getLdapResult().getResultCode() ); assertEquals( "", addResponse.getLdapResult().getMatchedDn().getName() ); - assertEquals( "", addResponse.getLdapResult().getErrorMessage() ); + assertEquals( "", addResponse.getLdapResult().getDiagnosticMessage() ); // Check the Control Map controls = addResponse.getControls(); Modified: directory/shared/trunk/ldap/codec/core/src/test/java/org/apache/directory/shared/ldap/codec/bind/BindResponseTest.java URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/codec/core/src/test/java/org/apache/directory/shared/ldap/codec/bind/BindResponseTest.java?rev=1096040&r1=1096039&r2=1096040&view=diff ============================================================================== --- directory/shared/trunk/ldap/codec/core/src/test/java/org/apache/directory/shared/ldap/codec/bind/BindResponseTest.java (original) +++ directory/shared/trunk/ldap/codec/core/src/test/java/org/apache/directory/shared/ldap/codec/bind/BindResponseTest.java Fri Apr 22 21:08:52 2011 @@ -28,8 +28,6 @@ import java.nio.ByteBuffer; import java.util.Arrays; import java.util.Map; -import com.mycila.junit.concurrent.Concurrency; -import com.mycila.junit.concurrent.ConcurrentJunitRunner; import org.apache.directory.shared.asn1.DecoderException; import org.apache.directory.shared.asn1.EncoderException; import org.apache.directory.shared.asn1.ber.Asn1Container; @@ -48,6 +46,9 @@ import org.apache.directory.shared.util. import org.junit.Test; import org.junit.runner.RunWith; +import com.mycila.junit.concurrent.Concurrency; +import com.mycila.junit.concurrent.ConcurrentJunitRunner; + /** * @author Apache Directory Project @@ -105,7 +106,7 @@ public class BindResponseTest extends Ab assertEquals( 1, bindResponse.getMessageId() ); assertEquals( ResultCodeEnum.SUCCESS, bindResponse.getLdapResult().getResultCode() ); assertEquals( "", bindResponse.getLdapResult().getMatchedDn().getName() ); - assertEquals( "", bindResponse.getLdapResult().getErrorMessage() ); + assertEquals( "", bindResponse.getLdapResult().getDiagnosticMessage() ); // Check the encoding try @@ -186,7 +187,7 @@ public class BindResponseTest extends Ab assertEquals( 1, bindResponse.getMessageId() ); assertEquals( ResultCodeEnum.SUCCESS, bindResponse.getLdapResult().getResultCode() ); assertEquals( "", bindResponse.getLdapResult().getMatchedDn().getName() ); - assertEquals( "", bindResponse.getLdapResult().getErrorMessage() ); + assertEquals( "", bindResponse.getLdapResult().getDiagnosticMessage() ); // Check the Control Map controls = bindResponse.getControls(); @@ -272,7 +273,7 @@ public class BindResponseTest extends Ab assertEquals( 1, bindResponse.getMessageId() ); assertEquals( ResultCodeEnum.SUCCESS, bindResponse.getLdapResult().getResultCode() ); assertEquals( "", bindResponse.getLdapResult().getMatchedDn().getName() ); - assertEquals( "", bindResponse.getLdapResult().getErrorMessage() ); + assertEquals( "", bindResponse.getLdapResult().getDiagnosticMessage() ); assertEquals( "", Strings.utf8ToString(bindResponse.getServerSaslCreds()) ); // Check the encoding @@ -352,7 +353,7 @@ public class BindResponseTest extends Ab assertEquals( 1, bindResponse.getMessageId() ); assertEquals( ResultCodeEnum.SUCCESS, bindResponse.getLdapResult().getResultCode() ); assertEquals( "", bindResponse.getLdapResult().getMatchedDn().getName() ); - assertEquals( "", bindResponse.getLdapResult().getErrorMessage() ); + assertEquals( "", bindResponse.getLdapResult().getDiagnosticMessage() ); assertEquals( "", Strings.utf8ToString(bindResponse.getServerSaslCreds()) ); // Check the Control @@ -436,7 +437,7 @@ public class BindResponseTest extends Ab assertEquals( 1, bindResponse.getMessageId() ); assertEquals( ResultCodeEnum.SUCCESS, bindResponse.getLdapResult().getResultCode() ); assertEquals( "", bindResponse.getLdapResult().getMatchedDn().getName() ); - assertEquals( "", bindResponse.getLdapResult().getErrorMessage() ); + assertEquals( "", bindResponse.getLdapResult().getDiagnosticMessage() ); assertEquals( "AB", Strings.utf8ToString(bindResponse.getServerSaslCreds()) ); // Check the encoding Modified: directory/shared/trunk/ldap/codec/core/src/test/java/org/apache/directory/shared/ldap/codec/compare/CompareResponseTest.java URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/codec/core/src/test/java/org/apache/directory/shared/ldap/codec/compare/CompareResponseTest.java?rev=1096040&r1=1096039&r2=1096040&view=diff ============================================================================== --- directory/shared/trunk/ldap/codec/core/src/test/java/org/apache/directory/shared/ldap/codec/compare/CompareResponseTest.java (original) +++ directory/shared/trunk/ldap/codec/core/src/test/java/org/apache/directory/shared/ldap/codec/compare/CompareResponseTest.java Fri Apr 22 21:08:52 2011 @@ -20,15 +20,13 @@ package org.apache.directory.shared.ldap.codec.compare; -import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; import java.nio.ByteBuffer; import java.util.Map; -import com.mycila.junit.concurrent.Concurrency; -import com.mycila.junit.concurrent.ConcurrentJunitRunner; import org.apache.directory.shared.asn1.DecoderException; import org.apache.directory.shared.asn1.EncoderException; import org.apache.directory.shared.asn1.ber.Asn1Decoder; @@ -43,6 +41,9 @@ import org.apache.directory.shared.util. import org.junit.Test; import org.junit.runner.RunWith; +import com.mycila.junit.concurrent.Concurrency; +import com.mycila.junit.concurrent.ConcurrentJunitRunner; + /** * Test the CompareResponse codec @@ -103,7 +104,7 @@ public class CompareResponseTest extends assertEquals( 1, compareResponse.getMessageId() ); assertEquals( ResultCodeEnum.SUCCESS, compareResponse.getLdapResult().getResultCode() ); assertEquals( "", compareResponse.getLdapResult().getMatchedDn().getName() ); - assertEquals( "", compareResponse.getLdapResult().getErrorMessage() ); + assertEquals( "", compareResponse.getLdapResult().getDiagnosticMessage() ); // Check the encoding try @@ -186,7 +187,7 @@ public class CompareResponseTest extends assertEquals( 1, compareResponse.getMessageId() ); assertEquals( ResultCodeEnum.SUCCESS, compareResponse.getLdapResult().getResultCode() ); assertEquals( "", compareResponse.getLdapResult().getMatchedDn().getName() ); - assertEquals( "", compareResponse.getLdapResult().getErrorMessage() ); + assertEquals( "", compareResponse.getLdapResult().getDiagnosticMessage() ); // Check the Control Map controls = compareResponse.getControls(); Modified: directory/shared/trunk/ldap/codec/core/src/test/java/org/apache/directory/shared/ldap/codec/del/DelResponseTest.java URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/codec/core/src/test/java/org/apache/directory/shared/ldap/codec/del/DelResponseTest.java?rev=1096040&r1=1096039&r2=1096040&view=diff ============================================================================== --- directory/shared/trunk/ldap/codec/core/src/test/java/org/apache/directory/shared/ldap/codec/del/DelResponseTest.java (original) +++ directory/shared/trunk/ldap/codec/core/src/test/java/org/apache/directory/shared/ldap/codec/del/DelResponseTest.java Fri Apr 22 21:08:52 2011 @@ -27,8 +27,6 @@ import static org.junit.Assert.fail; import java.nio.ByteBuffer; import java.util.Map; -import com.mycila.junit.concurrent.Concurrency; -import com.mycila.junit.concurrent.ConcurrentJunitRunner; import org.apache.directory.shared.asn1.DecoderException; import org.apache.directory.shared.asn1.EncoderException; import org.apache.directory.shared.asn1.ber.Asn1Decoder; @@ -43,6 +41,9 @@ import org.apache.directory.shared.util. import org.junit.Test; import org.junit.runner.RunWith; +import com.mycila.junit.concurrent.Concurrency; +import com.mycila.junit.concurrent.ConcurrentJunitRunner; + /** * Test the DelResponse codec @@ -110,7 +111,7 @@ public class DelResponseTest extends Abs assertEquals( 1, delResponse.getMessageId() ); assertEquals( ResultCodeEnum.ALIAS_PROBLEM, delResponse.getLdapResult().getResultCode() ); assertEquals( "uid=akarasulu,dc=example,dc=com", delResponse.getLdapResult().getMatchedDn().getName() ); - assertEquals( "", delResponse.getLdapResult().getErrorMessage() ); + assertEquals( "", delResponse.getLdapResult().getDiagnosticMessage() ); // Check the encoding try @@ -230,7 +231,7 @@ public class DelResponseTest extends Abs assertEquals( 1, delResponse.getMessageId() ); assertEquals( ResultCodeEnum.ALIAS_PROBLEM, delResponse.getLdapResult().getResultCode() ); assertEquals( "uid=akarasulu,dc=example,dc=com", delResponse.getLdapResult().getMatchedDn().getName() ); - assertEquals( "", delResponse.getLdapResult().getErrorMessage() ); + assertEquals( "", delResponse.getLdapResult().getDiagnosticMessage() ); // Check the Control Map controls = delResponse.getControls(); Modified: directory/shared/trunk/ldap/codec/core/src/test/java/org/apache/directory/shared/ldap/codec/extended/ExtendedResponseTest.java URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/codec/core/src/test/java/org/apache/directory/shared/ldap/codec/extended/ExtendedResponseTest.java?rev=1096040&r1=1096039&r2=1096040&view=diff ============================================================================== --- directory/shared/trunk/ldap/codec/core/src/test/java/org/apache/directory/shared/ldap/codec/extended/ExtendedResponseTest.java (original) +++ directory/shared/trunk/ldap/codec/core/src/test/java/org/apache/directory/shared/ldap/codec/extended/ExtendedResponseTest.java Fri Apr 22 21:08:52 2011 @@ -27,14 +27,12 @@ import static org.junit.Assert.fail; import java.nio.ByteBuffer; import java.util.Map; -import com.mycila.junit.concurrent.Concurrency; -import com.mycila.junit.concurrent.ConcurrentJunitRunner; import org.apache.directory.shared.asn1.DecoderException; import org.apache.directory.shared.asn1.EncoderException; import org.apache.directory.shared.asn1.ber.Asn1Decoder; -import org.apache.directory.shared.ldap.codec.api.LdapMessageContainer; import org.apache.directory.shared.ldap.codec.api.CodecControl; import org.apache.directory.shared.ldap.codec.api.ExtendedResponseDecorator; +import org.apache.directory.shared.ldap.codec.api.LdapMessageContainer; import org.apache.directory.shared.ldap.codec.osgi.AbstractCodecServiceTest; import org.apache.directory.shared.ldap.model.message.Control; import org.apache.directory.shared.ldap.model.message.ExtendedResponse; @@ -43,6 +41,9 @@ import org.apache.directory.shared.util. import org.junit.Test; import org.junit.runner.RunWith; +import com.mycila.junit.concurrent.Concurrency; +import com.mycila.junit.concurrent.ConcurrentJunitRunner; + /** * Test the ExtendedResponse codec @@ -105,7 +106,7 @@ public class ExtendedResponseTest extend assertEquals( 1, extendedResponse.getMessageId() ); assertEquals( ResultCodeEnum.SUCCESS, extendedResponse.getLdapResult().getResultCode() ); assertEquals( "", extendedResponse.getLdapResult().getMatchedDn().getName() ); - assertEquals( "", extendedResponse.getLdapResult().getErrorMessage() ); + assertEquals( "", extendedResponse.getLdapResult().getDiagnosticMessage() ); assertEquals( "1.3.6.1.5.5.2", extendedResponse.getResponseName() ); assertEquals( "value", Strings.utf8ToString((byte[]) extendedResponse.getResponseValue()) ); @@ -197,7 +198,7 @@ public class ExtendedResponseTest extend assertEquals( 1, extendedResponse.getMessageId() ); assertEquals( ResultCodeEnum.SUCCESS, extendedResponse.getLdapResult().getResultCode() ); assertEquals( "", extendedResponse.getLdapResult().getMatchedDn().getName() ); - assertEquals( "", extendedResponse.getLdapResult().getErrorMessage() ); + assertEquals( "", extendedResponse.getLdapResult().getDiagnosticMessage() ); assertEquals( "1.3.6.1.5.5.2", extendedResponse.getResponseName() ); assertEquals( "value", Strings.utf8ToString((byte[]) extendedResponse.getResponseValue()) ); @@ -281,7 +282,7 @@ public class ExtendedResponseTest extend assertEquals( 1, extendedResponse.getMessageId() ); assertEquals( ResultCodeEnum.SUCCESS, extendedResponse.getLdapResult().getResultCode() ); assertEquals( "", extendedResponse.getLdapResult().getMatchedDn().getName() ); - assertEquals( "", extendedResponse.getLdapResult().getErrorMessage() ); + assertEquals( "", extendedResponse.getLdapResult().getDiagnosticMessage() ); // Check the encoding try @@ -364,7 +365,7 @@ public class ExtendedResponseTest extend assertEquals( 1, extendedResponse.getMessageId() ); assertEquals( ResultCodeEnum.SUCCESS, extendedResponse.getLdapResult().getResultCode() ); assertEquals( "", extendedResponse.getLdapResult().getMatchedDn().getName() ); - assertEquals( "", extendedResponse.getLdapResult().getErrorMessage() ); + assertEquals( "", extendedResponse.getLdapResult().getDiagnosticMessage() ); // Check the Control Map controls = extendedResponse.getControls(); @@ -571,7 +572,7 @@ public class ExtendedResponseTest extend assertEquals( 1, extendedResponse.getMessageId() ); assertEquals( ResultCodeEnum.SUCCESS, extendedResponse.getLdapResult().getResultCode() ); assertEquals( "", extendedResponse.getLdapResult().getMatchedDn().getName() ); - assertEquals( "", extendedResponse.getLdapResult().getErrorMessage() ); + assertEquals( "", extendedResponse.getLdapResult().getDiagnosticMessage() ); assertEquals( "1.3.6.1.5.5.2", extendedResponse.getResponseName() ); assertEquals( "", Strings.utf8ToString((byte[]) extendedResponse.getResponseValue()) ); @@ -658,7 +659,7 @@ public class ExtendedResponseTest extend assertEquals( 1, extendedResponse.getMessageId() ); assertEquals( ResultCodeEnum.SUCCESS, extendedResponse.getLdapResult().getResultCode() ); assertEquals( "", extendedResponse.getLdapResult().getMatchedDn().getName() ); - assertEquals( "", extendedResponse.getLdapResult().getErrorMessage() ); + assertEquals( "", extendedResponse.getLdapResult().getDiagnosticMessage() ); assertEquals( "1.3.6.1.5.5.2", extendedResponse.getResponseName() ); assertEquals( "", Strings.utf8ToString((byte[]) extendedResponse.getResponseValue()) ); @@ -751,7 +752,7 @@ public class ExtendedResponseTest extend assertEquals( 1, extendedResponse.getMessageId() ); assertEquals( ResultCodeEnum.SUCCESS, extendedResponse.getLdapResult().getResultCode() ); assertEquals( "", extendedResponse.getLdapResult().getMatchedDn().getName() ); - assertEquals( "", extendedResponse.getLdapResult().getErrorMessage() ); + assertEquals( "", extendedResponse.getLdapResult().getDiagnosticMessage() ); assertEquals( "1.3.6.1.5.5.2", extendedResponse.getResponseName() ); assertEquals( "", Strings.utf8ToString((byte[]) extendedResponse.getResponseValue()) ); @@ -839,7 +840,7 @@ public class ExtendedResponseTest extend assertEquals( 1, extendedResponse.getMessageId() ); assertEquals( ResultCodeEnum.SUCCESS, extendedResponse.getLdapResult().getResultCode() ); assertEquals( "", extendedResponse.getLdapResult().getMatchedDn().getName() ); - assertEquals( "", extendedResponse.getLdapResult().getErrorMessage() ); + assertEquals( "", extendedResponse.getLdapResult().getDiagnosticMessage() ); assertEquals( "1.3.6.1.5.5.2", extendedResponse.getResponseName() ); assertEquals( "", Strings.utf8ToString((byte[]) extendedResponse.getResponseValue()) ); Modified: directory/shared/trunk/ldap/codec/core/src/test/java/org/apache/directory/shared/ldap/codec/modify/ModifyResponseTest.java URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/codec/core/src/test/java/org/apache/directory/shared/ldap/codec/modify/ModifyResponseTest.java?rev=1096040&r1=1096039&r2=1096040&view=diff ============================================================================== --- directory/shared/trunk/ldap/codec/core/src/test/java/org/apache/directory/shared/ldap/codec/modify/ModifyResponseTest.java (original) +++ directory/shared/trunk/ldap/codec/core/src/test/java/org/apache/directory/shared/ldap/codec/modify/ModifyResponseTest.java Fri Apr 22 21:08:52 2011 @@ -27,8 +27,6 @@ import static org.junit.Assert.fail; import java.nio.ByteBuffer; import java.util.Map; -import com.mycila.junit.concurrent.Concurrency; -import com.mycila.junit.concurrent.ConcurrentJunitRunner; import org.apache.directory.shared.asn1.DecoderException; import org.apache.directory.shared.asn1.EncoderException; import org.apache.directory.shared.asn1.ber.Asn1Decoder; @@ -43,6 +41,9 @@ import org.apache.directory.shared.util. import org.junit.Test; import org.junit.runner.RunWith; +import com.mycila.junit.concurrent.Concurrency; +import com.mycila.junit.concurrent.ConcurrentJunitRunner; + /** * Test the ModifyResponse codec @@ -102,7 +103,7 @@ public class ModifyResponseTest extends assertEquals( 1, modifyResponse.getMessageId() ); assertEquals( ResultCodeEnum.SUCCESS, modifyResponse.getLdapResult().getResultCode() ); assertEquals( "", modifyResponse.getLdapResult().getMatchedDn().getName() ); - assertEquals( "", modifyResponse.getLdapResult().getErrorMessage() ); + assertEquals( "", modifyResponse.getLdapResult().getDiagnosticMessage() ); // Check the encoding try @@ -183,7 +184,7 @@ public class ModifyResponseTest extends assertEquals( 1, modifyResponse.getMessageId() ); assertEquals( ResultCodeEnum.SUCCESS, modifyResponse.getLdapResult().getResultCode() ); assertEquals( "", modifyResponse.getLdapResult().getMatchedDn().getName() ); - assertEquals( "", modifyResponse.getLdapResult().getErrorMessage() ); + assertEquals( "", modifyResponse.getLdapResult().getDiagnosticMessage() ); // Check the Control Map controls = modifyResponse.getControls(); Modified: directory/shared/trunk/ldap/codec/core/src/test/java/org/apache/directory/shared/ldap/codec/modifyDn/ModifyDNResponseTest.java URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/codec/core/src/test/java/org/apache/directory/shared/ldap/codec/modifyDn/ModifyDNResponseTest.java?rev=1096040&r1=1096039&r2=1096040&view=diff ============================================================================== --- directory/shared/trunk/ldap/codec/core/src/test/java/org/apache/directory/shared/ldap/codec/modifyDn/ModifyDNResponseTest.java (original) +++ directory/shared/trunk/ldap/codec/core/src/test/java/org/apache/directory/shared/ldap/codec/modifyDn/ModifyDNResponseTest.java Fri Apr 22 21:08:52 2011 @@ -27,8 +27,6 @@ import static org.junit.Assert.fail; import java.nio.ByteBuffer; import java.util.Map; -import com.mycila.junit.concurrent.Concurrency; -import com.mycila.junit.concurrent.ConcurrentJunitRunner; import org.apache.directory.shared.asn1.DecoderException; import org.apache.directory.shared.asn1.EncoderException; import org.apache.directory.shared.asn1.ber.Asn1Decoder; @@ -43,6 +41,9 @@ import org.apache.directory.shared.util. import org.junit.Test; import org.junit.runner.RunWith; +import com.mycila.junit.concurrent.Concurrency; +import com.mycila.junit.concurrent.ConcurrentJunitRunner; + /** * Test the ModifyDNResponse codec @@ -103,7 +104,7 @@ public class ModifyDNResponseTest extend assertEquals( 1, modifyDnResponse.getMessageId() ); assertEquals( ResultCodeEnum.SUCCESS, modifyDnResponse.getLdapResult().getResultCode() ); assertEquals( "", modifyDnResponse.getLdapResult().getMatchedDn().getName() ); - assertEquals( "", modifyDnResponse.getLdapResult().getErrorMessage() ); + assertEquals( "", modifyDnResponse.getLdapResult().getDiagnosticMessage() ); // Check the encoding try @@ -186,7 +187,7 @@ public class ModifyDNResponseTest extend assertEquals( 1, modifyDnResponse.getMessageId() ); assertEquals( ResultCodeEnum.SUCCESS, modifyDnResponse.getLdapResult().getResultCode() ); assertEquals( "", modifyDnResponse.getLdapResult().getMatchedDn().getName() ); - assertEquals( "", modifyDnResponse.getLdapResult().getErrorMessage() ); + assertEquals( "", modifyDnResponse.getLdapResult().getDiagnosticMessage() ); // Check the Control Map controls = modifyDnResponse.getControls(); Modified: directory/shared/trunk/ldap/codec/core/src/test/java/org/apache/directory/shared/ldap/codec/search/SearchResultDoneTest.java URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/codec/core/src/test/java/org/apache/directory/shared/ldap/codec/search/SearchResultDoneTest.java?rev=1096040&r1=1096039&r2=1096040&view=diff ============================================================================== --- directory/shared/trunk/ldap/codec/core/src/test/java/org/apache/directory/shared/ldap/codec/search/SearchResultDoneTest.java (original) +++ directory/shared/trunk/ldap/codec/core/src/test/java/org/apache/directory/shared/ldap/codec/search/SearchResultDoneTest.java Fri Apr 22 21:08:52 2011 @@ -27,8 +27,6 @@ import static org.junit.Assert.fail; import java.nio.ByteBuffer; import java.util.Map; -import com.mycila.junit.concurrent.Concurrency; -import com.mycila.junit.concurrent.ConcurrentJunitRunner; import org.apache.directory.shared.asn1.DecoderException; import org.apache.directory.shared.asn1.EncoderException; import org.apache.directory.shared.asn1.ber.Asn1Decoder; @@ -43,6 +41,9 @@ import org.apache.directory.shared.util. import org.junit.Test; import org.junit.runner.RunWith; +import com.mycila.junit.concurrent.Concurrency; +import com.mycila.junit.concurrent.ConcurrentJunitRunner; + /** * Test the SearchResultDone codec @@ -100,7 +101,7 @@ public class SearchResultDoneTest extend assertEquals( 1, searchResultDone.getMessageId() ); assertEquals( ResultCodeEnum.SUCCESS, searchResultDone.getLdapResult().getResultCode() ); assertEquals( "", searchResultDone.getLdapResult().getMatchedDn().getName() ); - assertEquals( "", searchResultDone.getLdapResult().getErrorMessage() ); + assertEquals( "", searchResultDone.getLdapResult().getDiagnosticMessage() ); // Check the encoding try @@ -181,7 +182,7 @@ public class SearchResultDoneTest extend assertEquals( 1, searchResultDone.getMessageId() ); assertEquals( ResultCodeEnum.SUCCESS, searchResultDone.getLdapResult().getResultCode() ); assertEquals( "", searchResultDone.getLdapResult().getMatchedDn().getName() ); - assertEquals( "", searchResultDone.getLdapResult().getErrorMessage() ); + assertEquals( "", searchResultDone.getLdapResult().getDiagnosticMessage() ); // Check the Control Map controls = searchResultDone.getControls(); Modified: directory/shared/trunk/ldap/codec/standalone/src/test/java/org/apache/directory/shared/ldap/codec/LdapResultTest.java URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/codec/standalone/src/test/java/org/apache/directory/shared/ldap/codec/LdapResultTest.java?rev=1096040&r1=1096039&r2=1096040&view=diff ============================================================================== --- directory/shared/trunk/ldap/codec/standalone/src/test/java/org/apache/directory/shared/ldap/codec/LdapResultTest.java (original) +++ directory/shared/trunk/ldap/codec/standalone/src/test/java/org/apache/directory/shared/ldap/codec/LdapResultTest.java Fri Apr 22 21:08:52 2011 @@ -28,13 +28,10 @@ import static org.junit.Assert.fail; import java.nio.ByteBuffer; import java.util.Collection; -import com.mycila.junit.concurrent.Concurrency; -import com.mycila.junit.concurrent.ConcurrentJunitRunner; - import org.apache.directory.shared.asn1.DecoderException; import org.apache.directory.shared.asn1.EncoderException; -import org.apache.directory.shared.asn1.ber.Asn1Decoder; import org.apache.directory.shared.asn1.ber.Asn1Container; +import org.apache.directory.shared.asn1.ber.Asn1Decoder; import org.apache.directory.shared.ldap.codec.api.LdapMessageContainer; import org.apache.directory.shared.ldap.codec.api.MessageDecorator; import org.apache.directory.shared.ldap.codec.decorators.AddResponseDecorator; @@ -47,6 +44,9 @@ import org.apache.directory.shared.util. import org.junit.Test; import org.junit.runner.RunWith; +import com.mycila.junit.concurrent.Concurrency; +import com.mycila.junit.concurrent.ConcurrentJunitRunner; + /** * A test for LdapResults. We will use a AddResponse message to test the @@ -299,7 +299,7 @@ public class LdapResultTest extends Abst assertEquals( 1, addResponse.getMessageId() ); assertEquals( ResultCodeEnum.SUCCESS, addResponse.getLdapResult().getResultCode() ); assertEquals( "", addResponse.getLdapResult().getMatchedDn().getName() ); - assertEquals( "", addResponse.getLdapResult().getErrorMessage() ); + assertEquals( "", addResponse.getLdapResult().getDiagnosticMessage() ); try { @@ -362,7 +362,7 @@ public class LdapResultTest extends Abst assertEquals( 1, addResponse.getMessageId() ); assertEquals( ResultCodeEnum.REFERRAL, addResponse.getLdapResult().getResultCode() ); assertEquals( "", addResponse.getLdapResult().getMatchedDn().getName() ); - assertEquals( "", addResponse.getLdapResult().getErrorMessage() ); + assertEquals( "", addResponse.getLdapResult().getDiagnosticMessage() ); Referral referral = addResponse.getLdapResult().getReferral(); @@ -440,7 +440,7 @@ public class LdapResultTest extends Abst assertEquals( 1, addResponse.getMessageId() ); assertEquals( ResultCodeEnum.REFERRAL, addResponse.getLdapResult().getResultCode() ); assertEquals( "", addResponse.getLdapResult().getMatchedDn().getName() ); - assertEquals( "", addResponse.getLdapResult().getErrorMessage() ); + assertEquals( "", addResponse.getLdapResult().getDiagnosticMessage() ); Referral referral = addResponse.getLdapResult().getReferral(); @@ -517,7 +517,7 @@ public class LdapResultTest extends Abst assertEquals( 1, addResponse.getMessageId() ); assertEquals( ResultCodeEnum.REFERRAL, addResponse.getLdapResult().getResultCode() ); assertEquals( "", addResponse.getLdapResult().getMatchedDn().getName() ); - assertEquals( "", addResponse.getLdapResult().getErrorMessage() ); + assertEquals( "", addResponse.getLdapResult().getDiagnosticMessage() ); Referral referral = addResponse.getLdapResult().getReferral(); Modified: directory/shared/trunk/ldap/codec/standalone/src/test/java/org/apache/directory/shared/ldap/codec/add/AddResponseTest.java URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/codec/standalone/src/test/java/org/apache/directory/shared/ldap/codec/add/AddResponseTest.java?rev=1096040&r1=1096039&r2=1096040&view=diff ============================================================================== --- directory/shared/trunk/ldap/codec/standalone/src/test/java/org/apache/directory/shared/ldap/codec/add/AddResponseTest.java (original) +++ directory/shared/trunk/ldap/codec/standalone/src/test/java/org/apache/directory/shared/ldap/codec/add/AddResponseTest.java Fri Apr 22 21:08:52 2011 @@ -27,12 +27,10 @@ import static org.junit.Assert.fail; import java.nio.ByteBuffer; import java.util.Map; -import com.mycila.junit.concurrent.Concurrency; -import com.mycila.junit.concurrent.ConcurrentJunitRunner; import org.apache.directory.shared.asn1.DecoderException; import org.apache.directory.shared.asn1.EncoderException; -import org.apache.directory.shared.asn1.ber.Asn1Decoder; import org.apache.directory.shared.asn1.ber.Asn1Container; +import org.apache.directory.shared.asn1.ber.Asn1Decoder; import org.apache.directory.shared.ldap.codec.api.CodecControl; import org.apache.directory.shared.ldap.codec.api.LdapMessageContainer; import org.apache.directory.shared.ldap.codec.api.MessageDecorator; @@ -46,6 +44,9 @@ import org.apache.directory.shared.util. import org.junit.Test; import org.junit.runner.RunWith; +import com.mycila.junit.concurrent.Concurrency; +import com.mycila.junit.concurrent.ConcurrentJunitRunner; + /** * @author Apache Directory Project @@ -102,7 +103,7 @@ public class AddResponseTest extends Abs assertEquals( 1, addResponse.getMessageId() ); assertEquals( ResultCodeEnum.SUCCESS, addResponse.getLdapResult().getResultCode() ); assertEquals( "", addResponse.getLdapResult().getMatchedDn().getName() ); - assertEquals( "", addResponse.getLdapResult().getErrorMessage() ); + assertEquals( "", addResponse.getLdapResult().getDiagnosticMessage() ); try { @@ -218,7 +219,7 @@ public class AddResponseTest extends Abs assertEquals( 1, addResponse.getMessageId() ); assertEquals( ResultCodeEnum.SUCCESS, addResponse.getLdapResult().getResultCode() ); assertEquals( "", addResponse.getLdapResult().getMatchedDn().getName() ); - assertEquals( "", addResponse.getLdapResult().getErrorMessage() ); + assertEquals( "", addResponse.getLdapResult().getDiagnosticMessage() ); // Check the Control Map controls = addResponse.getControls(); Modified: directory/shared/trunk/ldap/codec/standalone/src/test/java/org/apache/directory/shared/ldap/codec/bind/BindResponseTest.java URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/codec/standalone/src/test/java/org/apache/directory/shared/ldap/codec/bind/BindResponseTest.java?rev=1096040&r1=1096039&r2=1096040&view=diff ============================================================================== --- directory/shared/trunk/ldap/codec/standalone/src/test/java/org/apache/directory/shared/ldap/codec/bind/BindResponseTest.java (original) +++ directory/shared/trunk/ldap/codec/standalone/src/test/java/org/apache/directory/shared/ldap/codec/bind/BindResponseTest.java Fri Apr 22 21:08:52 2011 @@ -28,8 +28,6 @@ import java.nio.ByteBuffer; import java.util.Arrays; import java.util.Map; -import com.mycila.junit.concurrent.Concurrency; -import com.mycila.junit.concurrent.ConcurrentJunitRunner; import org.apache.directory.shared.asn1.DecoderException; import org.apache.directory.shared.asn1.EncoderException; import org.apache.directory.shared.asn1.ber.Asn1Container; @@ -48,6 +46,9 @@ import org.apache.directory.shared.util. import org.junit.Test; import org.junit.runner.RunWith; +import com.mycila.junit.concurrent.Concurrency; +import com.mycila.junit.concurrent.ConcurrentJunitRunner; + /** * @author Apache Directory Project @@ -105,7 +106,7 @@ public class BindResponseTest extends Ab assertEquals( 1, bindResponse.getMessageId() ); assertEquals( ResultCodeEnum.SUCCESS, bindResponse.getLdapResult().getResultCode() ); assertEquals( "", bindResponse.getLdapResult().getMatchedDn().getName() ); - assertEquals( "", bindResponse.getLdapResult().getErrorMessage() ); + assertEquals( "", bindResponse.getLdapResult().getDiagnosticMessage() ); // Check the encoding try @@ -186,7 +187,7 @@ public class BindResponseTest extends Ab assertEquals( 1, bindResponse.getMessageId() ); assertEquals( ResultCodeEnum.SUCCESS, bindResponse.getLdapResult().getResultCode() ); assertEquals( "", bindResponse.getLdapResult().getMatchedDn().getName() ); - assertEquals( "", bindResponse.getLdapResult().getErrorMessage() ); + assertEquals( "", bindResponse.getLdapResult().getDiagnosticMessage() ); // Check the Control Map controls = bindResponse.getControls(); @@ -272,7 +273,7 @@ public class BindResponseTest extends Ab assertEquals( 1, bindResponse.getMessageId() ); assertEquals( ResultCodeEnum.SUCCESS, bindResponse.getLdapResult().getResultCode() ); assertEquals( "", bindResponse.getLdapResult().getMatchedDn().getName() ); - assertEquals( "", bindResponse.getLdapResult().getErrorMessage() ); + assertEquals( "", bindResponse.getLdapResult().getDiagnosticMessage() ); assertEquals( "", Strings.utf8ToString(bindResponse.getServerSaslCreds()) ); // Check the encoding @@ -352,7 +353,7 @@ public class BindResponseTest extends Ab assertEquals( 1, bindResponse.getMessageId() ); assertEquals( ResultCodeEnum.SUCCESS, bindResponse.getLdapResult().getResultCode() ); assertEquals( "", bindResponse.getLdapResult().getMatchedDn().getName() ); - assertEquals( "", bindResponse.getLdapResult().getErrorMessage() ); + assertEquals( "", bindResponse.getLdapResult().getDiagnosticMessage() ); assertEquals( "", Strings.utf8ToString(bindResponse.getServerSaslCreds()) ); // Check the Control @@ -436,7 +437,7 @@ public class BindResponseTest extends Ab assertEquals( 1, bindResponse.getMessageId() ); assertEquals( ResultCodeEnum.SUCCESS, bindResponse.getLdapResult().getResultCode() ); assertEquals( "", bindResponse.getLdapResult().getMatchedDn().getName() ); - assertEquals( "", bindResponse.getLdapResult().getErrorMessage() ); + assertEquals( "", bindResponse.getLdapResult().getDiagnosticMessage() ); assertEquals( "AB", Strings.utf8ToString(bindResponse.getServerSaslCreds()) ); // Check the encoding Modified: directory/shared/trunk/ldap/codec/standalone/src/test/java/org/apache/directory/shared/ldap/codec/compare/CompareResponseTest.java URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/codec/standalone/src/test/java/org/apache/directory/shared/ldap/codec/compare/CompareResponseTest.java?rev=1096040&r1=1096039&r2=1096040&view=diff ============================================================================== --- directory/shared/trunk/ldap/codec/standalone/src/test/java/org/apache/directory/shared/ldap/codec/compare/CompareResponseTest.java (original) +++ directory/shared/trunk/ldap/codec/standalone/src/test/java/org/apache/directory/shared/ldap/codec/compare/CompareResponseTest.java Fri Apr 22 21:08:52 2011 @@ -20,15 +20,13 @@ package org.apache.directory.shared.ldap.codec.compare; -import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; import java.nio.ByteBuffer; import java.util.Map; -import com.mycila.junit.concurrent.Concurrency; -import com.mycila.junit.concurrent.ConcurrentJunitRunner; import org.apache.directory.shared.asn1.DecoderException; import org.apache.directory.shared.asn1.EncoderException; import org.apache.directory.shared.asn1.ber.Asn1Decoder; @@ -43,6 +41,9 @@ import org.apache.directory.shared.util. import org.junit.Test; import org.junit.runner.RunWith; +import com.mycila.junit.concurrent.Concurrency; +import com.mycila.junit.concurrent.ConcurrentJunitRunner; + /** * Test the CompareResponse codec @@ -103,7 +104,7 @@ public class CompareResponseTest extends assertEquals( 1, compareResponse.getMessageId() ); assertEquals( ResultCodeEnum.SUCCESS, compareResponse.getLdapResult().getResultCode() ); assertEquals( "", compareResponse.getLdapResult().getMatchedDn().getName() ); - assertEquals( "", compareResponse.getLdapResult().getErrorMessage() ); + assertEquals( "", compareResponse.getLdapResult().getDiagnosticMessage() ); // Check the encoding try @@ -186,7 +187,7 @@ public class CompareResponseTest extends assertEquals( 1, compareResponse.getMessageId() ); assertEquals( ResultCodeEnum.SUCCESS, compareResponse.getLdapResult().getResultCode() ); assertEquals( "", compareResponse.getLdapResult().getMatchedDn().getName() ); - assertEquals( "", compareResponse.getLdapResult().getErrorMessage() ); + assertEquals( "", compareResponse.getLdapResult().getDiagnosticMessage() ); // Check the Control Map controls = compareResponse.getControls(); Modified: directory/shared/trunk/ldap/codec/standalone/src/test/java/org/apache/directory/shared/ldap/codec/del/DelResponseTest.java URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/codec/standalone/src/test/java/org/apache/directory/shared/ldap/codec/del/DelResponseTest.java?rev=1096040&r1=1096039&r2=1096040&view=diff ============================================================================== --- directory/shared/trunk/ldap/codec/standalone/src/test/java/org/apache/directory/shared/ldap/codec/del/DelResponseTest.java (original) +++ directory/shared/trunk/ldap/codec/standalone/src/test/java/org/apache/directory/shared/ldap/codec/del/DelResponseTest.java Fri Apr 22 21:08:52 2011 @@ -27,8 +27,6 @@ import static org.junit.Assert.fail; import java.nio.ByteBuffer; import java.util.Map; -import com.mycila.junit.concurrent.Concurrency; -import com.mycila.junit.concurrent.ConcurrentJunitRunner; import org.apache.directory.shared.asn1.DecoderException; import org.apache.directory.shared.asn1.EncoderException; import org.apache.directory.shared.asn1.ber.Asn1Decoder; @@ -43,6 +41,9 @@ import org.apache.directory.shared.util. import org.junit.Test; import org.junit.runner.RunWith; +import com.mycila.junit.concurrent.Concurrency; +import com.mycila.junit.concurrent.ConcurrentJunitRunner; + /** * Test the DelResponse codec @@ -110,7 +111,7 @@ public class DelResponseTest extends Abs assertEquals( 1, delResponse.getMessageId() ); assertEquals( ResultCodeEnum.ALIAS_PROBLEM, delResponse.getLdapResult().getResultCode() ); assertEquals( "uid=akarasulu,dc=example,dc=com", delResponse.getLdapResult().getMatchedDn().getName() ); - assertEquals( "", delResponse.getLdapResult().getErrorMessage() ); + assertEquals( "", delResponse.getLdapResult().getDiagnosticMessage() ); // Check the encoding try @@ -230,7 +231,7 @@ public class DelResponseTest extends Abs assertEquals( 1, delResponse.getMessageId() ); assertEquals( ResultCodeEnum.ALIAS_PROBLEM, delResponse.getLdapResult().getResultCode() ); assertEquals( "uid=akarasulu,dc=example,dc=com", delResponse.getLdapResult().getMatchedDn().getName() ); - assertEquals( "", delResponse.getLdapResult().getErrorMessage() ); + assertEquals( "", delResponse.getLdapResult().getDiagnosticMessage() ); // Check the Control Map controls = delResponse.getControls(); Modified: directory/shared/trunk/ldap/codec/standalone/src/test/java/org/apache/directory/shared/ldap/codec/extended/ExtendedResponseTest.java URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/codec/standalone/src/test/java/org/apache/directory/shared/ldap/codec/extended/ExtendedResponseTest.java?rev=1096040&r1=1096039&r2=1096040&view=diff ============================================================================== --- directory/shared/trunk/ldap/codec/standalone/src/test/java/org/apache/directory/shared/ldap/codec/extended/ExtendedResponseTest.java (original) +++ directory/shared/trunk/ldap/codec/standalone/src/test/java/org/apache/directory/shared/ldap/codec/extended/ExtendedResponseTest.java Fri Apr 22 21:08:52 2011 @@ -20,21 +20,19 @@ package org.apache.directory.shared.ldap.codec.extended; -import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; import java.nio.ByteBuffer; import java.util.Map; -import com.mycila.junit.concurrent.Concurrency; -import com.mycila.junit.concurrent.ConcurrentJunitRunner; import org.apache.directory.shared.asn1.DecoderException; import org.apache.directory.shared.asn1.EncoderException; import org.apache.directory.shared.asn1.ber.Asn1Decoder; -import org.apache.directory.shared.ldap.codec.api.LdapMessageContainer; import org.apache.directory.shared.ldap.codec.api.CodecControl; import org.apache.directory.shared.ldap.codec.api.ExtendedResponseDecorator; +import org.apache.directory.shared.ldap.codec.api.LdapMessageContainer; import org.apache.directory.shared.ldap.codec.osgi.AbstractCodecServiceTest; import org.apache.directory.shared.ldap.model.message.Control; import org.apache.directory.shared.ldap.model.message.ExtendedResponse; @@ -43,6 +41,9 @@ import org.apache.directory.shared.util. import org.junit.Test; import org.junit.runner.RunWith; +import com.mycila.junit.concurrent.Concurrency; +import com.mycila.junit.concurrent.ConcurrentJunitRunner; + /** * Test the ExtendedResponse codec @@ -105,7 +106,7 @@ public class ExtendedResponseTest extend assertEquals( 1, extendedResponse.getMessageId() ); assertEquals( ResultCodeEnum.SUCCESS, extendedResponse.getLdapResult().getResultCode() ); assertEquals( "", extendedResponse.getLdapResult().getMatchedDn().getName() ); - assertEquals( "", extendedResponse.getLdapResult().getErrorMessage() ); + assertEquals( "", extendedResponse.getLdapResult().getDiagnosticMessage() ); assertEquals( "1.3.6.1.5.5.2", extendedResponse.getResponseName() ); assertEquals( "value", Strings.utf8ToString((byte[]) extendedResponse.getResponseValue()) ); @@ -197,7 +198,7 @@ public class ExtendedResponseTest extend assertEquals( 1, extendedResponse.getMessageId() ); assertEquals( ResultCodeEnum.SUCCESS, extendedResponse.getLdapResult().getResultCode() ); assertEquals( "", extendedResponse.getLdapResult().getMatchedDn().getName() ); - assertEquals( "", extendedResponse.getLdapResult().getErrorMessage() ); + assertEquals( "", extendedResponse.getLdapResult().getDiagnosticMessage() ); assertEquals( "1.3.6.1.5.5.2", extendedResponse.getResponseName() ); assertEquals( "value", Strings.utf8ToString((byte[]) extendedResponse.getResponseValue() ) ); @@ -281,7 +282,7 @@ public class ExtendedResponseTest extend assertEquals( 1, extendedResponse.getMessageId() ); assertEquals( ResultCodeEnum.SUCCESS, extendedResponse.getLdapResult().getResultCode() ); assertEquals( "", extendedResponse.getLdapResult().getMatchedDn().getName() ); - assertEquals( "", extendedResponse.getLdapResult().getErrorMessage() ); + assertEquals( "", extendedResponse.getLdapResult().getDiagnosticMessage() ); // Check the encoding try @@ -364,7 +365,7 @@ public class ExtendedResponseTest extend assertEquals( 1, extendedResponse.getMessageId() ); assertEquals( ResultCodeEnum.SUCCESS, extendedResponse.getLdapResult().getResultCode() ); assertEquals( "", extendedResponse.getLdapResult().getMatchedDn().getName() ); - assertEquals( "", extendedResponse.getLdapResult().getErrorMessage() ); + assertEquals( "", extendedResponse.getLdapResult().getDiagnosticMessage() ); // Check the Control Map controls = extendedResponse.getControls(); @@ -571,7 +572,7 @@ public class ExtendedResponseTest extend assertEquals( 1, extendedResponse.getMessageId() ); assertEquals( ResultCodeEnum.SUCCESS, extendedResponse.getLdapResult().getResultCode() ); assertEquals( "", extendedResponse.getLdapResult().getMatchedDn().getName() ); - assertEquals( "", extendedResponse.getLdapResult().getErrorMessage() ); + assertEquals( "", extendedResponse.getLdapResult().getDiagnosticMessage() ); assertEquals( "1.3.6.1.5.5.2", extendedResponse.getResponseName() ); assertEquals( "", Strings.utf8ToString((byte[]) extendedResponse.getResponseValue() ) ); @@ -658,7 +659,7 @@ public class ExtendedResponseTest extend assertEquals( 1, extendedResponse.getMessageId() ); assertEquals( ResultCodeEnum.SUCCESS, extendedResponse.getLdapResult().getResultCode() ); assertEquals( "", extendedResponse.getLdapResult().getMatchedDn().getName() ); - assertEquals( "", extendedResponse.getLdapResult().getErrorMessage() ); + assertEquals( "", extendedResponse.getLdapResult().getDiagnosticMessage() ); assertEquals( "1.3.6.1.5.5.2", extendedResponse.getResponseName() ); assertEquals( "", Strings.utf8ToString( ( byte[] ) extendedResponse.getResponseValue() ) ); @@ -751,7 +752,7 @@ public class ExtendedResponseTest extend assertEquals( 1, extendedResponse.getMessageId() ); assertEquals( ResultCodeEnum.SUCCESS, extendedResponse.getLdapResult().getResultCode() ); assertEquals( "", extendedResponse.getLdapResult().getMatchedDn().getName() ); - assertEquals( "", extendedResponse.getLdapResult().getErrorMessage() ); + assertEquals( "", extendedResponse.getLdapResult().getDiagnosticMessage() ); assertEquals( "1.3.6.1.5.5.2", extendedResponse.getResponseName() ); assertEquals( "", Strings.utf8ToString((byte[]) extendedResponse.getResponseValue() ) ); @@ -839,7 +840,7 @@ public class ExtendedResponseTest extend assertEquals( 1, extendedResponse.getMessageId() ); assertEquals( ResultCodeEnum.SUCCESS, extendedResponse.getLdapResult().getResultCode() ); assertEquals( "", extendedResponse.getLdapResult().getMatchedDn().getName() ); - assertEquals( "", extendedResponse.getLdapResult().getErrorMessage() ); + assertEquals( "", extendedResponse.getLdapResult().getDiagnosticMessage() ); assertEquals( "1.3.6.1.5.5.2", extendedResponse.getResponseName() ); assertEquals( "", Strings.utf8ToString((byte[]) extendedResponse.getResponseValue() ) ); Modified: directory/shared/trunk/ldap/codec/standalone/src/test/java/org/apache/directory/shared/ldap/codec/modify/ModifyResponseTest.java URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/codec/standalone/src/test/java/org/apache/directory/shared/ldap/codec/modify/ModifyResponseTest.java?rev=1096040&r1=1096039&r2=1096040&view=diff ============================================================================== --- directory/shared/trunk/ldap/codec/standalone/src/test/java/org/apache/directory/shared/ldap/codec/modify/ModifyResponseTest.java (original) +++ directory/shared/trunk/ldap/codec/standalone/src/test/java/org/apache/directory/shared/ldap/codec/modify/ModifyResponseTest.java Fri Apr 22 21:08:52 2011 @@ -27,8 +27,6 @@ import static org.junit.Assert.fail; import java.nio.ByteBuffer; import java.util.Map; -import com.mycila.junit.concurrent.Concurrency; -import com.mycila.junit.concurrent.ConcurrentJunitRunner; import org.apache.directory.shared.asn1.DecoderException; import org.apache.directory.shared.asn1.EncoderException; import org.apache.directory.shared.asn1.ber.Asn1Decoder; @@ -43,6 +41,9 @@ import org.apache.directory.shared.util. import org.junit.Test; import org.junit.runner.RunWith; +import com.mycila.junit.concurrent.Concurrency; +import com.mycila.junit.concurrent.ConcurrentJunitRunner; + /** * Test the ModifyResponse codec @@ -102,7 +103,7 @@ public class ModifyResponseTest extends assertEquals( 1, modifyResponse.getMessageId() ); assertEquals( ResultCodeEnum.SUCCESS, modifyResponse.getLdapResult().getResultCode() ); assertEquals( "", modifyResponse.getLdapResult().getMatchedDn().getName() ); - assertEquals( "", modifyResponse.getLdapResult().getErrorMessage() ); + assertEquals( "", modifyResponse.getLdapResult().getDiagnosticMessage() ); // Check the encoding try @@ -183,7 +184,7 @@ public class ModifyResponseTest extends assertEquals( 1, modifyResponse.getMessageId() ); assertEquals( ResultCodeEnum.SUCCESS, modifyResponse.getLdapResult().getResultCode() ); assertEquals( "", modifyResponse.getLdapResult().getMatchedDn().getName() ); - assertEquals( "", modifyResponse.getLdapResult().getErrorMessage() ); + assertEquals( "", modifyResponse.getLdapResult().getDiagnosticMessage() ); // Check the Control Map controls = modifyResponse.getControls(); Modified: directory/shared/trunk/ldap/codec/standalone/src/test/java/org/apache/directory/shared/ldap/codec/modifyDn/ModifyDNResponseTest.java URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/codec/standalone/src/test/java/org/apache/directory/shared/ldap/codec/modifyDn/ModifyDNResponseTest.java?rev=1096040&r1=1096039&r2=1096040&view=diff ============================================================================== --- directory/shared/trunk/ldap/codec/standalone/src/test/java/org/apache/directory/shared/ldap/codec/modifyDn/ModifyDNResponseTest.java (original) +++ directory/shared/trunk/ldap/codec/standalone/src/test/java/org/apache/directory/shared/ldap/codec/modifyDn/ModifyDNResponseTest.java Fri Apr 22 21:08:52 2011 @@ -27,8 +27,6 @@ import static org.junit.Assert.fail; import java.nio.ByteBuffer; import java.util.Map; -import com.mycila.junit.concurrent.Concurrency; -import com.mycila.junit.concurrent.ConcurrentJunitRunner; import org.apache.directory.shared.asn1.DecoderException; import org.apache.directory.shared.asn1.EncoderException; import org.apache.directory.shared.asn1.ber.Asn1Decoder; @@ -43,6 +41,9 @@ import org.apache.directory.shared.util. import org.junit.Test; import org.junit.runner.RunWith; +import com.mycila.junit.concurrent.Concurrency; +import com.mycila.junit.concurrent.ConcurrentJunitRunner; + /** * Test the ModifyDNResponse codec @@ -103,7 +104,7 @@ public class ModifyDNResponseTest extend assertEquals( 1, modifyDnResponse.getMessageId() ); assertEquals( ResultCodeEnum.SUCCESS, modifyDnResponse.getLdapResult().getResultCode() ); assertEquals( "", modifyDnResponse.getLdapResult().getMatchedDn().getName() ); - assertEquals( "", modifyDnResponse.getLdapResult().getErrorMessage() ); + assertEquals( "", modifyDnResponse.getLdapResult().getDiagnosticMessage() ); // Check the encoding try @@ -186,7 +187,7 @@ public class ModifyDNResponseTest extend assertEquals( 1, modifyDnResponse.getMessageId() ); assertEquals( ResultCodeEnum.SUCCESS, modifyDnResponse.getLdapResult().getResultCode() ); assertEquals( "", modifyDnResponse.getLdapResult().getMatchedDn().getName() ); - assertEquals( "", modifyDnResponse.getLdapResult().getErrorMessage() ); + assertEquals( "", modifyDnResponse.getLdapResult().getDiagnosticMessage() ); // Check the Control Map controls = modifyDnResponse.getControls(); Modified: directory/shared/trunk/ldap/codec/standalone/src/test/java/org/apache/directory/shared/ldap/codec/search/SearchResultDoneTest.java URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/codec/standalone/src/test/java/org/apache/directory/shared/ldap/codec/search/SearchResultDoneTest.java?rev=1096040&r1=1096039&r2=1096040&view=diff ============================================================================== --- directory/shared/trunk/ldap/codec/standalone/src/test/java/org/apache/directory/shared/ldap/codec/search/SearchResultDoneTest.java (original) +++ directory/shared/trunk/ldap/codec/standalone/src/test/java/org/apache/directory/shared/ldap/codec/search/SearchResultDoneTest.java Fri Apr 22 21:08:52 2011 @@ -27,8 +27,6 @@ import static org.junit.Assert.fail; import java.nio.ByteBuffer; import java.util.Map; -import com.mycila.junit.concurrent.Concurrency; -import com.mycila.junit.concurrent.ConcurrentJunitRunner; import org.apache.directory.shared.asn1.DecoderException; import org.apache.directory.shared.asn1.EncoderException; import org.apache.directory.shared.asn1.ber.Asn1Decoder; @@ -43,6 +41,9 @@ import org.apache.directory.shared.util. import org.junit.Test; import org.junit.runner.RunWith; +import com.mycila.junit.concurrent.Concurrency; +import com.mycila.junit.concurrent.ConcurrentJunitRunner; + /** * Test the SearchResultDone codec @@ -100,7 +101,7 @@ public class SearchResultDoneTest extend assertEquals( 1, searchResultDone.getMessageId() ); assertEquals( ResultCodeEnum.SUCCESS, searchResultDone.getLdapResult().getResultCode() ); assertEquals( "", searchResultDone.getLdapResult().getMatchedDn().getName() ); - assertEquals( "", searchResultDone.getLdapResult().getErrorMessage() ); + assertEquals( "", searchResultDone.getLdapResult().getDiagnosticMessage() ); // Check the encoding try @@ -181,7 +182,7 @@ public class SearchResultDoneTest extend assertEquals( 1, searchResultDone.getMessageId() ); assertEquals( ResultCodeEnum.SUCCESS, searchResultDone.getLdapResult().getResultCode() ); assertEquals( "", searchResultDone.getLdapResult().getMatchedDn().getName() ); - assertEquals( "", searchResultDone.getLdapResult().getErrorMessage() ); + assertEquals( "", searchResultDone.getLdapResult().getDiagnosticMessage() ); // Check the Control Map controls = searchResultDone.getControls(); Modified: directory/shared/trunk/ldap/extras/codec-api/src/main/java/org/apache/directory/shared/ldap/extras/extended/GracefulDisconnectResponseImpl.java URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/extras/codec-api/src/main/java/org/apache/directory/shared/ldap/extras/extended/GracefulDisconnectResponseImpl.java?rev=1096040&r1=1096039&r2=1096040&view=diff ============================================================================== --- directory/shared/trunk/ldap/extras/codec-api/src/main/java/org/apache/directory/shared/ldap/extras/extended/GracefulDisconnectResponseImpl.java (original) +++ directory/shared/trunk/ldap/extras/codec-api/src/main/java/org/apache/directory/shared/ldap/extras/extended/GracefulDisconnectResponseImpl.java Fri Apr 22 21:08:52 2011 @@ -77,7 +77,7 @@ public class GracefulDisconnectResponseI buf.append( "The server will disconnect and will be unavailable for " ).append( timeOffline ); buf.append( " minutes in " ).append( delay ).append( " seconds." ); - ldapResult.setErrorMessage( buf.toString() ); + ldapResult.setDiagnosticMessage( buf.toString() ); ldapResult.setMatchedDn( null ); ldapResult.setResultCode( ResultCodeEnum.UNAVAILABLE ); }