Author: sergeyb Date: Fri Feb 3 21:55:34 2012 New Revision: 1240359 URL: http://svn.apache.org/viewvc?rev=1240359&view=rev Log: Merged revisions 1240347 via svnmerge from https://svn.apache.org/repos/asf/cxf/branches/2.4.x-fixes
................ r1240347 | dkulp | 2012-02-03 21:31:23 +0000 (Fri, 03 Feb 2012) | 16 lines 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.3.x-fixes/ (props changed) cxf/branches/2.3.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookSubresourceImpl.java Propchange: cxf/branches/2.3.x-fixes/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Fri Feb 3 21:55:34 2012 @@ -1,3 +1,3 @@ -/cxf/branches/2.4.x-fixes:1235732,1236170,1236646,1239371,1240148,1240260 +/cxf/branches/2.4.x-fixes:1235732,1236170,1236646,1239371,1240148,1240260,1240347 /cxf/branches/2.5.x-fixes:1235731,1236169,1236643,1239368,1240147,1240255 /cxf/trunk:1235730,1236166,1236624,1239365,1240136,1240252 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/BookSubresourceImpl.java URL: http://svn.apache.org/viewvc/cxf/branches/2.3.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookSubresourceImpl.java?rev=1240359&r1=1240358&r2=1240359&view=diff ============================================================================== --- cxf/branches/2.3.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookSubresourceImpl.java (original) +++ cxf/branches/2.3.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookSubresourceImpl.java Fri Feb 3 21:55:34 2012 @@ -103,7 +103,6 @@ public class BookSubresourceImpl impleme return order; } - @Override public Book getTheBookWithContext(UriInfo ui) throws BookNotFoundFault { return getTheBook(); }
