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/

[dkulp]

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;
     }