svn commit: r1221227 - in /cxf/branches/2.4.x-fixes: ./ systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerSpringBookTest.java

[sergeyb]

Author: sergeyb
Date: Tue Dec 20 12:23:43 2011
New Revision: 1221227

URL: http://svn.apache.org/viewvc?rev=1221227&view=rev
Log:
Merged revisions 1221226 via svnmerge from 
https://svn.apache.org/repos/asf/cxf/trunk

........
  r1221226 | sergeyb | 2011-12-20 12:23:03 +0000 (Tue, 20 Dec 2011) | 1 line
  
  ...and uncommenting some temp-commented test code, sigh...
........

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/JAXRSClientServerSpringBookTest.java

Propchange: cxf/branches/2.4.x-fixes/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Dec 20 12:23:43 2011
@@ -1 +1 @@
-/cxf/trunk:1221204,1221208,1221221
+/cxf/trunk:1221204,1221208,1221221,1221226

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/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=1221227&r1=1221226&r2=1221227&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:23:43 2011
@@ -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);
                 
     }