Return-Path: Delivered-To: apmail-cxf-commits-archive@www.apache.org Received: (qmail 39473 invoked from network); 10 Dec 2009 18:58:08 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 10 Dec 2009 18:58:08 -0000 Received: (qmail 62394 invoked by uid 500); 10 Dec 2009 18:58:08 -0000 Delivered-To: apmail-cxf-commits-archive@cxf.apache.org Received: (qmail 62300 invoked by uid 500); 10 Dec 2009 18:58:08 -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 62275 invoked by uid 99); 10 Dec 2009 18:58:06 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 10 Dec 2009 18:58:06 +0000 X-ASF-Spam-Status: No, hits=-2.6 required=5.0 tests=AWL,BAYES_00,WEIRD_PORT 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; Thu, 10 Dec 2009 18:58:04 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 3332E23889BF; Thu, 10 Dec 2009 18:57:14 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r889368 - in /cxf/branches/2.2.x-fixes: ./ systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/ systests/jaxrs/src/test/resources/jaxrs_atom/WEB-INF/ Date: Thu, 10 Dec 2009 18:57:13 -0000 To: commits@cxf.apache.org From: sergeyb@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20091210185714.3332E23889BF@eris.apache.org> Author: sergeyb Date: Thu Dec 10 18:57:13 2009 New Revision: 889368 URL: http://svn.apache.org/viewvc?rev=889368&view=rev Log: Merged revisions 888400-888401 via svnmerge from https://svn.apache.org/repos/asf/cxf/trunk ........ r888400 | sergeyb | 2009-12-08 13:54:16 +0000 (Tue, 08 Dec 2009) | 1 line Testing custom atom provider ........ r888401 | sergeyb | 2009-12-08 14:03:16 +0000 (Tue, 08 Dec 2009) | 1 line Fixing the port ........ Added: cxf/branches/2.2.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/CustomAtomFeedProvider.java - copied unchanged from r888401, cxf/trunk/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/CustomAtomFeedProvider.java Modified: cxf/branches/2.2.x-fixes/ (props changed) cxf/branches/2.2.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSAtomBookTest.java cxf/branches/2.2.x-fixes/systests/jaxrs/src/test/resources/jaxrs_atom/WEB-INF/beans.xml Propchange: cxf/branches/2.2.x-fixes/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Thu Dec 10 18:57:13 2009 @@ -1 +1 @@ -/cxf/trunk:887317 +/cxf/trunk:887317,888400-888401 Propchange: cxf/branches/2.2.x-fixes/ ------------------------------------------------------------------------------ Binary property 'svnmerge-integrated' - no diff available. Modified: cxf/branches/2.2.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSAtomBookTest.java URL: http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSAtomBookTest.java?rev=889368&r1=889367&r2=889368&view=diff ============================================================================== --- cxf/branches/2.2.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSAtomBookTest.java (original) +++ cxf/branches/2.2.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSAtomBookTest.java Thu Dec 10 18:57:13 2009 @@ -149,6 +149,16 @@ "*/*"); } + @Test + public void testGetBooksWithCustomProvider() throws Exception { + String endpointAddress = + "http://localhost:9080/bookstore/bookstore4/books/feed"; + Feed feed = getFeed(endpointAddress, null); + assertEquals("http://localhost:9080/bookstore/bookstore4/books/feed", + feed.getBaseUri().toString()); + assertEquals("Collection of Books", feed.getTitle()); + } + private void getAndCompareJson(String address, String resourcePath, String type) throws Exception { Modified: cxf/branches/2.2.x-fixes/systests/jaxrs/src/test/resources/jaxrs_atom/WEB-INF/beans.xml URL: http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/systests/jaxrs/src/test/resources/jaxrs_atom/WEB-INF/beans.xml?rev=889368&r1=889367&r2=889368&view=diff ============================================================================== --- cxf/branches/2.2.x-fixes/systests/jaxrs/src/test/resources/jaxrs_atom/WEB-INF/beans.xml (original) +++ cxf/branches/2.2.x-fixes/systests/jaxrs/src/test/resources/jaxrs_atom/WEB-INF/beans.xml Thu Dec 10 18:57:13 2009 @@ -85,6 +85,15 @@ + + + + + + + + + @@ -92,6 +101,11 @@ + + +