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 2011/12/20 13:20:21 UTC
svn commit: r1221223 - in /cxf/branches/2.4.x-fixes: ./
systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookStoreSpring.java
systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerSpringBookTest.java
Author: sergeyb
Date: Tue Dec 20 12:20:21 2011
New Revision: 1221223
URL: http://svn.apache.org/viewvc?rev=1221223&view=rev
Log:
Merged revisions 1221221 via svnmerge from
https://svn.apache.org/repos/asf/cxf/trunk
........
r1221221 | sergeyb | 2011-12-20 12:18:55 +0000 (Tue, 20 Dec 2011) | 1 line
Fixing the system test failing after some temp code got in
........
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/BookStoreSpring.java
cxf/branches/2.4.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerSpringBookTest.java
Propchange: cxf/branches/2.4.x-fixes/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Dec 20 12:20:21 2011
@@ -1 +1 @@
-/cxf/trunk:1221204,1221208
+/cxf/trunk:1221204,1221208,1221221
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/BookStoreSpring.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookStoreSpring.java?rev=1221223&r1=1221222&r2=1221223&view=diff
==============================================================================
--- cxf/branches/2.4.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookStoreSpring.java (original)
+++ cxf/branches/2.4.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookStoreSpring.java Tue Dec 20 12:20:21 2011
@@ -139,8 +139,8 @@ public class BookStoreSpring {
@POST
@Path("books/convert")
- @Consumes({"application/jettison" })
- @Produces("application/vnd.example-com.foo+json")
+ @Consumes({"application/xml", "application/json", "application/vnd.example-com.foo+json" })
+ @Produces({"application/xml", "application/vnd.example-com.foo+json" })
public Book convertBook(Book2 book) {
// how to have Book2 populated ?
Book b = new Book();
Modified: cxf/branches/2.4.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerSpringBookTest.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerSpringBookTest.java?rev=1221223&r1=1221222&r2=1221223&view=diff
==============================================================================
--- cxf/branches/2.4.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerSpringBookTest.java (original)
+++ cxf/branches/2.4.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerSpringBookTest.java Tue Dec 20 12:20:21 2011
@@ -64,7 +64,7 @@ public class JAXRSClientServerSpringBook
@BeforeClass
public static void startServers() throws Exception {
assertTrue("server did not launch correctly",
- launchServer(BookServerSpring.class, true));
+ launchServer(BookServerSpring.class));
}
@Test
@@ -353,11 +353,11 @@ public class JAXRSClientServerSpringBook
"resources/add_book2json_invalid.txt",
null);
- doPost("http://localhost:" + PORT + "/the/thebooks/bookstore/books/convert",
- 400,
- "application/json",
- "resources/add_book2json_invalid.txt",
- null);
+// doPost("http://localhost:" + PORT + "/the/thebooks/bookstore/books/convert",
+// 400,
+// "application/json",
+// "resources/add_book2json_invalid.txt",
+// null);
}
@@ -520,7 +520,7 @@ public class JAXRSClientServerSpringBook
doPost("http://localhost:" + PORT + "/the/thebooks/bookstore/books/convert",
200,
- "application/jettison",
+ "application/vnd.example-com.foo+json",
"resources/add_book2json.txt",
"resources/expected_get_book123.txt");
}