svn commit: r1125290 - in /cxf/branches/2.3.x-fixes: ./ systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/Book.java

[sergeyb]

Author: sergeyb
Date: Fri May 20 09:19:11 2011
New Revision: 1125290

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

........
  r1125289 | sergeyb | 2011-05-20 10:15:56 +0100 (Fri, 20 May 2011) | 1 line
  
  Fixing jaxrs systest failues
........

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

Propchange: cxf/branches/2.3.x-fixes/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri May 20 09:19:11 2011
@@ -1 +1 @@
-/cxf/trunk:1099767,1100898,1101399,1102198,1103904,1104144,1104180,1104217,1104230,1124357,1125115
+/cxf/trunk:1099767,1100898,1101399,1102198,1103904,1104144,1104180,1104217,1104230,1124357,1125115,1125289

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/Book.java
URL: 
http://svn.apache.org/viewvc/cxf/branches/2.3.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/Book.java?rev=1125290&r1=1125289&r2=1125290&view=diff
==============================================================================
--- 
cxf/branches/2.3.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/Book.java
 (original)
+++ 
cxf/branches/2.3.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/Book.java
 Fri May 20 09:19:11 2011
@@ -68,7 +68,7 @@ public class Book {
     }
     
     @GET
-    public Book getState() {
+    public Book retrieveState() {
         return this;
     }