You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@cxf.apache.org by Sergey Beryozkin <sb...@gmail.com> on 2012/02/03 22:50:12 UTC

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

Dan , thanks for taking care of it,

Sergey
On 03/02/12 21:31, dkulp@apache.org wrote:
> Author: dkulp
> Date: Fri Feb  3 21:31:23 2012
> New Revision: 1240347
>
> URL: http://svn.apache.org/viewvc?rev=1240347&view=rev
> Log:
> Merged revisions 1240326 via svnmerge from
> https://svn.apache.org/repos/asf/cxf/branches/2.5.x-fixes
>
> ................
>    r1240326 | dkulp | 2012-02-03 15:05:40 -0500 (Fri, 03 Feb 2012) | 9 lines
>
>    Merged revisions 1240325 via svnmerge from
>    https://svn.apache.org/repos/asf/cxf/trunk
>
>    ........
>      r1240325 | dkulp | 2012-02-03 15:04:29 -0500 (Fri, 03 Feb 2012) | 1 line
>
>      Remove @Override annotation
>    ........
> ................
>
> 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/BookSubresourceImpl.java
>
> Propchange: cxf/branches/2.4.x-fixes/
>              ('svn:mergeinfo' removed)
>
> 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/BookSubresourceImpl.java
> URL: http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookSubresourceImpl.java?rev=1240347&r1=1240346&r2=1240347&view=diff
> ==============================================================================
> --- cxf/branches/2.4.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookSubresourceImpl.java (original)
> +++ cxf/branches/2.4.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookSubresourceImpl.java Fri Feb  3 21:31:23 2012
> @@ -103,7 +103,6 @@ public class BookSubresourceImpl impleme
>           return order;
>       }
>
> -    @Override
>       public Book getTheBookWithContext(UriInfo ui) throws BookNotFoundFault {
>           return getTheBook();
>       }
>
>