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 2D321103EC for ; Wed, 11 Dec 2013 18:53:59 +0000 (UTC) Received: (qmail 73377 invoked by uid 500); 11 Dec 2013 18:53:59 -0000 Delivered-To: apmail-directory-commits-archive@directory.apache.org Received: (qmail 73341 invoked by uid 500); 11 Dec 2013 18:53:59 -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 73334 invoked by uid 99); 11 Dec 2013 18:53:59 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 11 Dec 2013 18:53:59 +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; Wed, 11 Dec 2013 18:53:55 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 688E32388868; Wed, 11 Dec 2013 18:53:34 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1550227 - in /directory: apacheds/trunk/server-integ/src/test/java/org/apache/directory/dsml/engine/ apacheds/trunk/server-integ/src/test/resources/ shared/trunk/dsml/engine/src/main/java/org/apache/directory/api/dsmlv2/engine/ Date: Wed, 11 Dec 2013 18:53:34 -0000 To: commits@directory.apache.org From: kayyagari@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20131211185334.688E32388868@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: kayyagari Date: Wed Dec 11 18:53:33 2013 New Revision: 1550227 URL: http://svn.apache.org/r1550227 Log: o fixed the missing 'requestID' attribute of BatchResponse o updated test (DIRAPI-160) Modified: directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/dsml/engine/Dsmlv2EngineIT.java directory/apacheds/trunk/server-integ/src/test/resources/dsml-search-req.xml directory/shared/trunk/dsml/engine/src/main/java/org/apache/directory/api/dsmlv2/engine/Dsmlv2Engine.java Modified: directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/dsml/engine/Dsmlv2EngineIT.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/dsml/engine/Dsmlv2EngineIT.java?rev=1550227&r1=1550226&r2=1550227&view=diff ============================================================================== --- directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/dsml/engine/Dsmlv2EngineIT.java (original) +++ directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/dsml/engine/Dsmlv2EngineIT.java Wed Dec 11 18:53:33 2013 @@ -95,6 +95,8 @@ public class Dsmlv2EngineIT extends Abst assertNotNull( batchResp ); + assertEquals( 101, batchResp.getRequestID() ); + SearchResponse searchResp = ( SearchResponse ) batchResp.getCurrentResponse().getDecorated(); assertEquals( 5, searchResp.getSearchResultEntryList().size() ); @@ -124,7 +126,9 @@ public class Dsmlv2EngineIT extends Abst BatchResponseDsml batchResp = respParser.getBatchResponse(); assertNotNull( batchResp ); - + + assertEquals( 101, batchResp.getRequestID() ); + SearchResponse searchResp = ( SearchResponse ) batchResp.getCurrentResponse().getDecorated(); assertEquals( 5, searchResp.getSearchResultEntryList().size() ); Modified: directory/apacheds/trunk/server-integ/src/test/resources/dsml-search-req.xml URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/server-integ/src/test/resources/dsml-search-req.xml?rev=1550227&r1=1550226&r2=1550227&view=diff ============================================================================== --- directory/apacheds/trunk/server-integ/src/test/resources/dsml-search-req.xml (original) +++ directory/apacheds/trunk/server-integ/src/test/resources/dsml-search-req.xml Wed Dec 11 18:53:33 2013 @@ -17,7 +17,7 @@ specific language governing permissions and limitations under the License. --> - Modified: directory/shared/trunk/dsml/engine/src/main/java/org/apache/directory/api/dsmlv2/engine/Dsmlv2Engine.java URL: http://svn.apache.org/viewvc/directory/shared/trunk/dsml/engine/src/main/java/org/apache/directory/api/dsmlv2/engine/Dsmlv2Engine.java?rev=1550227&r1=1550226&r2=1550227&view=diff ============================================================================== --- directory/shared/trunk/dsml/engine/src/main/java/org/apache/directory/api/dsmlv2/engine/Dsmlv2Engine.java (original) +++ directory/shared/trunk/dsml/engine/src/main/java/org/apache/directory/api/dsmlv2/engine/Dsmlv2Engine.java Wed Dec 11 18:53:33 2013 @@ -289,20 +289,6 @@ public class Dsmlv2Engine respWriter.write( ">" ); } - - respWriter.write( "' ); // the end tag } // Binding to LDAP Server @@ -319,16 +305,18 @@ public class Dsmlv2Engine ErrorResponse errorResponse = new ErrorResponse( 0, ErrorResponseType.COULD_NOT_CONNECT, e .getLocalizedMessage() ); + batchResponse.addResponse( errorResponse ); + if ( respWriter != null ) { - writeResponse( respWriter, errorResponse ); - respWriter.write( "" ); + respWriter.write( batchResponse.toDsml() ); + if( generateSoapResp ) + { + respWriter.write( "" ); + } + respWriter.flush(); } - else - { - batchResponse.addResponse( errorResponse ); - } return; } @@ -346,20 +334,45 @@ public class Dsmlv2Engine ErrorResponse errorResponse = new ErrorResponse( 0, ErrorResponseType.MALFORMED_REQUEST, I18n.err( I18n.ERR_03001, e.getLocalizedMessage(), e.getLineNumber(), e.getColumnNumber() ) ); + batchResponse.addResponse( errorResponse ); + if ( respWriter != null ) { - writeResponse( respWriter, errorResponse ); - respWriter.write( "" ); + respWriter.write( batchResponse.toDsml() ); + if( generateSoapResp ) + { + respWriter.write( "" ); + } + respWriter.flush(); } - else - { - batchResponse.addResponse( errorResponse ); - } return; } + if( respWriter != null ) + { + StringBuilder sb = new StringBuilder(); + + sb.append( "" ); + + respWriter.write( sb.toString() ); + } + // Processing each request: // - Getting a new request // - Checking if the request is well formed @@ -382,16 +395,19 @@ public class Dsmlv2Engine ErrorResponse errorResponse = new ErrorResponse( reqId, ErrorResponseType.MALFORMED_REQUEST, I18n.err( I18n.ERR_03001, e.getLocalizedMessage(), e.getLineNumber(), e.getColumnNumber() ) ); + batchResponse.addResponse( errorResponse ); + if ( respWriter != null ) { - writeResponse( respWriter, errorResponse ); - respWriter.write( "" ); + respWriter.write( batchResponse.toDsml() ); + + if( generateSoapResp ) + { + respWriter.write( "" ); + } + respWriter.flush(); } - else - { - batchResponse.addResponse( errorResponse ); - } return; } @@ -480,8 +496,7 @@ public class Dsmlv2Engine if ( generateSoapResp ) { - respWriter.write( "" ); - respWriter.write( "" ); + respWriter.write( "" ); } respWriter.flush();