Return-Path: X-Original-To: apmail-cxf-commits-archive@www.apache.org Delivered-To: apmail-cxf-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 D75E5922F for ; Mon, 14 May 2012 21:48:48 +0000 (UTC) Received: (qmail 81284 invoked by uid 500); 14 May 2012 21:48:48 -0000 Delivered-To: apmail-cxf-commits-archive@cxf.apache.org Received: (qmail 81208 invoked by uid 500); 14 May 2012 21:48:48 -0000 Mailing-List: contact commits-help@cxf.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cxf.apache.org Delivered-To: mailing list commits@cxf.apache.org Received: (qmail 81200 invoked by uid 99); 14 May 2012 21:48:48 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 14 May 2012 21:48:48 +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; Mon, 14 May 2012 21:48:47 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 3C5B52388847; Mon, 14 May 2012 21:48:27 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1338447 - in /cxf/branches/2.4.x-fixes: ./ systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookStore.java systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerStreamingTest.java Date: Mon, 14 May 2012 21:48:27 -0000 To: commits@cxf.apache.org From: sergeyb@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20120514214827.3C5B52388847@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: sergeyb Date: Mon May 14 21:48:26 2012 New Revision: 1338447 URL: http://svn.apache.org/viewvc?rev=1338447&view=rev Log: Merged revisions 1338444 via svnmerge from https://svn.apache.org/repos/asf/cxf/branches/2.5.x-fixes ................ r1338444 | sergeyb | 2012-05-14 22:40:47 +0100 (Mon, 14 May 2012) | 9 lines Merged revisions 1338441 via svnmerge from https://svn.apache.org/repos/asf/cxf/trunk ........ r1338441 | sergeyb | 2012-05-14 22:35:37 +0100 (Mon, 14 May 2012) | 1 line Few updates to the jaxrs system tests to avoid the ambiguous matches ........ ................ Modified: cxf/branches/2.4.x-fixes/ (props changed) cxf/branches/2.4.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookStore.java cxf/branches/2.4.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerStreamingTest.java Propchange: cxf/branches/2.4.x-fixes/ ------------------------------------------------------------------------------ Merged /cxf/branches/2.5.x-fixes:r1338444 Merged /cxf/trunk:r1338441 Propchange: cxf/branches/2.4.x-fixes/ ------------------------------------------------------------------------------ Binary property 'svnmerge-integrated' - no diff available. Modified: cxf/branches/2.4.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookStore.java URL: http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookStore.java?rev=1338447&r1=1338446&r2=1338447&view=diff ============================================================================== --- cxf/branches/2.4.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookStore.java (original) +++ cxf/branches/2.4.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookStore.java Mon May 14 21:48:26 2012 @@ -555,7 +555,7 @@ public class BookStore { } @GET - @Path("/books/{bookId}/") + @Path("/books/text/xml/{bookId}") @Produces("text/xml") public Book getBookTextXml(@PathParam("bookId") String id) throws BookNotFoundFault { return doGetBook(id); Modified: cxf/branches/2.4.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerStreamingTest.java URL: http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerStreamingTest.java?rev=1338447&r1=1338446&r2=1338447&view=diff ============================================================================== --- cxf/branches/2.4.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerStreamingTest.java (original) +++ cxf/branches/2.4.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerStreamingTest.java Mon May 14 21:48:26 2012 @@ -108,7 +108,7 @@ public class JAXRSClientServerStreamingT @Test public void testGetBook123Fail() throws Exception { - WebClient wc = WebClient.create("http://localhost:" + PORT + "/bookstore/books/123"); + WebClient wc = WebClient.create("http://localhost:" + PORT + "/bookstore/books/text/xml/123"); wc.accept("text/xml"); wc.header("fail-write", ""); Response r = wc.get(); @@ -117,7 +117,7 @@ public class JAXRSClientServerStreamingT @Test public void testGetBookUsingStaxWriter() throws Exception { - getAndCompare("http://localhost:" + PORT + "/bookstore/books/123", + getAndCompare("http://localhost:" + PORT + "/bookstore/books/text/xml/123", "text/xml", 200); }