Return-Path: Delivered-To: apmail-cxf-commits-archive@www.apache.org Received: (qmail 9552 invoked from network); 11 Jan 2011 14:50:02 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 11 Jan 2011 14:50:02 -0000 Received: (qmail 36201 invoked by uid 500); 11 Jan 2011 14:50:02 -0000 Delivered-To: apmail-cxf-commits-archive@cxf.apache.org Received: (qmail 36093 invoked by uid 500); 11 Jan 2011 14:50:01 -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 36086 invoked by uid 99); 11 Jan 2011 14:50:01 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 11 Jan 2011 14:50:01 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.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; Tue, 11 Jan 2011 14:49:59 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 93AE523889DE; Tue, 11 Jan 2011 14:49:32 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1057669 - in /cxf/branches/2.3.x-fixes: ./ systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookStore.java Date: Tue, 11 Jan 2011 14:49:32 -0000 To: commits@cxf.apache.org From: sergeyb@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20110111144932.93AE523889DE@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: sergeyb Date: Tue Jan 11 14:49:32 2011 New Revision: 1057669 URL: http://svn.apache.org/viewvc?rev=1057669&view=rev Log: Merged revisions 1057666 via svnmerge from https://svn.apache.org/repos/asf/cxf/trunk ........ r1057666 | sergeyb | 2011-01-11 14:48:03 +0000 (Tue, 11 Jan 2011) | 1 line Fixing the build failure ........ 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/BookStore.java Propchange: cxf/branches/2.3.x-fixes/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Tue Jan 11 14:49:32 2011 @@ -1 +1 @@ -/cxf/trunk:1057393,1057629 +/cxf/trunk:1057393,1057629,1057666 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/BookStore.java URL: http://svn.apache.org/viewvc/cxf/branches/2.3.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookStore.java?rev=1057669&r1=1057668&r2=1057669&view=diff ============================================================================== --- cxf/branches/2.3.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookStore.java (original) +++ cxf/branches/2.3.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookStore.java Tue Jan 11 14:49:32 2011 @@ -909,7 +909,6 @@ public class BookStore { private Book createCglibProxy(final Book book) { final InvocationHandler handler = new InvocationHandler() { - @Override public Object invoke(Object object, Method method, Object[] args) throws Throwable { return method.invoke(book, args); }