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:24:59 UTC
svn commit: r1221228 - in /cxf/branches/2.3.x-fixes: ./
systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerSpringBookTest.java
Author: sergeyb
Date: Tue Dec 20 12:24:59 2011
New Revision: 1221228
URL: http://svn.apache.org/viewvc?rev=1221228&view=rev
Log:
Merged revisions 1221227 via svnmerge from
https://svn.apache.org/repos/asf/cxf/branches/2.4.x-fixes
................
r1221227 | sergeyb | 2011-12-20 12:23:43 +0000 (Tue, 20 Dec 2011) | 9 lines
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.3.x-fixes/ (props changed)
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:24:59 2011
@@ -1,2 +1,2 @@
-/cxf/branches/2.4.x-fixes:1221206,1221210,1221223
-/cxf/trunk:1221204,1221208,1221221
+/cxf/branches/2.4.x-fixes:1221206,1221210,1221223,1221227
+/cxf/trunk:1221204,1221208,1221221,1221226
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/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=1221228&r1=1221227&r2=1221228&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:24:59 2011
@@ -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);
}