cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From serg...@apache.org
Subject svn commit: r1221224 - in /cxf/branches/2.3.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
Date Tue, 20 Dec 2011 12:22:08 GMT
Author: sergeyb
Date: Tue Dec 20 12:22:07 2011
New Revision: 1221224

URL: http://svn.apache.org/viewvc?rev=1221224&view=rev
Log:
Merged revisions 1221223 via svnmerge from 
https://svn.apache.org/repos/asf/cxf/branches/2.4.x-fixes

................
  r1221223 | sergeyb | 2011-12-20 12:20:21 +0000 (Tue, 20 Dec 2011) | 9 lines
  
  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.3.x-fixes/   (props changed)
    cxf/branches/2.3.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookStoreSpring.java
    cxf/branches/2.3.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerSpringBookTest.java

Propchange: cxf/branches/2.3.x-fixes/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Dec 20 12:22:07 2011
@@ -1,2 +1,2 @@
-/cxf/branches/2.4.x-fixes:1221206,1221210
-/cxf/trunk:1221204,1221208
+/cxf/branches/2.4.x-fixes:1221206,1221210,1221223
+/cxf/trunk:1221204,1221208,1221221

Propchange: cxf/branches/2.3.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.

Modified: cxf/branches/2.3.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookStoreSpring.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.3.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookStoreSpring.java?rev=1221224&r1=1221223&r2=1221224&view=diff
==============================================================================
--- cxf/branches/2.3.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookStoreSpring.java
(original)
+++ cxf/branches/2.3.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookStoreSpring.java
Tue Dec 20 12:22:07 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.3.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerSpringBookTest.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.3.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerSpringBookTest.java?rev=1221224&r1=1221223&r2=1221224&view=diff
==============================================================================
--- cxf/branches/2.3.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerSpringBookTest.java
(original)
+++ cxf/branches/2.3.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerSpringBookTest.java
Tue Dec 20 12:22:07 2011
@@ -56,7 +56,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
@@ -263,11 +263,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);
                 
     }
     
@@ -430,7 +430,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");
     }



Mime
View raw message