You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by se...@apache.org on 2012/05/14 23:48:27 UTC
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
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);
}