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

[sergeyb]

Author: sergeyb
Date: Thu Feb 16 17:01:39 2012
New Revision: 1245081

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

........
  r1244821 | dkulp | 2012-02-16 01:50:59 +0000 (Thu, 16 Feb 2012) | 1 line
  
  Fix failing test
........

Modified:
    cxf/branches/2.5.x-fixes/   (props changed)
    
cxf/branches/2.5.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerSpringBookTest.java

Propchange: cxf/branches/2.5.x-fixes/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Feb 16 17:01:39 2012
@@ -1 +1 @@
-/cxf/trunk:1244697,1244939,1245070
+/cxf/trunk:1244697,1244821,1244939,1245070

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

Modified: 
cxf/branches/2.5.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerSpringBookTest.java
URL: 
http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerSpringBookTest.java?rev=1245081&r1=1245080&r2=1245081&view=diff
==============================================================================
--- 
cxf/branches/2.5.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerSpringBookTest.java
 (original)
+++ 
cxf/branches/2.5.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerSpringBookTest.java
 Thu Feb 16 17:01:39 2012
@@ -230,7 +230,7 @@ public class JAXRSClientServerSpringBook
         client.query("_jsonp", "callback");
         
WebClient.getConfig(client).getHttpConduit().getClient().setReceiveTimeout(1000000L);
         Response r = client.get();
-        assertEquals("application/x+javascript", 
r.getMetadata().getFirst("Content-Type"));
+        assertEquals("application/x-javascript", 
r.getMetadata().getFirst("Content-Type"));
         assertEquals("callback({\"Book\":{\"id\":123,\"name\":\"CXF in 
Action\"}});",
                      IOUtils.readStringFromStream((InputStream)r.getEntity()));
     }