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 BA939D939 for ; Tue, 8 Jan 2013 21:59:45 +0000 (UTC) Received: (qmail 94458 invoked by uid 500); 8 Jan 2013 21:59:45 -0000 Delivered-To: apmail-cxf-commits-archive@cxf.apache.org Received: (qmail 94396 invoked by uid 500); 8 Jan 2013 21:59:45 -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 94382 invoked by uid 99); 8 Jan 2013 21:59:45 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 08 Jan 2013 21:59:45 +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; Tue, 08 Jan 2013 21:59:44 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id CC5EC23889DE; Tue, 8 Jan 2013 21:59:24 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1430564 - in /cxf/trunk: rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/provider/atom/ systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/ Date: Tue, 08 Jan 2013 21:59:24 -0000 To: commits@cxf.apache.org From: dkulp@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20130108215924.CC5EC23889DE@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: dkulp Date: Tue Jan 8 21:59:24 2013 New Revision: 1430564 URL: http://svn.apache.org/viewvc?rev=1430564&view=rev Log: Update tests to work with the Abdera 1.1.3/Axiom 1.2.14 Modified: cxf/trunk/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/provider/atom/AtomPojoProvider.java cxf/trunk/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/AtomBookStore.java cxf/trunk/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/AtomUtils.java cxf/trunk/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSAtomBookTest.java Modified: cxf/trunk/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/provider/atom/AtomPojoProvider.java URL: http://svn.apache.org/viewvc/cxf/trunk/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/provider/atom/AtomPojoProvider.java?rev=1430564&r1=1430563&r2=1430564&view=diff ============================================================================== --- cxf/trunk/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/provider/atom/AtomPojoProvider.java (original) +++ cxf/trunk/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/provider/atom/AtomPojoProvider.java Tue Jan 8 21:59:24 2013 @@ -462,9 +462,9 @@ public class AtomPojoProvider extends Ab } protected void setEntryContent(Factory factory, Entry e, String content) { - e.setContentElement(factory.newContent()); - e.getContentElement().setContentType(Content.Type.XML); - e.getContentElement().setValue(content); + Content ct = factory.newContent(Content.Type.XML); + ct.setValue(content); + e.setContentElement(ct); } protected void setEntryProperties(Factory factory, Entry entry, Modified: cxf/trunk/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/AtomBookStore.java URL: http://svn.apache.org/viewvc/cxf/trunk/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/AtomBookStore.java?rev=1430564&r1=1430563&r2=1430564&view=diff ============================================================================== --- cxf/trunk/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/AtomBookStore.java (original) +++ cxf/trunk/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/AtomBookStore.java Tue Jan 8 21:59:24 2013 @@ -100,7 +100,7 @@ public class AtomBookStore { try { for (Book b : books.values()) { - Entry e = AtomUtils.createBookEntry(b); + Entry e = AtomUtils.createBookEntry(factory, b); f.addEntry(e); } Modified: cxf/trunk/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/AtomUtils.java URL: http://svn.apache.org/viewvc/cxf/trunk/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/AtomUtils.java?rev=1430564&r1=1430563&r2=1430564&view=diff ============================================================================== --- cxf/trunk/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/AtomUtils.java (original) +++ cxf/trunk/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/AtomUtils.java Tue Jan 8 21:59:24 2013 @@ -36,14 +36,18 @@ public final class AtomUtils { } public static Entry createBookEntry(Book b) throws Exception { - return createBookEntry(b, null); + return createBookEntry(Abdera.getNewFactory(), b, null); + } + public static Entry createBookEntry(Factory factory, Book b) throws Exception { + return createBookEntry(factory, b, null); } - public static Entry createBookEntry(Book b, String baseUri) throws Exception { - Factory factory = Abdera.getNewFactory(); + return createBookEntry(Abdera.getNewFactory(), b, baseUri); + } + public static Entry createBookEntry(Factory factory, Book b, String baseUri) throws Exception { JAXBContext jc = JAXBContext.newInstance(Book.class); - Entry e = factory.getAbdera().newEntry(); + Entry e = factory.newEntry(); if (baseUri != null) { e.setBaseUri(baseUri); } @@ -53,10 +57,8 @@ public final class AtomUtils { StringWriter writer = new StringWriter(); jc.createMarshaller().marshal(b, writer); - - e.setContentElement(factory.newContent()); - e.getContentElement().setContentType(Content.Type.XML); - e.getContentElement().setValue(writer.toString()); + + e.setContent(writer.toString(), Content.Type.XML); return e; } Modified: cxf/trunk/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSAtomBookTest.java URL: http://svn.apache.org/viewvc/cxf/trunk/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSAtomBookTest.java?rev=1430564&r1=1430563&r2=1430564&view=diff ============================================================================== --- cxf/trunk/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSAtomBookTest.java (original) +++ cxf/trunk/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSAtomBookTest.java Tue Jan 8 21:59:24 2013 @@ -205,10 +205,9 @@ public class JAXRSAtomBookTest extends A StringWriter writer = new StringWriter(); jc.createMarshaller().marshal(b, writer); - e.setContentElement(factory.newContent()); - e.getContentElement().setContentType(Content.Type.XML); - e.getContentElement().setValue(writer.toString()); - + Content ct = factory.newContent(Content.Type.XML); + ct.setValue(writer.toString()); + e.setContentElement(ct); return e; }