Author: dkulp
Date: Fri Feb 3 20:05:40 2012
New Revision: 1240326
URL: http://svn.apache.org/viewvc?rev=1240326&view=rev
Log:
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.5.x-fixes/ (props changed)
cxf/branches/2.5.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookSubresourceImpl.java
Propchange: cxf/branches/2.5.x-fixes/
------------------------------------------------------------------------------
svn:mergeinfo = /cxf/trunk:1240325
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/BookSubresourceImpl.java
URL:
http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookSubresourceImpl.java?rev=1240326&r1=1240325&r2=1240326&view=diff
==============================================================================
---
cxf/branches/2.5.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookSubresourceImpl.java
(original)
+++
cxf/branches/2.5.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookSubresourceImpl.java
Fri Feb 3 20:05:40 2012
@@ -103,7 +103,6 @@ public class BookSubresourceImpl impleme
return order;
}
- @Override
public Book getTheBookWithContext(UriInfo ui) throws BookNotFoundFault {
return getTheBook();
}
