Return-Path: X-Original-To: apmail-cxf-commits-archive@www.apache.org Delivered-To: apmail-cxf-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 5DD5D96A8 for ; Fri, 3 Feb 2012 21:55:59 +0000 (UTC) Received: (qmail 21950 invoked by uid 500); 3 Feb 2012 21:55:59 -0000 Delivered-To: apmail-cxf-commits-archive@cxf.apache.org Received: (qmail 21848 invoked by uid 500); 3 Feb 2012 21:55:58 -0000 Mailing-List: contact commits-help@cxf.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cxf.apache.org Delivered-To: mailing list commits@cxf.apache.org Received: (qmail 21840 invoked by uid 99); 3 Feb 2012 21:55:58 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 03 Feb 2012 21:55:58 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 03 Feb 2012 21:55:56 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 588CE238897D for ; Fri, 3 Feb 2012 21:55:35 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1240359 - in /cxf/branches/2.3.x-fixes: ./ systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookSubresourceImpl.java Date: Fri, 03 Feb 2012 21:55:35 -0000 To: commits@cxf.apache.org From: sergeyb@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20120203215535.588CE238897D@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org 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(); }